Skip to content

Commit

Permalink
Merge branch 'main' of github.com:mtrewartha/positional
Browse files Browse the repository at this point in the history
  • Loading branch information
mtrewartha committed Oct 13, 2024
2 parents f26774e + 138cbd3 commit 57e5c4a
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 4 deletions.
19 changes: 18 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,24 @@ jobs:
log-accepted-android-sdk-licenses: false

- name: 'Run unit tests'
run: ./gradlew test koverXmlReport
run: >-
./gradlew
:model:compass:test
:model:core:test
:model:location:test
:model:settings:test
:model:sun:test
:data:compass:testAospRelease :data:compass:testGmsRelease
:data:location:testAospRelease :data:location:testGmsRelease
:data:settings:testAospRelease :data:settings:testGmsRelease
:data:sun:test
:ui:compass:testAospRelease :ui:compass:testGmsRelease
:ui:core:testAospRelease :ui:core:testGmsRelease
:ui:design:testAospRelease :ui:design:testGmsRelease
:ui:location:testAospRelease :ui:location:testGmsRelease
:ui:settings:testAospRelease :ui:settings:testGmsRelease
:ui:sun:testAospRelease :ui:sun:testGmsRelease
koverXmlReport
- name: 'Upload coverage report to Codecov'
uses: codecov/codecov-action@v4
Expand Down
3 changes: 1 addition & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,11 @@ android {
debug {
isDebuggable = true
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
}

release {
isDebuggable = false
isMinifyEnabled = false
isMinifyEnabled = true
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
signingConfig = signingConfigs.getByName("release")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {

extensions.configure<LibraryExtension> {
configureAndroid()
defaultConfig.targetSdk = 34

defaultConfig {
consumerProguardFiles("consumer-rules.pro")
targetSdk = 34
}

// The resource prefix is derived from the module name,
// so resources inside ":core:module1" must be prefixed with "core_module1_"
resourcePrefix =
Expand Down
4 changes: 4 additions & 0 deletions data/settings/consumer-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Keep DataStore fields
-keepclassmembers class * extends com.google.protobuf.GeneratedMessageLite* {
<fields>;
}

0 comments on commit 57e5c4a

Please sign in to comment.