Merge pull request #75 from joreilly/version_updates

compose dependency updates
joreilly · Jun 30, 2023 · 208bfc5 · 208bfc5
2 parents 7b5288e + 6b92b5f
commit 208bfc5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.0.1")
+        classpath("com.android.tools.build:gradle:8.0.2")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
         classpath("org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlin}")
         classpath("com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:${Versions.kspPlugin}")
@@ -21,12 +21,12 @@ allprojects {
     }
 }
 
-allprojects {
-    configurations.all {
-        resolutionStrategy.dependencySubstitution {
-            substitute(module("org.jetbrains.compose.compiler:compiler")).apply {
-                using(module("androidx.compose.compiler:compiler:${Versions.composeCompiler}"))
-            }
-        }
-    }
-}
+//allprojects {
+//    configurations.all {
+//        resolutionStrategy.dependencySubstitution {
+//            substitute(module("org.jetbrains.compose.compiler:compiler")).apply {
+//                using(module("androidx.compose.compiler:compiler:${Versions.composeCompiler}"))
+//            }
+//        }
+//    }
+//}
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -14,9 +14,10 @@ object Versions {
 
     const val compose = "1.4.3"
     const val composeCompiler = "1.4.8-dev-k1.9.0-RC-5532d15c918"
+    const val jbComposeCompiler = "1.4.8-beta"
     const val navCompose = "2.5.3"
     const val composeMaterial3 = "1.1.0"
-    const val composeDesktop = "1.4.0"
+    const val composeDesktop = "1.4.1"
 
     const val realm = "1.9.0"
 

diff --git a/compose-desktop/build.gradle.kts b/compose-desktop/build.gradle.kts
@@ -26,6 +26,6 @@ application {
 }
 
 compose {
-    kotlinCompilerPlugin.set(Versions.composeCompiler)
+    kotlinCompilerPlugin.set(Versions.jbComposeCompiler)
     kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.0-Beta")
 }