More refactoring and modularization

app-common/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id("com.android.library")
-    id("org.jetbrains.kotlin.android")
+    id("kotlin-android")
     id("kotlin-kapt")
     id("kotlin-parcelize")
 }
@@ -36,10 +36,10 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
         freeCompilerArgs = freeCompilerArgs + listOf(
-            "-Xopt-in=kotlin.ExperimentalStdlibApi",
-            "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-            "-Xopt-in=kotlin.time.ExperimentalTime",
-            "-Xopt-in=kotlin.ExperimentalUnsignedTypes",
+            "-opt-in=kotlin.ExperimentalStdlibApi",
+            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+            "-opt-in=kotlin.time.ExperimentalTime",
+            "-opt-in=kotlin.ExperimentalUnsignedTypes",
         )
     }
 
@@ -91,8 +91,7 @@ dependencies {
     addDagger()
     addMoshi()
     addBaseWorkManager()
+    addNavigation()
 
     implementation("com.bugsnag:bugsnag-android:5.9.2")
-
-    implementation("com.google.android.material:material:1.5.0-rc01")
 }

app/build.gradle.kts

@@ -109,11 +109,11 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
         freeCompilerArgs = freeCompilerArgs + listOf(
-            "-Xopt-in=kotlin.ExperimentalStdlibApi",
-            "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-            "-Xopt-in=kotlinx.coroutines.FlowPreview",
-            "-Xopt-in=kotlin.time.ExperimentalTime",
-            "-Xopt-in=kotlin.RequiresOptIn"
+            "-opt-in=kotlin.ExperimentalStdlibApi",
+            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+            "-opt-in=kotlinx.coroutines.FlowPreview",
+            "-opt-in=kotlin.time.ExperimentalTime",
+            "-opt-in=kotlin.RequiresOptIn"
         )
     }
 
@@ -160,8 +160,6 @@ dependencies {
 
     addBaseWorkManager()
 
-    implementation("androidx.core:core-splashscreen:1.0.0-alpha02")
-
     // Debugging
     implementation("com.bugsnag:bugsnag-android:5.9.2")
     implementation("com.getkeepsafe.relinker:relinker:1.4.3")

buildSrc/build.gradle.kts

@@ -8,7 +8,7 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    implementation("com.android.tools.build:gradle:7.2.1")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
+    implementation("com.android.tools.build:gradle:7.2.2")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
     implementation("com.squareup:javapoet:1.13.0")
 }

buildSrc/src/main/java/Dependencies.kt

@@ -95,9 +95,11 @@ fun DependencyHandlerScope.addBaseAndroidUi() {
     implementation("androidx.constraintlayout:constraintlayout:2.1.3")
     implementation("androidx.fragment:fragment-ktx:1.4.1")
 
-    implementation("androidx.activity:activity-ktx:1.5.0")
+    implementation("androidx.activity:activity-ktx:1.6.0-rc01")
     implementation("androidx.fragment:fragment-ktx:1.5.0")
 
+    implementation("com.google.android.material:material:1.5.0-rc01")
+
     val lifecycleVers = "2.5.0"
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVers")
@@ -105,6 +107,8 @@ fun DependencyHandlerScope.addBaseAndroidUi() {
     implementation("androidx.lifecycle:lifecycle-common-java8:$lifecycleVers")
     implementation("androidx.lifecycle:lifecycle-process:$lifecycleVers")
     implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVers")
+
+    implementation("androidx.core:core-splashscreen:1.0.0-alpha02")
 }
 
 fun DependencyHandlerScope.addTesting(junit: Boolean = true, instrumentation: Boolean = true) {

buildSrc/src/main/java/ProjectConfig.kt

@@ -70,10 +70,10 @@ fun LibraryExtension.setupLibraryDefaults() {
     kotlinOptions {
         jvmTarget = "1.8"
         freeCompilerArgs = freeCompilerArgs + listOf(
-            "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-            "-Xopt-in=kotlinx.coroutines.FlowPreview",
-            "-Xopt-in=kotlin.time.ExperimentalTime",
-            "-Xopt-in=kotlin.RequiresOptIn"
+            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+            "-opt-in=kotlinx.coroutines.FlowPreview",
+            "-opt-in=kotlin.time.ExperimentalTime",
+            "-opt-in=kotlin.RequiresOptIn"
         )
     }
 

buildSrc/src/main/java/Versions.kt

@@ -4,7 +4,7 @@ object Versions {
     }
 
     object Kotlin {
-        const val core = "1.7.0"
+        const val core = "1.7.10"
         const val coroutines = "1.6.2"
     }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Aug 27 21:32:28 CEST 2022
+#Sun Aug 28 21:26:18 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME