From 0fa24649e36207360fde61f85e2f5bdf71699cde Mon Sep 17 00:00:00 2001 From: Antonio Corrales Date: Wed, 5 Jun 2024 14:34:50 +0200 Subject: [PATCH] feat: migrate to kotlin 2.0 --- .gitignore | 1 + .idea/kotlinc.xml | 2 +- build.gradle | 3 ++- data/build.gradle.kts | 2 +- gradle/libs.versions.toml | 2 +- presentation/build.gradle.kts | 7 ++++++- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2dadc92..6019d4c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ /.idea/assetWizardSettings.xml /.idea/appInsightsSettings.xml /.idea/migrations.xml +/.kotlin presentation/release .DS_Store /build diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index fe63bb6..6d0ee1c 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 489cc80..00f54f8 100644 --- a/build.gradle +++ b/build.gradle @@ -10,5 +10,6 @@ buildscript { plugins { id 'com.android.application' version '8.3.1' apply false id 'com.android.library' version '8.3.1' apply false - id 'org.jetbrains.kotlin.android' version '1.9.23' apply false + id 'org.jetbrains.kotlin.android' version '2.0.0' apply false + id 'org.jetbrains.kotlin.plugin.compose' version '2.0.0' apply false } \ No newline at end of file diff --git a/data/build.gradle.kts b/data/build.gradle.kts index 20c123f..230bf9d 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id ("com.android.library") id ("org.jetbrains.kotlin.android") - id ("com.google.devtools.ksp") version "1.9.23-1.0.19" + id ("com.google.devtools.ksp") version "2.0.0-1.0.21" id ("com.google.protobuf") version "0.9.4" id ("de.mannodermaus.android-junit5") } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 383b840..9e5bcb6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ compose = "1.7.0-beta01" composeMaterial3 = "1.2.1" # gradlePlugin and lint need to be updated together gradlePlugin = "7.3.1" -kotlin = "1.7.20" +kotlin = "2.0.0" coroutines = "1.7.3" pagingCompose = "3.2.1" protobuf = "3.21.9" diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts index 1acda55..858236b 100644 --- a/presentation/build.gradle.kts +++ b/presentation/build.gradle.kts @@ -1,7 +1,8 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") - id ("de.mannodermaus.android-junit5") + id("de.mannodermaus.android-junit5") + id("org.jetbrains.kotlin.plugin.compose") } android { @@ -112,6 +113,10 @@ dependencies { } +composeCompiler { + enableStrongSkippingMode = true +} + java { toolchain { languageVersion = JavaLanguageVersion.of(17)