chore: upgrade Gradle, Kotlin, Java and AndroidX libs.

paug · Oct 31, 2023 · 7828371 · 7828371
1 parent fa6bf89
commit 7828371
Show file tree

Hide file tree

Showing 20 changed files with 41 additions and 45 deletions.
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
@@ -1,4 +1,3 @@
-enableFeaturePreview("VERSION_CATALOGS")
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 dependencyResolutionManagement {

diff --git a/build-logic/src/main/kotlin/io/openfeedback/extensions/LibraryExtensionExt.kt b/build-logic/src/main/kotlin/io/openfeedback/extensions/LibraryExtensionExt.kt
@@ -3,7 +3,6 @@
 package io.openfeedback.extensions
 
 import com.android.build.api.dsl.CommonExtension
-import com.android.build.gradle.LibraryExtension
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.api.artifacts.VersionCatalogsExtension
@@ -12,24 +11,24 @@ import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.getByType
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
 
-internal fun CommonExtension<*, *, *, *>.configureKotlinAndroid() {
-    compileSdk = 33
+internal fun CommonExtension<*, *, *, *, *>.configureKotlinAndroid() {
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 21
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 }
 
-internal fun CommonExtension<*, *, *, *>.configureAndroidCompose(project: Project) {
+internal fun CommonExtension<*, *, *, *, *>.configureAndroidCompose(project: Project) {
     val libs = project.extensions.getByType<VersionCatalogsExtension>().named("libs")
 
     buildFeatures {
@@ -46,6 +45,6 @@ internal fun CommonExtension<*, *, *, *>.configureAndroidCompose(project: Projec
     }
 }
 
-private fun CommonExtension<*, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
+private fun CommonExtension<*, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
     (this as ExtensionAware).extensions.configure("kotlinOptions", block)
 }
diff --git a/build-logic/src/main/kotlin/io/openfeedback/extensions/TaskContainerExt.kt b/build-logic/src/main/kotlin/io/openfeedback/extensions/TaskContainerExt.kt
@@ -7,6 +7,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 fun TaskContainer.configureKotlinCompiler() = withType<KotlinCompile> {
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 }
diff --git a/build-logic/src/main/kotlin/io/openfeedback/plugins/ComposeLibraryPlugin.kt b/build-logic/src/main/kotlin/io/openfeedback/plugins/ComposeLibraryPlugin.kt
@@ -22,7 +22,7 @@ class ComposeLibraryPlugin : Plugin<Project> {
         target.extensions.configure<LibraryExtension> {
             configureKotlinAndroid()
             configureAndroidCompose(target)
-            defaultConfig.targetSdk = 33
+            defaultConfig.targetSdk = 34
         }
         target.tasks.configureKotlinCompiler()
     }

diff --git a/build-logic/src/main/kotlin/io/openfeedback/plugins/LibraryPlugin.kt b/build-logic/src/main/kotlin/io/openfeedback/plugins/LibraryPlugin.kt
@@ -20,7 +20,7 @@ class LibraryPlugin : Plugin<Project> {
         target.extensions.create("openfeedback", OpenFeedback::class.java, target)
         target.extensions.configure<LibraryExtension> {
             configureKotlinAndroid()
-            defaultConfig.targetSdk = 33
+            defaultConfig.targetSdk = 34
         }
         target.tasks.configureKotlinCompiler()
     }

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.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
diff --git a/libs.versions.toml b/libs.versions.toml
@@ -1,16 +1,16 @@
 [versions]
-kotlin_lang = "1.7.20"
-kotlin_coroutines = "1.6.4"
-androidx_core = "1.7.0"
-androidx_compose_bom = "2022.10.00"
-androidx_compose_compiler = "1.3.2"
-androidx_lifecycle = "2.4.1"
-androidx_savedstate = "1.1.0"
+kotlin_lang = "1.9.10"
+kotlin_coroutines = "1.7.3"
+androidx_core = "1.12.0"
+androidx_compose_bom = "2023.10.01"
+androidx_compose_compiler = "1.5.3"
+androidx_lifecycle = "2.6.2"
+androidx_savedstate = "1.2.1"
 firebase_firestore = "24.0.1"
 firebase_auth = "21.0.1"
 
 [libraries]
-android-gradle-plugin = "com.android.tools.build:gradle:7.3.1"
+android-gradle-plugin = "com.android.tools.build:gradle:8.1.2"
 vespene = "net.mbonnin.vespene:vespene-lib:0.5"
 
 kotlin_gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin_lang" }

diff --git a/openfeedback-m2/build.gradle.kts b/openfeedback-m2/build.gradle.kts
@@ -3,6 +3,10 @@ plugins {
     id("io.openfeedback.plugins.compose.lib")
 }
 
+android {
+    namespace = "io.openfeedback.android.m2"
+}
+
 openfeedback {
     configurePublishing("feedback-android-sdk-m2")
 }

diff --git a/openfeedback-m2/src/main/AndroidManifest.xml b/openfeedback-m2/src/main/AndroidManifest.xml
diff --git a/openfeedback-m3/build.gradle.kts b/openfeedback-m3/build.gradle.kts
@@ -3,6 +3,10 @@ plugins {
     id("io.openfeedback.plugins.compose.lib")
 }
 
+android {
+    namespace = "io.openfeedback.android.m3"
+}
+
 openfeedback {
     configurePublishing("feedback-android-sdk-m3")
 }

diff --git a/openfeedback-m3/src/main/AndroidManifest.xml b/openfeedback-m3/src/main/AndroidManifest.xml
diff --git a/openfeedback-ui/build.gradle.kts b/openfeedback-ui/build.gradle.kts
@@ -3,6 +3,10 @@ plugins {
     id("io.openfeedback.plugins.compose.lib")
 }
 
+android {
+    namespace = "io.openfeedback.android.ui"
+}
+
 openfeedback {
     configurePublishing("feedback-android-sdk-ui")
 }

diff --git a/openfeedback-ui/src/main/AndroidManifest.xml b/openfeedback-ui/src/main/AndroidManifest.xml
diff --git a/openfeedback-viewmodel/build.gradle.kts b/openfeedback-viewmodel/build.gradle.kts
@@ -3,6 +3,10 @@ plugins {
     id("io.openfeedback.plugins.compose.lib")
 }
 
+android {
+    namespace = "io.openfeedback.android.viewmodel"
+}
+
 openfeedback {
     configurePublishing("feedback-android-sdk-viewmodel")
 }

diff --git a/openfeedback-viewmodel/src/main/AndroidManifest.xml b/openfeedback-viewmodel/src/main/AndroidManifest.xml
diff --git a/openfeedback/build.gradle.kts b/openfeedback/build.gradle.kts
@@ -3,6 +3,10 @@ plugins {
     id("io.openfeedback.plugins.lib")
 }
 
+android {
+    namespace = "io.openfeedback.android"
+}
+
 openfeedback {
     configurePublishing("feedback-android-sdk")
 }

diff --git a/openfeedback/src/main/AndroidManifest.xml b/openfeedback/src/main/AndroidManifest.xml
diff --git a/sample-app/build.gradle.kts b/sample-app/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
 }
 
 android {
+    namespace = "io.openfeedback.android.sample"
     defaultConfig {
         versionCode = 1
         versionName = "1"

diff --git a/sample-app/src/main/AndroidManifest.xml b/sample-app/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="io.openfeedback.android.sample">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,5 +1,3 @@
-enableFeaturePreview("VERSION_CATALOGS")
-
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {