dependencies update

raamcosta · Jul 20, 2024 · 7c8f45f · 7c8f45f
1 parent 84f7558
commit 7c8f45f
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 68 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,6 +3,7 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 
 plugins {
     alias(libs.plugins.dependencyCheckPlugin)
+    alias(libs.plugins.compose.compiler).apply(false)
 }
 
 buildscript {

diff --git a/compose-destinations-animations/build.gradle.kts b/compose-destinations-animations/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("com.android.library")
     kotlin("android")
+    alias(libs.plugins.compose.compiler)
 }
 
 apply(from = "${rootProject.projectDir}/publish.gradle")
@@ -12,7 +13,6 @@ android {
 
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toIntOrNull()
-        targetSdk = libs.versions.targetSdk.get().toIntOrNull()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles.add(File("consumer-rules.pro"))
@@ -38,13 +38,12 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+kotlin {
+    compilerOptions {
+        freeCompilerArgs.addAll("-opt-in=kotlin.RequiresOptIn")
+    }
 }
 
 dependencies {

diff --git a/compose-destinations-ksp/build.gradle.kts b/compose-destinations-ksp/build.gradle.kts
@@ -9,12 +9,12 @@ java {
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+kotlin {
+    compilerOptions {
+        freeCompilerArgs.addAll("-opt-in=kotlin.RequiresOptIn")
     }
+
+    jvmToolchain(8)
 }
 
 dependencies {

diff --git a/compose-destinations-wear/build.gradle.kts b/compose-destinations-wear/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("com.android.library")
     kotlin("android")
+    alias(libs.plugins.compose.compiler)
 }
 
 apply(from = "${rootProject.projectDir}/publish.gradle")
@@ -12,7 +13,6 @@ android {
 
     defaultConfig {
         minSdk = 25
-        targetSdk = libs.versions.targetSdk.get().toIntOrNull()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles.add(File("consumer-rules.pro"))
@@ -38,17 +38,13 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
 }
 
 kotlin {
     jvmToolchain(11)
-}
-
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+    compilerOptions {
+        freeCompilerArgs.addAll("-opt-in=kotlin.RequiresOptIn")
+    }
 }
 
 dependencies {

diff --git a/compose-destinations/build.gradle.kts b/compose-destinations/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("com.android.library")
     kotlin("android")
+    alias(libs.plugins.compose.compiler)
 }
 
 apply(from = "${rootProject.projectDir}/publish.gradle")
@@ -41,14 +42,12 @@ android {
     buildFeatures {
         compose = true
     }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+kotlin {
+    compilerOptions {
+        freeCompilerArgs.addAll("-opt-in=kotlin.RequiresOptIn")
+    }
 }
 
 dependencies {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,35 +4,35 @@ minSdk = "21"
 compileSdk = "34"
 targetSdk = "34"
 
-kotlin = "1.9.23"
+kotlin = "2.0.0"
 dependencyCheckPluginVersion = "0.51.0"
-agp = "8.2.2"
-mavenPublishPluginVersion = "0.27.0"
+agp = "8.4.2"
+mavenPublishPluginVersion = "0.28.0"
 
-composeViewModel = "2.7.0"
-activityCompose = "1.8.2"
+composeViewModel = "2.8.3"
+activityCompose = "1.9.0"
 
-material = "1.9.0" #ProcessorProviderTests fail when trying to update this one - to do figure out why
-lifecycleRuntimeKtx = "2.7.0"
+material = "1.12.0"
+lifecycleRuntimeKtx = "2.8.3"
 
-ksp = "1.9.23-1.0.20"
+ksp = "2.0.0-1.0.22"
 
 junit = "4.13.2"
 
-compose = "1.7.0-alpha08"
-composeMaterial = "1.7.0-alpha08"
-composeCompiler = "1.5.12"
-composeNavigation = "2.8.0-alpha08"
+compose = "1.7.0-beta05"
+composeMaterial = "1.7.0-beta05"
+composeNavigationMaterial = "1.7.0-beta01"
+composeNavigation = "2.8.0-beta05"
 
-ktxSerialization = "1.6.3"
-mockk = "1.13.9"
+ktxSerialization = "1.7.1"
+mockk = "1.13.11"
 
-compileTesting = "1.5.0"
-composeWear = "1.1.2"
+compileTesting = "1.6.0"
+composeWear = "1.3.1"
 
 [plugins]
 dependencyCheckPlugin = { id = "com.github.ben-manes.versions", version.ref = "dependencyCheckPluginVersion" }
-
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 
 [libraries]
 
@@ -52,7 +52,7 @@ androidx-activityCompose = { module = "androidx.activity:activity-compose", vers
 # Compose
 compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
 compose-material = { module = "androidx.compose.material:material", version.ref = "composeMaterial" }
-compose-material-navigation = { module = "androidx.compose.material:material-navigation", version.ref = "composeMaterial" }
+compose-material-navigation = { module = "androidx.compose.material:material-navigation", version.ref = "composeNavigationMaterial" }
 compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "composeNavigation" }
 compose-viewModel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "composeViewModel" }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Aug 23 16:48:14 WEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/playground/build.gradle.kts b/playground/build.gradle.kts
@@ -4,10 +4,7 @@ plugins {
     id("com.google.devtools.ksp") version libs.versions.ksp.get()
     kotlin("plugin.parcelize")
     kotlin("plugin.serialization")
-}
-
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -47,10 +44,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
-
     packaging {
         resources.excludes.add("/META-INF/{AL2.0,LGPL2.1}")
     }
@@ -86,6 +79,9 @@ android {
 
 kotlin {
     jvmToolchain(11)
+    compilerOptions {
+        freeCompilerArgs.addAll("-opt-in=kotlin.RequiresOptIn")
+    }
 }
 
 dependencies {

diff --git a/sample-wear/build.gradle.kts b/sample-wear/build.gradle.kts
@@ -2,10 +2,7 @@ plugins {
     id("com.android.application")
     kotlin("android")
     id("com.google.devtools.ksp") version libs.versions.ksp.get()
-}
-
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -45,17 +42,16 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
-
     packaging {
         resources.excludes.add("/META-INF/{AL2.0,LGPL2.1}")
     }
 }
 
 kotlin {
     jvmToolchain(11)
+    compilerOptions {
+        freeCompilerArgs.addAll("-opt-in=kotlin.RequiresOptIn")
+    }
 }
 
 dependencies {

diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -2,10 +2,7 @@ plugins {
     id("com.android.application")
     kotlin("android")
     id("com.google.devtools.ksp") version libs.versions.ksp.get()
-}
-
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -45,17 +42,16 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
-
     packaging {
         resources.excludes.add("/META-INF/{AL2.0,LGPL2.1}")
     }
 }
 
 kotlin {
     jvmToolchain(11)
+    compilerOptions {
+        freeCompilerArgs.addAll("-opt-in=kotlin.RequiresOptIn")
+    }
 }
 
 dependencies {