Merge pull request #62 from Q42/kotlin2

Kotlin 2.0!!

Author: Frank1234

.github/workflows/pr.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: "corretto" # See 'Supported distributions' for available options
-          java-version: "17"
+          java-version: "21"
           cache: "gradle"
       - name: Update version code
         uses: chkfung/android-version-actions@v1.2.1

.idea/compiler.xml

@@ -2,6 +2,7 @@ plugins {
     id "com.android.application"
     alias libs.plugins.googleServices
     alias libs.plugins.firebaseCrashlyticsPlugin
+    alias libs.plugins.compose.compiler
 }
 
 apply from: "$rootDir/build.module.feature-and-app.gradle"

.idea/gradle.xml

@@ -5,7 +5,7 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
-}
+}

.idea/kotlinc.xml

@@ -4,9 +4,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.kotlinCompilerComposeExtensionVersion.get()
-    }
 }
 
 dependencies {
@@ -17,4 +14,4 @@ dependencies {
     implementation(libs.composeUIToolingPreview)
     implementation(libs.composeMaterial3)
     implementation(libs.composeLifecycle)
-}
+}

.idea/misc.xml

@@ -17,6 +17,7 @@ plugins { // sets class paths only (because of 'apply false')
     alias libs.plugins.ksp apply false
     alias libs.plugins.googleServices apply false
     alias libs.plugins.firebaseCrashlyticsPlugin apply false
+    alias libs.plugins.compose.compiler apply false
 }
 
 allprojects {

app/build.gradle

@@ -22,9 +22,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.kotlinCompilerComposeExtensionVersion.get()
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"

build.config.jvm.gradle

@@ -1,5 +1,6 @@
 plugins {
     id "com.android.library"
+    alias libs.plugins.compose.compiler
 }
 apply from: "$rootDir/build.module.library.gradle"
 apply from: "$rootDir/build.dep.compose.gradle"

build.dep.compose.gradle

@@ -1,9 +1,10 @@
 plugins {
     id "com.android.library"
+    alias libs.plugins.compose.compiler
 }
 apply from: "$rootDir/build.module.library.gradle"
 apply from: "$rootDir/build.dep.compose.gradle"
 
 android {
     namespace = "nl.q42.template.core.ui"
-}
+}

build.gradle

@@ -6,7 +6,7 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import nl.q42.template.data.user.UserRepositoryImpl
-import nl.q42.data.user.remote.model.UserApi
+import nl.q42.template.data.user.remote.UserApi
 import nl.q42.template.domain.user.repo.UserRepository
 import retrofit2.Retrofit
 import javax.inject.Singleton
@@ -29,4 +29,4 @@ internal interface UserRepoModule {
     @Binds
     @Singleton
     fun bindUserRepository(impl: UserRepositoryImpl): UserRepository
-}
+}

build.module.feature-and-app.gradle

@@ -1,4 +1,4 @@
-package nl.q42.data.user.remote.model
+package nl.q42.template.data.user.remote
 
 import com.haroldadmin.cnradapter.NetworkResponse
 import nl.q42.template.actionresult.data.ApiErrorResponse
@@ -13,4 +13,4 @@ internal interface UserApi {
      */
     @GET("get")
     suspend fun getUsers(@Query("email") dummyEmailForResponse: String): NetworkResponse<UserDTO, ApiErrorResponse>
-}
+}

core/navigation/build.gradle

@@ -2,7 +2,6 @@ package nl.q42.template.data.user.remote
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import nl.q42.data.user.remote.model.UserApi
 import nl.q42.template.actionresult.data.mapToActionResult
 import nl.q42.template.actionresult.domain.ActionResult
 import nl.q42.template.actionresult.domain.map

core/ui/build.gradle

@@ -1,5 +1,6 @@
 plugins {
     id "com.android.library"
+    alias libs.plugins.compose.compiler
 }
 apply from: "$rootDir/build.module.feature-and-app.gradle"
 apply from: "$rootDir/build.dep.navigation.gradle"
@@ -20,4 +21,4 @@ dependencies {
     implementation project(':core:ui')
     implementation project(':core:actionresult')
     implementation project(':core:navigation')
-}
+}

data/user/src/main/kotlin/nl/q42/template/data/user/di/UserDataModule.kt

@@ -1,5 +1,6 @@
 plugins {
     id "com.android.library"
+    alias libs.plugins.compose.compiler
 }
 apply from: "$rootDir/build.module.feature-and-app.gradle"
 apply from: "$rootDir/build.dep.navigation.gradle"
@@ -20,4 +21,4 @@ dependencies {
     implementation project(':core:ui')
     implementation project(':core:actionresult')
     implementation project(':core:navigation')
-}
+}

data/user/src/main/kotlin/nl/q42/template/data/user/remote/UserApi.kt

@@ -1,30 +1,29 @@
 [versions]
-androidxCore = "1.12.0"
-androidxLifecycle = "2.7.0"
-kotlinxCoroutinesTest = "1.7.3"
+androidxCore = "1.13.1"
+androidxLifecycle = "2.8.4"
+kotlinxCoroutinesTest = "1.8.1"
 junit = "4.13.2"
 mockkAndroid = "1.13.9"
-jvmTarget = "17"
-kotlin = "1.9.22"
-ksp = "1.9.22-1.0.18"
-gradlePlugin = "8.2.1"
-googleServices = "4.4.0"
-crashlyticsPlugin = "2.9.9"
-firebaseBOM = "32.7.0"
+jvmTarget = "21"
+kotlin = "2.0.0"
+ksp = "2.0.0-1.0.21"
+gradlePlugin = "8.4.1"
+googleServices = "4.4.1"
+crashlyticsPlugin = "3.0.1"
+firebaseBOM = "33.0.0"
 manesVersions = "0.44.0"
 littleRobotsCatalogUpdates = "0.8.1"
 hilt = "2.50"
-retrofit = "2.9.0"
+retrofit = "2.10.0"
 kotlinx-serialization = "1.6.3"
 retrofit2KotlinxSerializationConverter = "1.0.0"
 networkResponseAdapter = "5.0.0"
 napier = "2.7.1"
-composeDestinations = "1.9.60"
+composeDestinations = "1.10.2"
 okhttp = "4.12.0"
-composePlatform = "2023.10.01"
-kotlinCompilerComposeExtensionVersion = "1.5.8"
-activityCompose = "1.8.2"
-hiltNavigationCompose = "1.1.0"
+composePlatform = "2024.05.00"
+activityCompose = "1.9.0"
+hiltNavigationCompose = "1.2.0"
 composeLifecycle = "2.7.0"
 turbine = "1.0.0"
 
@@ -71,3 +70,4 @@ hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 googleServices = { id = "com.google.gms.google-services", version.ref = "googleServices" }
 firebaseCrashlyticsPlugin = { id = "com.google.firebase.crashlytics", version.ref = "crashlyticsPlugin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

data/user/src/main/kotlin/nl/q42/template/data/user/remote/UserRemoteDataSource.kt

@@ -1,6 +1,6 @@
 #Thu Jan 26 10:33:34 CET 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists