diff --git a/app-common/build.gradle.kts b/app-common/build.gradle.kts index e478826e..76932531 100644 --- a/app-common/build.gradle.kts +++ b/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") } \ No newline at end of file diff --git a/app/src/main/java/eu/darken/capod/common/PrivacyPolicy.kt b/app-common/src/main/java/eu/darken/capod/common/PrivacyPolicy.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/PrivacyPolicy.kt rename to app-common/src/main/java/eu/darken/capod/common/PrivacyPolicy.kt diff --git a/app/src/main/java/eu/darken/capod/common/WebpageTool.kt b/app-common/src/main/java/eu/darken/capod/common/WebpageTool.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/WebpageTool.kt rename to app-common/src/main/java/eu/darken/capod/common/WebpageTool.kt diff --git a/app/src/main/java/eu/darken/capod/common/dagger/AndroidModule.kt b/app-common/src/main/java/eu/darken/capod/common/dagger/AndroidModule.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/dagger/AndroidModule.kt rename to app-common/src/main/java/eu/darken/capod/common/dagger/AndroidModule.kt diff --git a/app/src/main/java/eu/darken/capod/common/navigation/FragmentExtensions.kt b/app-common/src/main/java/eu/darken/capod/common/navigation/FragmentExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/navigation/FragmentExtensions.kt rename to app-common/src/main/java/eu/darken/capod/common/navigation/FragmentExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/navigation/NavArgsExtensions.kt b/app-common/src/main/java/eu/darken/capod/common/navigation/NavArgsExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/navigation/NavArgsExtensions.kt rename to app-common/src/main/java/eu/darken/capod/common/navigation/NavArgsExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/navigation/NavControllerExtensions.kt b/app-common/src/main/java/eu/darken/capod/common/navigation/NavControllerExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/navigation/NavControllerExtensions.kt rename to app-common/src/main/java/eu/darken/capod/common/navigation/NavControllerExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/navigation/NavDestinationExtensions.kt b/app-common/src/main/java/eu/darken/capod/common/navigation/NavDestinationExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/navigation/NavDestinationExtensions.kt rename to app-common/src/main/java/eu/darken/capod/common/navigation/NavDestinationExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/navigation/NavDirectionsExtensions.kt b/app-common/src/main/java/eu/darken/capod/common/navigation/NavDirectionsExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/navigation/NavDirectionsExtensions.kt rename to app-common/src/main/java/eu/darken/capod/common/navigation/NavDirectionsExtensions.kt diff --git a/app/src/main/java/eu/darken/capod/common/serialization/JavaInstantAdapter.kt b/app-common/src/main/java/eu/darken/capod/common/serialization/JavaInstantAdapter.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/serialization/JavaInstantAdapter.kt rename to app-common/src/main/java/eu/darken/capod/common/serialization/JavaInstantAdapter.kt diff --git a/app/src/main/java/eu/darken/capod/common/serialization/SerializationModule.kt b/app-common/src/main/java/eu/darken/capod/common/serialization/SerializationModule.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/serialization/SerializationModule.kt rename to app-common/src/main/java/eu/darken/capod/common/serialization/SerializationModule.kt diff --git a/app/src/main/java/eu/darken/capod/common/uix/Activity2.kt b/app-common/src/main/java/eu/darken/capod/common/uix/Activity2.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/uix/Activity2.kt rename to app-common/src/main/java/eu/darken/capod/common/uix/Activity2.kt diff --git a/app/src/main/java/eu/darken/capod/common/uix/Fragment2.kt b/app-common/src/main/java/eu/darken/capod/common/uix/Fragment2.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/uix/Fragment2.kt rename to app-common/src/main/java/eu/darken/capod/common/uix/Fragment2.kt diff --git a/app/src/main/java/eu/darken/capod/common/uix/Fragment3.kt b/app-common/src/main/java/eu/darken/capod/common/uix/Fragment3.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/uix/Fragment3.kt rename to app-common/src/main/java/eu/darken/capod/common/uix/Fragment3.kt diff --git a/app/src/main/java/eu/darken/capod/common/uix/ViewModel3.kt b/app-common/src/main/java/eu/darken/capod/common/uix/ViewModel3.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/uix/ViewModel3.kt rename to app-common/src/main/java/eu/darken/capod/common/uix/ViewModel3.kt diff --git a/app/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepo.kt b/app-common/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepo.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepo.kt rename to app-common/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepo.kt diff --git a/app/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepoExtensions.kt b/app-common/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepoExtensions.kt similarity index 100% rename from app/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepoExtensions.kt rename to app-common/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepoExtensions.kt diff --git a/app/src/main/res/drawable/ic_baseline_settings_bluetooth_24.xml b/app-common/src/main/res/drawable/ic_baseline_settings_bluetooth_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_settings_bluetooth_24.xml rename to app-common/src/main/res/drawable/ic_baseline_settings_bluetooth_24.xml diff --git a/app/src/main/res/drawable/ic_heart.xml b/app-common/src/main/res/drawable/ic_heart.xml similarity index 100% rename from app/src/main/res/drawable/ic_heart.xml rename to app-common/src/main/res/drawable/ic_heart.xml diff --git a/app/src/main/res/drawable/splash_graphic.xml b/app-common/src/main/res/drawable/splash_graphic.xml similarity index 100% rename from app/src/main/res/drawable/splash_graphic.xml rename to app-common/src/main/res/drawable/splash_graphic.xml diff --git a/app/src/main/res/drawable/splash_graphic2.xml b/app-common/src/main/res/drawable/splash_graphic2.xml similarity index 100% rename from app/src/main/res/drawable/splash_graphic2.xml rename to app-common/src/main/res/drawable/splash_graphic2.xml diff --git a/app/src/main/res/drawable/splash_screen.xml b/app-common/src/main/res/drawable/splash_screen.xml similarity index 100% rename from app/src/main/res/drawable/splash_screen.xml rename to app-common/src/main/res/drawable/splash_screen.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 08378799..0ccd960d 100644 --- a/app/build.gradle.kts +++ b/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") diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 264a8689..44e8c21a 100644 --- a/buildSrc/build.gradle.kts +++ b/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") } \ No newline at end of file diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index 8f735548..4ce55509 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/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) { diff --git a/buildSrc/src/main/java/ProjectConfig.kt b/buildSrc/src/main/java/ProjectConfig.kt index 71184bce..ebbdf550 100644 --- a/buildSrc/src/main/java/ProjectConfig.kt +++ b/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" ) } diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt index 2c54f814..706f6d2f 100644 --- a/buildSrc/src/main/java/Versions.kt +++ b/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" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c2314a5a..514340ee 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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