diff --git a/.gitignore b/.gitignore index 10cfdbf..3937192 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ .externalNativeBuild .cxx local.properties +#Kotlin 2.0 +.kotlin/ \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1566725..c500977 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -3,6 +3,7 @@ plugins { alias(libs.plugins.kotlin.android) alias(libs.plugins.kapt) alias(libs.plugins.hilt.android) + alias(libs.plugins.kotlin.compose.compiler) } android { @@ -46,10 +47,6 @@ android { compose = true } - composeOptions { - kotlinCompilerExtensionVersion = libs.versions.kotlinCompilerExtensionVersion.get() - } - packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" diff --git a/build.gradle.kts b/build.gradle.kts index 3c40e65..57ff612 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,6 +2,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.kotlin.compose.compiler) apply false alias(libs.plugins.kotlin.serialization) apply false alias(libs.plugins.hilt.android) apply false alias(libs.plugins.kapt) apply false diff --git a/core/view/build.gradle.kts b/core/view/build.gradle.kts index e050c37..d521879 100644 --- a/core/view/build.gradle.kts +++ b/core/view/build.gradle.kts @@ -3,6 +3,7 @@ plugins { alias(libs.plugins.kotlin.android) alias(libs.plugins.hilt.android) alias(libs.plugins.kapt) + alias(libs.plugins.kotlin.compose.compiler) } android { @@ -39,10 +40,6 @@ android { buildFeatures { compose = true } - - composeOptions { - kotlinCompilerExtensionVersion = libs.versions.kotlinCompilerExtensionVersion.get() - } } dependencies { diff --git a/feature/login/build.gradle.kts b/feature/login/build.gradle.kts index 6e840eb..b7be74c 100644 --- a/feature/login/build.gradle.kts +++ b/feature/login/build.gradle.kts @@ -6,6 +6,7 @@ plugins { alias(libs.plugins.parcelable) alias(libs.plugins.paparazzi) alias(libs.plugins.kotlin.serialization) + alias(libs.plugins.kotlin.compose.compiler) } android { @@ -43,10 +44,6 @@ android { compose = true } - composeOptions { - kotlinCompilerExtensionVersion = libs.versions.kotlinCompilerExtensionVersion.get() - } - testOptions.unitTests { isReturnDefaultValues = true all { tests -> diff --git a/feature/postdetails/build.gradle.kts b/feature/postdetails/build.gradle.kts index ed71e76..7f36ce2 100644 --- a/feature/postdetails/build.gradle.kts +++ b/feature/postdetails/build.gradle.kts @@ -3,6 +3,7 @@ plugins { alias(libs.plugins.kotlin.android) alias(libs.plugins.kapt) alias(libs.plugins.hilt.android) + alias(libs.plugins.kotlin.compose.compiler) } android { @@ -40,10 +41,6 @@ android { compose = true } - composeOptions { - kotlinCompilerExtensionVersion = libs.versions.kotlinCompilerExtensionVersion.get() - } - testOptions.unitTests { isReturnDefaultValues = true all { tests -> diff --git a/feature/signup/build.gradle.kts b/feature/signup/build.gradle.kts index 0550028..ac753cb 100644 --- a/feature/signup/build.gradle.kts +++ b/feature/signup/build.gradle.kts @@ -1,6 +1,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.compose.compiler) } android { @@ -38,10 +39,6 @@ android { compose = true } - composeOptions { - kotlinCompilerExtensionVersion = libs.versions.kotlinCompilerExtensionVersion.get() - } - testOptions.unitTests { isReturnDefaultValues = true all { tests -> diff --git a/feature/timeline/build.gradle.kts b/feature/timeline/build.gradle.kts index 0a5c670..43654bc 100644 --- a/feature/timeline/build.gradle.kts +++ b/feature/timeline/build.gradle.kts @@ -1,6 +1,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.compose.compiler) } android { @@ -38,10 +39,6 @@ android { compose = true } - composeOptions { - kotlinCompilerExtensionVersion = libs.versions.kotlinCompilerExtensionVersion.get() - } - testOptions.unitTests { isReturnDefaultValues = true all { tests -> diff --git a/feature/welcome/build.gradle.kts b/feature/welcome/build.gradle.kts index 1049570..16476ae 100644 --- a/feature/welcome/build.gradle.kts +++ b/feature/welcome/build.gradle.kts @@ -2,6 +2,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) alias(libs.plugins.paparazzi) + alias(libs.plugins.kotlin.compose.compiler) } android { @@ -39,10 +40,6 @@ android { compose = true } - composeOptions { - kotlinCompilerExtensionVersion = libs.versions.kotlinCompilerExtensionVersion.get() - } - testOptions.unitTests { isReturnDefaultValues = true all { tests -> diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d6fda2f..d051b19 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,26 +1,24 @@ [versions] minSdkVersion = "26" compileSdkVersion = "34" - kotlinCompilerExtensionVersion = "1.5.10" javaVersion = "17" - gradlePluginVersion = "8.4.1" - kotlinSerializationVersion = "1.9.22" + gradlePluginVersion = "8.5.1" roomVersion = "2.6.1" truthVersion = "1.1.5" - kotlinVersion = "1.9.22" + kotlinVersion = "2.0.0" androidxCoreKtxVersion = "1.13.1" - composeBomVersion = "2024.05.00" + composeBomVersion = "2024.06.00" composeActivityVersion = "1.9.0" composeNavVersion = "2.7.7" coilVersion = "2.6.0" - androidxUnitVersion = "1.1.5" - androidxEspressoVersion = "3.5.1" + androidxUnitVersion = "1.2.1" + androidxEspressoVersion = "3.6.1" testJunitJupiterVersion = "5.10.0" - androidxLifecycleVersion = "2.8.1" - hiltVersion = "2.50" + androidxLifecycleVersion = "2.8.3" + hiltVersion = "2.51" hiltNavigationVersion = "1.2.0" paparazziVersion = "1.3.1" - retrofitVersion = "2.9.0" + retrofitVersion = "2.11.0" okhttpVersion = "4.12.0" [libraries] @@ -80,8 +78,9 @@ android-application = { id = "com.android.application", version.ref = "gradlePluginVersion" } android-library = { id = "com.android.library", version.ref = "gradlePluginVersion" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinVersion" } + kotlin-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlinVersion" } kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlinVersion" } - kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinSerializationVersion" } + kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinVersion" } hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hiltVersion" } paparazzi = { id = "app.cash.paparazzi", version.ref = "paparazziVersion" } parcelable = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlinVersion" }