Merge pull request #806 from mikepenz/feature/dependency_upgrades_202…

…21012 Compose-jb 1.2.0 | Compose Compiler 1.3.2 | Kotlin 1.7.20
mikepenz · Oct 12, 2022 · 2d8f5f5 · 2d8f5f5
2 parents 4852c0a + 9607bd4
commit 2d8f5f5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/app-desktop/build.gradle.kts b/app-desktop/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.jetbrains.compose.compose
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -24,6 +23,10 @@ dependencies {
     implementation(libs.kotlin.coroutines.core)
 }
 
+compose {
+    kotlinCompilerPlugin.set(libs.versions.composeCompiler.get())
+}
+
 tasks.withType<KotlinCompile> {
     kotlinOptions.jvmTarget = "11"
 }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -8,14 +8,14 @@ targetSdk = "33"
 gradleBuild = "7.3.0"
 buildTools = "33.0.0"
 # kotlin
-dokka = "1.7.10"
-kotlinCore = { require = "1.7.10" }
+dokka = "1.7.20"
+kotlinCore = { require = "1.7.20" }
 kotlinCoroutines = { require = "1.6.4" }
 kotlinxSerialization = "1.4.0"
 # compose
 compose = "1.2.1"
-composeCompiler = "1.3.1"
-composejb = "1.2.0-beta01"
+composeCompiler = "1.3.2"
+composejb = "1.2.0"
 # androidx
 activity = "1.6.0"
 cardview = "1.0.0"
@@ -28,7 +28,7 @@ recyclerView = "1.2.1"
 material = "1.6.1"
 # other
 accompanist = "0.25.1"
-fastAdapter = "5.6.0"
+fastAdapter = "5.7.0"
 gradleMvnPublish = "0.18.0"
 iconics = "5.3.3"
 itemAnimators = "1.1.0"

diff --git a/multiplatform-demo/gradle.properties b/multiplatform-demo/gradle.properties
@@ -1,7 +1,7 @@
 kotlin.code.style=official
 kotlin.version=1.7.10
 compose.version=1.2.0-beta01
-aboutlibraries.version=10.4.0
+aboutlibraries.version=10.5.0
 
 # define the export path for aboutLibraries files
 aboutLibraries.exportPath=src/jvmMain/resources/