Merge pull request #6 from huanshankeji/dev-dependent-on-snapshots

Develop dependent on snapshots
huanshankeji · Oct 19, 2024 · 9b17a39 · 9b17a39
2 parents a86c997 + 0ddd816
commit 9b17a39
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -2,20 +2,19 @@ plugins {
     `kotlin-dsl`
 }
 repositories {
-    //mavenLocal()
+    mavenLocal() // TODO comment out when not needed
     gradlePluginPortal()
     //maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
 }
 
-val huanshankejiGradlePluginsVersion = "0.5.1"
-
 dependencies {
     // With Kotlin 2.0.20, a "Could not parse POM" build error occurs in the JVM projects of some dependent projects.
     val kotlinVersion = "2.0.10"
     implementation(kotlin("gradle-plugin", kotlinVersion))
     implementation("org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion")
-    implementation("org.jetbrains.compose:compose-gradle-plugin:1.6.10")
+    implementation("org.jetbrains.compose:compose-gradle-plugin:1.7.0")
+    val huanshankejiGradlePluginsVersion = "0.6.0" // don't use a snapshot version in a main branch
     implementation("com.huanshankeji:kotlin-common-gradle-plugins:$huanshankejiGradlePluginsVersion")
     implementation("com.huanshankeji.team:gradle-plugins:$huanshankejiGradlePluginsVersion")
-    implementation("com.huanshankeji:common-gradle-dependencies:0.7.1-20240516")
+    implementation("com.huanshankeji:common-gradle-dependencies:0.8.0-20241016") // don't use a snapshot version in a main branch
 }
diff --git a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt
@@ -3,8 +3,8 @@ import com.huanshankeji.CommonDependencies
 const val projectVersion = "0.4.0-SNAPSHOT"
 
 object DependencyVersions {
-    val kobweb = "0.18.0"
-    val materialWeb = "1.4.1"
+    val kobweb = "0.19.2"
+    val materialWeb = "2.2.0"
 
 
     // legacy versions that don't need to be updated

diff --git a/buildSrc/src/main/kotlin/lib-conventions-without-publishing.gradle.kts b/buildSrc/src/main/kotlin/lib-conventions-without-publishing.gradle.kts
@@ -6,6 +6,7 @@ plugins {
 }
 
 repositories {
+    mavenCentral()
     maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     maven("https://us-central1-maven.pkg.dev/varabyte-repos/public") // for Kobweb
 }

diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
@@ -708,10 +708,10 @@
     "@material/theme" "14.0.0-canary.261f2db59.0"
     tslib "^2.1.0"
 
-"@material/web@1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@material/web/-/web-1.4.1.tgz#116480759d0b5815ea181086d32cc3ccb54a30f6"
-  integrity sha512-17MZA6Bt7ie6uDc5cVEGtm6frQfm7ASLGVJhJuYJ0W2Fs7Zogd8wJ3ExoYU8jyzv8LEXcfvnZKcvr8dlquGsig==
+"@material/web@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@material/web/-/web-2.2.0.tgz#b98d57fc863301fe6c0036cc6f04869386067e08"
+  integrity sha512-k1Pi7f04qDRkHfIEdcnL++udN+x5Oq34R47n0Fk7Xo49uz9aKb6ZkO42jC6uvMH0ahOiFDktX9txHgYMDvNa+A==
   dependencies:
     lit "^2.7.4 || ^3.0.0"
     tslib "^2.4.0"