kotlinを2.0にした

pantasystem · Sep 18, 2024 · 54d127a · 54d127a
1 parent 6b17eb8
commit 54d127a
Show file tree

Hide file tree

Showing 21 changed files with 41 additions and 22 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,6 +8,7 @@ plugins {
     id('dagger.hilt.android.plugin')
     id('com.github.triplet.play') version("3.7.0")
     id('com.google.firebase.crashlytics')
+    alias(libs.plugins.compose.compiler)
 }
 
 
@@ -77,7 +78,7 @@ android {
 
 
     composeOptions {
-        kotlinCompilerExtensionVersion = compose_version
+//        kotlinCompilerExtensionVersion = compose_version
     }
     // for junit5
     testOptions {

diff --git a/build.gradle b/build.gradle
@@ -33,6 +33,8 @@ plugins {
     //classpath 'com.google.dagger:hilt-android-gradle-plugin:2.48.1'
     alias(libs.plugins.dagger.hilt.android) apply false
     alias(libs.plugins.android.test) apply false
+
+    alias(libs.plugins.compose.compiler) apply false
 }
 
 allprojects {

diff --git a/gradle.properties b/gradle.properties
@@ -16,7 +16,7 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.parallel=true
 kotlin.code.style=official
-org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+org.gradle.jvmargs=-Xmx4096M -Dkotlin.daemon.jvm.options\="-Xmx4096M"
 VERSION_CODE=94
 VERSION_NAME=v2.16.8
 android.defaults.buildfeatures.buildconfig=true

diff --git a/libs.versions.toml b/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-kotlin-version = "1.9.10"
+kotlin-version = "2.0.0"
 date-time = "0.4.0"
 compose = "1.7.1"
 compose-material-icons = "1.7.1"
@@ -126,3 +126,4 @@ android-application = { id = "com.android.application", version = "8.1.3" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin-version" }
 dagger-hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 android-test = { id = "com.android.test", version = "8.1.3" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin-version" }
diff --git a/modules/common/build.gradle b/modules/common/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-kapt'
     alias libs.plugins.kotlin.serialization.plugin
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -35,7 +36,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = compose_version
+//        kotlinCompilerExtensionVersion = compose_version
     }
     // for junit5
     testOptions {

diff --git a/modules/common_android_ui/build.gradle b/modules/common_android_ui/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id('kotlin-kapt')
     id('dagger.hilt.android.plugin')
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -34,7 +35,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = compose_version
+//        kotlinCompilerExtensionVersion = compose_version
     }
     // for junit5
     testOptions {

diff --git a/modules/common_compose/build.gradle b/modules/common_compose/build.gradle
@@ -2,6 +2,7 @@ plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-kapt'
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -32,7 +33,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = compose_version
+//        kotlinCompilerExtensionVersion = compose_version
     }
     // for junit5
     testOptions {

diff --git a/modules/features/account/build.gradle b/modules/features/account/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-kapt'
     id 'dagger.hilt.android.plugin'
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -39,7 +40,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = compose_version
+//        kotlinCompilerExtensionVersion = compose_version
 
     }
 

diff --git a/modules/features/auth/build.gradle b/modules/features/auth/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'dagger.hilt.android.plugin'
     id 'kotlin-kapt'
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -35,7 +36,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = compose_version
+//        kotlinCompilerExtensionVersion = compose_version
     }
     // for junit5
     testOptions {

diff --git a/modules/features/channel/build.gradle b/modules/features/channel/build.gradle
@@ -3,6 +3,8 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-kapt'
     id 'dagger.hilt.android.plugin'
+    alias(libs.plugins.compose.compiler)
+
 }
 
 android {
@@ -35,7 +37,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = compose_version
+//        kotlinCompilerExtensionVersion = compose_version
     }
     // for junit5
     testOptions {

diff --git a/modules/features/clip/build.gradle b/modules/features/clip/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-kapt'
     id 'dagger.hilt.android.plugin'
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -35,7 +36,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = compose_version
+//        kotlinCompilerExtensionVersion = compose_version
     }
 }
 

diff --git a/modules/features/drive/build.gradle b/modules/features/drive/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'dagger.hilt.android.plugin'
     id 'kotlin-kapt'
-
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -38,7 +38,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = compose_version
+//        kotlinCompilerExtensionVersion = compose_version
     }
     // for junit5
     testOptions {

diff --git a/modules/features/gallery/build.gradle b/modules/features/gallery/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-kapt'
     id 'dagger.hilt.android.plugin'
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -38,7 +39,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = compose_version
+//        kotlinCompilerExtensionVersion = compose_version
 
     }
     // for junit5

diff --git a/modules/features/group/build.gradle b/modules/features/group/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-kapt'
     id 'dagger.hilt.android.plugin'
+    alias(libs.plugins.compose.compiler)
 
 }
 
@@ -36,7 +37,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = compose_version
+//        kotlinCompilerExtensionVersion = compose_version
     }
     // for junit5
     testOptions {

diff --git a/modules/features/messaging/build.gradle b/modules/features/messaging/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-kapt'
     id 'dagger.hilt.android.plugin'
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -35,7 +36,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = compose_version
+//        kotlinCompilerExtensionVersion = compose_version
 
     }
 

diff --git a/modules/features/note/build.gradle b/modules/features/note/build.gradle
@@ -4,6 +4,7 @@ plugins {
     id 'dagger.hilt.android.plugin'
     id 'kotlin-kapt'
     alias libs.plugins.kotlin.serialization.plugin
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -36,7 +37,7 @@ android {
         dataBinding true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = compose_version
+//        kotlinCompilerExtensionVersion = compose_version
     }
     // for junit5
     testOptions {

diff --git a/modules/features/search/build.gradle b/modules/features/search/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id('kotlin-kapt')
     id('dagger.hilt.android.plugin')
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -34,7 +35,7 @@ android {
         dataBinding true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = compose_version
+//        kotlinCompilerExtensionVersion = compose_version
     }
     // for junit5
     testOptions {

diff --git a/modules/features/setting/build.gradle b/modules/features/setting/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id('kotlin-kapt')
     id('dagger.hilt.android.plugin')
-
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -37,7 +37,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = compose_version
+//        kotlinCompilerExtensionVersion = compose_version
     }
     // for junit5
     testOptions {

diff --git a/modules/features/user/build.gradle b/modules/features/user/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-kapt'
     id 'dagger.hilt.android.plugin'
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -35,7 +36,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = compose_version
+//        kotlinCompilerExtensionVersion = compose_version
     }
     // for junit5
     testOptions {

diff --git a/modules/features/userlist/build.gradle b/modules/features/userlist/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-kapt'
     id 'dagger.hilt.android.plugin'
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -35,7 +36,7 @@ android {
 
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = compose_version
+//        kotlinCompilerExtensionVersion = compose_version
     }
     // for junit5
     testOptions {