Bump AGP to 8.1.2, Kotlin to 1.9.10, all other dependencies to latest…

… compatible versions
futuredapp · Oct 4, 2023 · 95510f0 · 95510f0
1 parent 2287ea5
commit 95510f0
Show file tree

Hide file tree

Showing 35 changed files with 77 additions and 71 deletions.
diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
@@ -14,7 +14,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
       - name: Build & run unit tests
         shell: bash
         run: ./gradlew --continue build testRelease

diff --git a/.github/workflows/publish_snapshot.yml b/.github/workflows/publish_snapshot.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
       - name: Run unit tests
         shell: bash
         run: ./gradlew testRelease

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
       - name: Run LintCheck
         shell: bash
         run: ./gradlew detekt ktlintCheck lint assembleRelease

diff --git a/arkitekt-lint/src/test/java/app/futured/arkitekt/lint/WrongEventNameDetectorTest.kt b/arkitekt-lint/src/test/java/app/futured/arkitekt/lint/WrongEventNameDetectorTest.kt
@@ -44,6 +44,7 @@ class WrongEventNameDetectorTest : LintDetectorTest() {
             """
                 ).indented()
             )
+            .allowMissingSdk()
             .issues(WrongEventNameDetector.ISSUE_MUSSING_SUFFIX)
             .run()
             .expectWarningCount(2)
@@ -72,6 +73,7 @@ class WrongEventNameDetectorTest : LintDetectorTest() {
             """
                 ).indented()
             )
+            .allowMissingSdk()
             .issues(WrongEventNameDetector.ISSUE_MISSPELL)
             .run()
             .expectWarningCount(3)
@@ -96,6 +98,7 @@ class WrongEventNameDetectorTest : LintDetectorTest() {
             """
                 ).indented()
             )
+            .allowMissingSdk()
             .issues(
                 WrongEventNameDetector.ISSUE_MUSSING_SUFFIX,
                 WrongEventNameDetector.ISSUE_MISSPELL

diff --git a/bindingadapters/build.gradle.kts b/bindingadapters/build.gradle.kts
@@ -27,6 +27,7 @@ android {
     dataBinding {
         isEnabled = true
     }
+    namespace = "app.futured.arkitekt"
 }
 
 dependencies {

diff --git a/bindingadapters/src/main/AndroidManifest.xml b/bindingadapters/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest package="app.futured.arkitekt"
-          xmlns:android="http://schemas.android.com/apk/res/android"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -3,9 +3,9 @@ plugins {
 }
 
 repositories {
-    jcenter()
+    gradlePluginPortal()
 }
 
 dependencies {
-    implementation("com.github.ben-manes:gradle-versions-plugin:0.33.0")
+    implementation("com.github.ben-manes:gradle-versions-plugin:0.48.0")
 }
diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt
@@ -29,8 +29,8 @@ object Deps {
     }
 
     object AndroidX {
-        const val appcompat = "androidx.appcompat:appcompat:${Versions.androidx}"
-        const val annnotation = "androidx.annotation:annotation:${Versions.androidxAnnotation}"
+        const val appcompat = "androidx.appcompat:appcompat:${Versions.appcompat}"
+        const val annnotation = "androidx.annotation:annotation:${Versions.annotation}"
         const val multidex = "androidx.multidex:multidex:${Versions.multidex}"
         const val material = "com.google.android.material:material:${Versions.material}"
         const val vectorDrawable = "androidx.vectordrawable:vectordrawable:${Versions.vectorDrawable}"
@@ -70,11 +70,11 @@ object Deps {
         const val mockitoCore = "org.mockito:mockito-core:${Versions.mockitoCore}"
         const val androidXTestRunner = "androidx.test:runner:${Versions.androidxTestRunner}"
         const val androidXTestCore = "androidx.test:core:${Versions.androidxTestCore}"
-        const val androidXTestCoreKtx = "androidx.test:core-ktx:${Versions.androidxTestCoreKtx}"
+        const val androidXTestCoreKtx = "androidx.test:core-ktx:${Versions.androidxTestCore}"
         const val androidXCoreTesting = "androidx.arch.core:core-testing:${Versions.androidxTestCoreTesting}"
         const val androidXEspresso = "androidx.test.espresso:espresso-core:${Versions.androidXEspresso}"
         const val androidXJUnit = "androidx.test.ext:junit:${Versions.androidXJUnit}"
-        const val androidXJUnitKtx = "androidx.test.ext:junit-ktx:${Versions.androidXJUnitKtx}"
+        const val androidXJUnitKtx = "androidx.test.ext:junit-ktx:${Versions.androidXJUnit}"
         const val androidXFragmentTesting = "androidx.fragment:fragment-testing:${Versions.androidXFragmentTesting}"
         const val rxSchedulerRule = "com.github.Plastix.RxSchedulerRule:rx2:${Versions.rxSchedulerRule}"
         const val jUnit = "androidx.test.ext:junit:${Versions.jUnit}"

diff --git a/buildSrc/src/main/kotlin/ProjectSettings.kt b/buildSrc/src/main/kotlin/ProjectSettings.kt
@@ -1,7 +1,7 @@
 object ProjectSettings {
     const val applicationId = "app.futured.arkitekt.sample"
-    const val compileSdk = 31
-    const val targetSdk = 31
+    const val compileSdk = 34
+    const val targetSdk = 34
     const val minSdk = 21
     const val group = "app.futured.arkitekt"
 

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,6 +1,6 @@
 object Versions {
     // android gradle plugin
-    const val gradlePlugin = "7.2.1"
+    const val gradlePlugin = "8.1.2"
 
     // plugins
     const val detekt = "1.20.0"
@@ -10,24 +10,24 @@ object Versions {
     const val dokka = "1.6.10"
 
     // kotlin
-    const val kotlin = "1.7.0"
-    const val coroutines = "1.6.4"
+    const val kotlin = "1.9.10"
+    const val coroutines = "1.7.3"
 
     // core
-    const val androidx = "1.4.2"
-    const val androidxAnnotation = "1.4.0"
+    const val appcompat = "1.6.1"
+    const val annotation = "1.7.0"
     const val multidex = "2.0.1"
-    const val androidxFragment = "1.5.0"
-    const val material = "1.6.1"
-    const val test = "2.1.0"
+    const val androidxFragment = "1.6.1"
+    const val material = "1.9.0"
+    const val test = "2.2.0"
     const val vectorDrawable = "1.1.0"
     const val constraintLayout = "2.1.4"
-    const val lifeCycle = "2.5.0"
-    const val dagger = "2.42"
-    const val hilt = "2.42"
+    const val lifeCycle = "2.6.2"
+    const val dagger = "2.48.1"
+    const val hilt = "2.48.1"
     const val hiltJetpack = "1.0.0"
-    const val androidXEspresso = "3.5.0-alpha07"
-    const val navigation = "2.5.0"
+    const val androidXEspresso = "3.5.1"
+    const val navigation = "2.7.3"
 
     // rx
     const val rxKotlin = "2.4.0"
@@ -37,22 +37,20 @@ object Versions {
     const val rxDebug = "1.1.3"
 
     // android tools
-    const val androidTools = "30.2.1"
+    const val androidTools = "31.1.2"
 
     // test
-    const val mockk = "1.12.4"
-    const val mockitoCore = "4.6.1"
-    const val androidxTestRunner = "1.4.0"
+    const val mockk = "1.13.8"
+    const val mockitoCore = "5.5.0"
+    const val androidxTestRunner = "1.5.2"
     const val javaX = "1"
     const val jUnit = "1.1.3"
-    const val androidxTestCore = "1.4.0"
-    const val androidxTestCoreTesting = "2.1.0"
-    const val androidxTestCoreKtx = "1.4.0"
-    const val androidXJUnit = "1.1.3"
-    const val androidXJUnitKtx = "1.1.3"
-    const val androidXFragmentTesting = "1.5.0"
+    const val androidxTestCore = "1.5.0"
+    const val androidxTestCoreTesting = "2.2.0"
+    const val androidXJUnit = "1.1.5"
+    const val androidXFragmentTesting = "1.6.1"
     const val rxSchedulerRule = "1.0.2"
-    const val assertJ = "3.23.1"
+    const val assertJ = "3.24.2"
     const val mockitoKotlin = "1.6.0"
     const val robolectric = "4.8.1"
 }
diff --git a/core-test/build.gradle.kts b/core-test/build.gradle.kts
@@ -26,9 +26,9 @@ android {
     kotlinOptions {
         jvmTarget = "11"
     }
-
-    lintOptions {
-        warning("InvalidPackage")
+    namespace = "app.futured.arkitekt.core.test"
+    lint {
+        warning += setOf("InvalidPackage")
     }
 }
 

diff --git a/core-test/src/main/AndroidManifest.xml b/core-test/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="app.futured.arkitekt.core.test"/>
+<manifest />
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -33,6 +33,7 @@ android {
     kotlinOptions {
         jvmTarget = "11"
     }
+    namespace = "app.futured.arkitekt.core"
 }
 
 dependencies {

diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest
-    package="app.futured.arkitekt.core"/>
+<manifest />
diff --git a/core/src/main/java/app/futured/arkitekt/core/livedata/LiveDataUtils.kt b/core/src/main/java/app/futured/arkitekt/core/livedata/LiveDataUtils.kt
@@ -2,7 +2,7 @@ package app.futured.arkitekt.core.livedata
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.map
 
 fun <T1, T2, RESULT> combineLiveData(
     t1: LiveData<T1>,
@@ -24,7 +24,7 @@ fun <T1, T2, RESULT> combineLiveData(
         addSource(t1) { lastT1 = it; update() }
         addSource(t2) { lastT2 = it; update() }
     }
-    return Transformations.map(mediatorLiveData) { callback(it.first, it.second) }
+    return mediatorLiveData.map { callback(it.first, it.second) }
 }
 
 fun <T1, T2, T3, RESULT> combineLiveData(
@@ -52,7 +52,7 @@ fun <T1, T2, T3, RESULT> combineLiveData(
         addSource(t2) { lastT2 = it; update() }
         addSource(t3) { lastT3 = it; update() }
     }
-    return Transformations.map(mediatorLiveData) { callback(it.first, it.second, it.third) }
+    return mediatorLiveData.map { callback(it.first, it.second, it.third) }
 }
 
 @Suppress("LongParameterList", "ComplexCondition")
@@ -88,7 +88,7 @@ fun <T1, T2, T3, T4, RESULT> combineLiveData(
         addSource(t3) { lastT3 = it; update() }
         addSource(t4) { lastT4 = it; update() }
     }
-    return Transformations.map(mediatorLiveData) { callback(it.first, it.second, it.third, it.fourth) }
+    return mediatorLiveData.map { callback(it.first, it.second, it.third, it.fourth) }
 }
 
 @Suppress("LongParameterList", "ComplexCondition")
@@ -127,7 +127,7 @@ fun <T1, T2, T3, T4, T5, RESULT> combineLiveData(
         addSource(t4) { lastT4 = it; update() }
         addSource(t5) { lastT5 = it; update() }
     }
-    return Transformations.map(mediatorLiveData) { callback(it.first, it.second, it.third, it.fourth, it.fifth) }
+    return mediatorLiveData.map { callback(it.first, it.second, it.third, it.fourth, it.fifth) }
 }
 
 @Suppress("LongParameterList", "ComplexCondition")
@@ -172,7 +172,7 @@ fun <T1, T2, T3, T4, T5, T6, RESULT> combineLiveData(
         addSource(t5) { lastT5 = it; update() }
         addSource(t6) { lastT6 = it; update() }
     }
-    return Transformations.map(mediatorLiveData) {
+    return mediatorLiveData.map {
         callback(
             it.first,
             it.second,
@@ -239,7 +239,7 @@ fun <T1, T2, T3, T4, T5, T6, T7, RESULT> combineLiveData(
         addSource(t6) { lastT6 = it; update() }
         addSource(t7) { lastT7 = it; update() }
     }
-    return Transformations.map(mediatorLiveData) {
+    return mediatorLiveData.map {
         callback(
             it.first,
             it.second,

diff --git a/core/src/test/AndroidManifest.xml b/core/src/test/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="app.futured.arkitekt.sample">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"

diff --git a/cr-usecases-test/build.gradle.kts b/cr-usecases-test/build.gradle.kts
@@ -26,9 +26,9 @@ android {
     kotlinOptions {
         jvmTarget = "11"
     }
-
-    lintOptions {
-        warning("InvalidPackage")
+    namespace = "app.futured.arkitekt.crusecases.test"
+    lint {
+        warning += setOf("InvalidPackage")
     }
 }
 

diff --git a/cr-usecases-test/src/main/AndroidManifest.xml b/cr-usecases-test/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="app.futured.arkitekt.crusecases.test" />
+<manifest />
diff --git a/cr-usecases/build.gradle.kts b/cr-usecases/build.gradle.kts
@@ -26,6 +26,7 @@ android {
     kotlinOptions {
         jvmTarget = "11"
     }
+    namespace = "app.futured.arkitekt.crusecases"
 }
 
 dependencies {

diff --git a/cr-usecases/src/main/AndroidManifest.xml b/cr-usecases/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="app.futured.arkitekt.crusecases" />
+<manifest />
diff --git a/dagger/build.gradle.kts b/dagger/build.gradle.kts
@@ -23,6 +23,7 @@ android {
     kotlinOptions {
         jvmTarget = "11"
     }
+    namespace = "app.futured.arkitekt.dagger"
 }
 
 dependencies {

diff --git a/dagger/src/main/AndroidManifest.xml b/dagger/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="app.futured.arkitekt.dagger"/>
+<manifest />
diff --git a/dagger/src/main/java/app/futured/arkitekt/dagger/factory/BaseSavedStateViewModelFactory.kt b/dagger/src/main/java/app/futured/arkitekt/dagger/factory/BaseSavedStateViewModelFactory.kt
@@ -24,7 +24,7 @@ abstract class BaseSavedStateViewModelFactory <T : BaseViewModel<*>>(
      */
     abstract override val viewModelClass: KClass<T>
 
-    override fun <T : ViewModel?> create(
+    override fun <T : ViewModel> create(
         key: String,
         modelClass: Class<T>,
         handle: SavedStateHandle

diff --git a/example-hilt/build.gradle.kts b/example-hilt/build.gradle.kts
@@ -30,6 +30,7 @@ android {
     kotlinOptions {
         jvmTarget = "11"
     }
+    namespace = "app.futured.arkitekt.sample.hilt"
 }
 
 dependencies {

diff --git a/example-hilt/src/main/AndroidManifest.xml b/example-hilt/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="app.futured.arkitekt.sample.hilt">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:name="app.futured.arkitekt.examplehilt.App"

diff --git a/example-minimal/build.gradle.kts b/example-minimal/build.gradle.kts
@@ -27,6 +27,7 @@ android {
     kotlinOptions {
         jvmTarget = "11"
     }
+    namespace = "app.futured.arkitekt.sample"
 }
 
 dependencies {

diff --git a/example-minimal/src/main/AndroidManifest.xml b/example-minimal/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="app.futured.arkitekt.sample">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:name=".App"

diff --git a/example/build.gradle.kts b/example/build.gradle.kts
@@ -41,6 +41,7 @@ android {
     kotlinOptions {
         jvmTarget = "11"
     }
+    namespace = "app.futured.arkitekt.sample"
 
     configurations.all {
         resolutionStrategy {

diff --git a/example/src/main/AndroidManifest.xml b/example/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="app.futured.arkitekt.sample">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:name=".App"

diff --git a/gradle.properties b/gradle.properties
@@ -17,3 +17,6 @@ RELEASE_SIGNING_ENABLED=true
 android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip