From 54d127a611aaa1c8005b5994ae7c3d6f23f4a5f5 Mon Sep 17 00:00:00 2001 From: Yuichiro Kinoshita Date: Thu, 19 Sep 2024 00:25:53 +0900 Subject: [PATCH] =?UTF-8?q?kotlin=E3=82=922.0=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/kotlinc.xml | 2 +- app/build.gradle | 3 ++- build.gradle | 2 ++ gradle.properties | 2 +- libs.versions.toml | 3 ++- modules/common/build.gradle | 3 ++- modules/common_android_ui/build.gradle | 3 ++- modules/common_compose/build.gradle | 3 ++- modules/features/account/build.gradle | 3 ++- modules/features/auth/build.gradle | 3 ++- modules/features/channel/build.gradle | 4 +++- modules/features/clip/build.gradle | 3 ++- modules/features/drive/build.gradle | 4 ++-- modules/features/gallery/build.gradle | 3 ++- modules/features/group/build.gradle | 3 ++- modules/features/messaging/build.gradle | 3 ++- modules/features/note/build.gradle | 3 ++- modules/features/search/build.gradle | 3 ++- modules/features/setting/build.gradle | 4 ++-- modules/features/user/build.gradle | 3 ++- modules/features/userlist/build.gradle | 3 ++- 21 files changed, 41 insertions(+), 22 deletions(-) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index f8467b458e..6d0ee1c2a9 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index da2c1e81e3..97be3797a0 100644 --- 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 index 4b8b3698f8..8259f285c6 100644 --- 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 index 2603404252..1599da37ee 100644 --- 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 index c65ff75db4..97797223ef 100644 --- 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" } \ No newline at end of file diff --git a/modules/common/build.gradle b/modules/common/build.gradle index 75e3ff86e4..d3c8e65b9c 100644 --- 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 index 75f56c625c..5794cbb013 100644 --- 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 index 1d6f99fa9b..1ddf1ed2c5 100644 --- 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 index 9a23a1dd7a..e442149974 100644 --- 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 index 39fe129ecd..1eada9bc3d 100644 --- 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 index 9b8e9fc791..f3ae39a1f4 100644 --- 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 index 89965b8a0f..aae98bf840 100644 --- 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 index 8560030d32..13d2ff1936 100644 --- 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 index 705533a739..60d8157dc4 100644 --- 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 index e1f6f62d08..15cb3acf62 100644 --- 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 index 5a891675f5..6f9db8a324 100644 --- 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 index 84814338b8..9a8d8192ec 100644 --- 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 index 1b346fad74..e2bf604b7b 100644 --- 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 index c67433eb23..4af443e28d 100644 --- 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 index db9916f74e..00087f5621 100644 --- 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 index 5dedad4ada..83268db780 100644 --- 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 {