chore:kotlin 2.0

Author: shinhyo

.gitignore

@@ -8,3 +8,4 @@ build/
 .externalNativeBuild
 app/build
 build
+/.kotlin

README.md

@@ -2,8 +2,8 @@
 
 <p align="center">
   <a href='https://developer.android.com'><img src='http://img.shields.io/badge/platform-android-green.svg'/></a>
-  <a href="https://kotlinlang.org/docs/whatsnew1920.html"><img src = "https://shields.io/badge/kotlin-1.9.23-blue" /></a>
-  <a href="https://developer.android.com/jetpack/compose/bom"><img src = "https://img.shields.io/badge/jetpack%20compose-2024.05.00-brightgreen" /></a>
+  <a href="https://kotlinlang.org/docs/whatsnew1920.html"><img src = "https://shields.io/badge/kotlin-2.0-blue" /></a>
+  <a href="https://developer.android.com/jetpack/compose/bom"><img src = "https://img.shields.io/badge/jetpack%20compose-2024.06.00-brightgreen" /></a>
   <a href="https://opensource.org/licenses/Apache-2.0"><img src="https://img.shields.io/badge/license-Apache%202.0-blue.svg"/></a>
 </p>
 

build-logic/convention/build.gradle.kts

@@ -20,6 +20,7 @@ tasks.withType<KotlinCompile>().configureEach {
 dependencies {
     compileOnly(libs.android.gradlePlugin)
     compileOnly(libs.android.tools.common)
+    compileOnly(libs.compose.gradlePlugin)
     compileOnly(libs.kotlin.gradlePlugin)
     compileOnly(libs.ksp.gradlePlugin)
 }

build-logic/convention/src/main/kotlin/io/github/shinhyo/brba/buildlogic/AndroidCompose.kt

@@ -2,15 +2,18 @@ package io.github.shinhyo.brba.buildlogic
 
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.getByType
+import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension
 
 internal fun Project.configureAndroidCompose() {
     androidExtension.apply {
-        buildFeatures {
-            compose = true
+
+        with(plugins) {
+            apply("org.jetbrains.kotlin.plugin.compose")
         }
 
-        composeOptions {
-            kotlinCompilerExtensionVersion = findVersion("androidxComposeCompiler").toString()
+        buildFeatures {
+            compose = true
         }
 
         dependencies {
@@ -19,4 +22,9 @@ internal fun Project.configureAndroidCompose() {
         }
 
     }
+
+    extensions.getByType<ComposeCompilerGradlePluginExtension>().apply {
+        enableStrongSkippingMode.set(true)
+        includeSourceInformation.set(true)
+    }
 }

build-logic/convention/src/main/kotlin/io/github/shinhyo/brba/buildlogic/KotlinAndroid.kt

@@ -3,7 +3,9 @@ package io.github.shinhyo.brba.buildlogic
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.provideDelegate
 import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 internal fun Project.configureKotlinAndroid() {
@@ -29,20 +31,19 @@ internal fun Project.configureKotlinAndroid() {
 
 private fun Project.configureKotlin() {
     tasks.withType<KotlinCompile>().configureEach {
-        kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_17.toString()
-            allWarningsAsErrors = properties["warningsAsErrors"] as? Boolean ?: false
-            compilerOptions.freeCompilerArgs.addAll(
-                "-P",
-                "plugin:androidx.compose.compiler.plugins.kotlin:strongSkipping=true",
-            )
-            freeCompilerArgs = freeCompilerArgs + listOf(
-                "-Xcontext-receivers",
-                "-opt-in=kotlin.RequiresOptIn",
-                "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-                "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
-                "-opt-in=androidx.compose.foundation.layout.ExperimentalLayoutApi",
-                "-opt-in=androidx.compose.animation.ExperimentalSharedTransitionApi",
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
+            val warningsAsErrors: String? by project
+            allWarningsAsErrors.set(warningsAsErrors.toBoolean())
+            freeCompilerArgs.set(
+                freeCompilerArgs.get() + listOf(
+                    "-Xcontext-receivers",
+                    "-opt-in=kotlin.RequiresOptIn",
+                    "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+                    "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
+                    "-opt-in=androidx.compose.foundation.layout.ExperimentalLayoutApi",
+                    "-opt-in=androidx.compose.animation.ExperimentalSharedTransitionApi",
+                ),
             )
         }
     }

build.gradle.kts

@@ -9,6 +9,7 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.hilt) apply false
     alias(libs.plugins.ksp) apply false
 }

gradle/libs.versions.toml

@@ -3,30 +3,28 @@ compileSdkVer = "34"
 targetSdkVer = "34"
 minSdkVer = "28"
 
-androidGradlePlugin = "8.4.0"
-androidTools = "31.4.0"
+androidGradlePlugin = "8.5.0"
+androidTools = "31.5.0"
 
-kotlin = "1.9.23"
+kotlin = "2.0.0"
 #https://github.com/google/ksp/releases
-ksp = "1.9.23-1.0.20"
-#https://developer.android.com/jetpack/androidx/releases/compose-kotlin
-androidxComposeCompiler = "1.5.13"
+ksp = "2.0.0-1.0.22"
 androidDesugarJdkLibs = "2.0.4"
 
-kotlinxCoroutines = "1.8.0"
+kotlinxCoroutines = "1.8.1"
 
 androidxCore = "1.13.1"
 androidxCoreSplashscreen = "1.0.1"
-androidxAppCompat = "1.6.1"
+androidxAppCompat = "1.7.0"
 androidxActivity = "1.9.0"
 androidxStartup = "1.1.1"
 androidxHiltNavigationCompose = "1.2.0"
 androidxConstraintlayoutCompose = "1.0.1"
-androidxLifecycle = "2.7.0"
+androidxLifecycle = "2.8.2"
 androidxDataStore = "1.1.1"
 
-androidxComposeBom = "2024.05.00"
-androidxCompose = "1.7.0-alpha08"
+androidxComposeBom = "2024.06.00"
+androidxCompose = "1.7.0-beta03"
 androidxComposeMaterial3 = "1.1.2"
 
 hilt = "2.51.1"
@@ -35,9 +33,9 @@ hiltExt = "1.0.0"
 androidxNavigation = "2.7.7"
 
 junit4 = "4.13.2"
-androidxTestCore = "1.5.0"
-androidxTestExt = "1.1.5"
-androidxEspresso = "3.5.1"
+androidxTestCore = "1.6.0"
+androidxTestExt = "1.2.0"
+androidxEspresso = "3.6.0"
 
 coil = "2.6.0"
 javaxInject = "1"
@@ -47,7 +45,7 @@ retrofit = "2.11.0"
 gson = "2.10.1"
 room = "2.6.1"
 turbine = "1.1.0"
-junit = "1.1.5"
+junit = "1.2.0"
 material = "1.12.0"
 haze = "0.7.1"
 
@@ -63,6 +61,7 @@ android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", ver
 android-tools-common = { group = "com.android.tools", name = "common", version.ref = "androidTools" }
 kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 ksp-gradlePlugin = { group = "com.google.devtools.ksp", name = "com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
+compose-gradlePlugin = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }
 
 # android
 android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" }
@@ -133,6 +132,7 @@ haze = { group = "dev.chrisbanes.haze", name = "haze", version.ref = "haze" }
 
 [plugins]
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
 android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Sep 29 07:27:22 KST 2023
+#Tue Jun 25 15:56:57 KST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists