cleaning (#104)

* cleaning * cleaning
Grigoriym · Apr 27, 2024 · 09bcf99 · 09bcf99
1 parent b533182
commit 09bcf99
Show file tree

Hide file tree

Showing 32 changed files with 65 additions and 261 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -30,7 +30,7 @@ jobs:
           distribution: 'adopt'
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: Setup Gradle Cache
         uses: actions/cache@v4

diff --git a/.github/workflows/code_analysis.yml b/.github/workflows/code_analysis.yml
@@ -30,7 +30,7 @@ jobs:
           distribution: 'adopt'
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: Decode google-services.json
         run: echo "$GOOGLE_SERVICES_JSON" | base64 --decode > app/google-services.json

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -36,7 +36,7 @@ jobs:
           distribution: 'adopt'
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: Setup Gradle Cache
         uses: actions/cache@v4

diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -30,7 +30,7 @@ jobs:
           distribution: 'adopt'
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: Decode google-services.json
         run: echo "$GOOGLE_SERVICES_JSON" | base64 --decode > app/google-services.json

diff --git a/analytics-api/build.gradle.kts b/analytics-api/build.gradle.kts
@@ -4,12 +4,6 @@ plugins {
 
 android {
     namespace = "com.grappim.hateitorrateit.analyticsapi"
-
-    buildTypes {
-        release {
-            isMinifyEnabled = true
-        }
-    }
 }
 
 dependencies {

diff --git a/analytics-impl/build.gradle.kts b/analytics-impl/build.gradle.kts
@@ -5,12 +5,6 @@ plugins {
 
 android {
     namespace = "com.grappim.hateitorrateit.analyticsimpl"
-
-    buildTypes {
-        release {
-            isMinifyEnabled = true
-        }
-    }
 }
 
 dependencies {

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -15,6 +15,8 @@ android {
 
     defaultConfig {
         applicationId = "com.grappim.hateitorrateit"
+        testApplicationId = "com.grappim.hateitorrateit.tests"
+
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = 6
@@ -100,6 +102,10 @@ android {
     }
     bundle {
         language {
+            // Specifies that the app bundle should not support
+            // configuration APKs for language resources. These
+            // resources are instead packaged with each base and
+            // dynamic feature APK.
             enableSplit = false
         }
     }
@@ -125,17 +131,20 @@ dependencies {
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.startup)
     implementation(libs.androidx.activity.compose)
-
     implementation(libs.androidx.navigation.compose)
-
-    implementation(libs.timber)
-
     implementation(libs.androidx.hilt.navigation.compose)
 
+    implementation(libs.androidx.lifecycle.runtime)
+    implementation(libs.androidx.viewmodel.compose)
+    implementation(libs.androidx.runtime.compose)
+
     implementation(libs.androidx.work.runtime)
     implementation(libs.androidx.hilt.work)
     ksp(libs.androidx.hilt.compiler)
 
+    implementation(libs.hilt.android)
+    ksp(libs.hilt.compiler)
+
     coreLibraryDesugaring(libs.android.desugarJdkLibs)
 
     implementation(platform(libs.androidx.compose.bom))
@@ -148,12 +157,6 @@ dependencies {
     implementation(libs.androidx.compose.material.icons.core)
     implementation(libs.androidx.compose.material.icons.extended)
 
-    implementation(libs.androidx.lifecycle.runtime)
-    implementation(libs.androidx.viewmodel.compose)
-    implementation(libs.androidx.runtime.compose)
-
-    implementation(libs.coil)
-
     implementation(platform(libs.firebase.bom))
     implementation(libs.firebase.crashlytics)
     implementation(libs.firebase.analytics)
@@ -168,4 +171,7 @@ dependencies {
     androidTestImplementation(project(":testing"))
 
     testImplementation(libs.robolectric)
+
+    implementation(libs.coil)
+    implementation(libs.timber)
 }
diff --git a/...c/androidTest/java/com/grappim/hateitorrateit/ui/screens/settings/SettingsScreenKtTest.kt b/...c/androidTest/java/com/grappim/hateitorrateit/ui/screens/settings/SettingsScreenKtTest.kt
@@ -181,6 +181,7 @@ class SettingsScreenKtTest {
         trackScreenStart = {},
         isAnalyticsCollectionEnabled = false,
         onAnalyticsToggle = {},
-        onDarkThemeConfigClicked = {}
+        onDarkThemeConfigClicked = {},
+        localeOptions = mutableMapOf()
     )
 }
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     `kotlin-dsl`
 }
 
-group = "com.google.samples.apps.nowinandroid.buildlogic"
+group = "com.grappim.hateitorrateit.buildlogic"
 
 // Configure the build-logic plugins to target JDK 17
 // This matches the JDK used to build the project, and is not related to what is running on device.

diff --git a/build-logic/convention/src/main/kotlin/com/grappim/hateitorrateit/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/grappim/hateitorrateit/AndroidCompose.kt
@@ -20,8 +20,8 @@ internal fun Project.configureAndroidCompose(
             val bom = libs.findLibrary("androidx-compose-bom").get()
             add("implementation", platform(bom))
             add("androidTestImplementation", platform(bom))
-            // Add ComponentActivity to debug manifest
             add("debugImplementation", libs.findLibrary("androidx.compose.ui.testManifest").get())
+            add("debugImplementation", libs.findLibrary("androidx.compose.ui.tooling").get())
         }
 
         testOptions {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,6 +17,17 @@ plugins {
     alias(libs.plugins.jacocoAggregationCoverage)
 }
 
+allprojects {
+    tasks.withType<Test> {
+        testLogging {
+            exceptionFormat = TestExceptionFormat.FULL
+            showCauses = true
+            showExceptions = true
+            showStackTraces = true
+        }
+    }
+}
+
 subprojects {
     apply {
         plugin("io.gitlab.arturbosch.detekt")
@@ -113,17 +124,3 @@ testAggregation {
         exclude(coverageExclusions)
     }
 }
-
-val runAllUnitTests by tasks.creating {
-    group = "verification"
-    description = "Runs all unit tests in all modules."
-
-    dependsOn(subprojects.map { it.tasks.withType<Test>() })
-}
-
-val runAndroidTests by tasks.creating {
-    group = "verification"
-    description = "Runs Android instrumented tests only in :app and data:db modules."
-
-    dependsOn(":app:connectedAndroidTest", ":data:db:connectedAndroidTest")
-}
diff --git a/commons/build.gradle.kts b/commons/build.gradle.kts
@@ -5,14 +5,4 @@ plugins {
 
 android {
     namespace = "com.grappim.hateitorrateit.commons"
-
-    defaultConfig {
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = true
-        }
-    }
 }
diff --git a/data/cleaner-api/build.gradle.kts b/data/cleaner-api/build.gradle.kts
@@ -4,16 +4,6 @@ plugins {
 
 android {
     namespace = "com.grappim.hateitorrateit.data.cleanerapi"
-
-    defaultConfig {
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = true
-        }
-    }
 }
 
 dependencies {

diff --git a/data/cleaner-impl/build.gradle.kts b/data/cleaner-impl/build.gradle.kts
@@ -5,16 +5,6 @@ plugins {
 
 android {
     namespace = "com.grappim.hateitorrateit.data.cleanerimpl"
-
-    defaultConfig {
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = true
-        }
-    }
 }
 
 dependencies {

diff --git a/data/db/build.gradle.kts b/data/db/build.gradle.kts
@@ -15,12 +15,6 @@ android {
             arg("room.expandProjection", "true")
         }
     }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = true
-        }
-    }
     buildFeatures {
         buildConfig = true
     }

diff --git a/data/local-datastorage-api/build.gradle.kts b/data/local-datastorage-api/build.gradle.kts
@@ -4,16 +4,6 @@ plugins {
 
 android {
     namespace = "com.grappim.hateitorrateit.data.localdatastorageapi"
-
-    defaultConfig {
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = true
-        }
-    }
 }
 
 dependencies {

diff --git a/data/local-datastorage-impl/build.gradle.kts b/data/local-datastorage-impl/build.gradle.kts
@@ -5,16 +5,6 @@ plugins {
 
 android {
     namespace = "com.grappim.hateitorrateit.data.localdatastorageimpl"
-
-    defaultConfig {
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = true
-        }
-    }
 }
 
 dependencies {

diff --git a/data/remote-config-api/build.gradle.kts b/data/remote-config-api/build.gradle.kts
@@ -4,16 +4,6 @@ plugins {
 
 android {
     namespace = "com.grappim.hateitorrateit.data.remoteconfigapi"
-
-    defaultConfig {
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = true
-        }
-    }
 }
 
 dependencies {

diff --git a/data/remote-config-impl/build.gradle.kts b/data/remote-config-impl/build.gradle.kts
@@ -5,16 +5,6 @@ plugins {
 
 android {
     namespace = "com.grappim.hateitorrateit.data.remoteconfigimpl"
-
-    defaultConfig {
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = true
-        }
-    }
 }
 
 dependencies {

diff --git a/data/repo-api/build.gradle.kts b/data/repo-api/build.gradle.kts
@@ -4,15 +4,6 @@ plugins {
 
 android {
     namespace = "com.grappim.hateitorrateit.data.repoapi"
-    defaultConfig {
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = true
-        }
-    }
 }
 
 dependencies {

diff --git a/data/repo-impl/build.gradle.kts b/data/repo-impl/build.gradle.kts
@@ -5,16 +5,6 @@ plugins {
 
 android {
     namespace = "com.grappim.hateitorrateit.data.repoimpl"
-
-    defaultConfig {
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = true
-        }
-    }
 }
 
 dependencies {

diff --git a/data/worker-api/build.gradle.kts b/data/worker-api/build.gradle.kts
@@ -4,14 +4,4 @@ plugins {
 
 android {
     namespace = "com.grappim.hateitorrateit.data.workerapi"
-
-    defaultConfig {
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = true
-        }
-    }
 }
diff --git a/data/worker-impl/build.gradle.kts b/data/worker-impl/build.gradle.kts
@@ -7,18 +7,7 @@ android {
     namespace = "com.grappim.hateitorrateit.data.workerimpl"
 
     defaultConfig {
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = true
-
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
+        consumerProguardFiles("consumer-rules.pro")
     }
 }
 

diff --git a/data/worker-impl/consumer-rules.pro b/data/worker-impl/consumer-rules.pro
@@ -0,0 +1 @@
+-dontwarn java.lang.invoke.StringConcatFactory