From 73616357e00c34e2f090d6fa55cd331332f1602a Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Thu, 17 Oct 2024 14:54:50 +0800 Subject: [PATCH 1/5] Adapt to "com.huanshankeji:common-gradle-dependencies:0.7.2-20241016-SNAPSHOT" --- buildSrc/build.gradle.kts | 7 +++---- .../kotlin/lib-conventions-without-publishing.gradle.kts | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index ed2359c..160ec0f 100644 --- 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") + val huanshankejiGradlePluginsVersion = "0.6.0-SNAPSHOT" // TODO 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.7.2-20241016-SNAPSHOT") // TODO don't use a snapshot version in a main branch } diff --git a/buildSrc/src/main/kotlin/lib-conventions-without-publishing.gradle.kts b/buildSrc/src/main/kotlin/lib-conventions-without-publishing.gradle.kts index 26c0a69..4f12555 100644 --- 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 } From dc8630df4d94af2da8d23cb5c07203b848f4f885 Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Thu, 17 Oct 2024 15:50:39 +0800 Subject: [PATCH 2/5] Bump Compose Multiplatform to 1.7.0 --- buildSrc/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 160ec0f..5e442b1 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { 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-SNAPSHOT" // TODO 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") From fed8a89507159ba2a8b35dfddb1314728658fd51 Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Thu, 17 Oct 2024 21:06:19 +0800 Subject: [PATCH 3/5] Bump `DependencyVersions` and run `kotlinUpgradeYarnLock` --- buildSrc/src/main/kotlin/VersionsAndDependencies.kt | 4 ++-- kotlin-js-store/yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt index 41225e5..35d43e4 100644 --- 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/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock index 87f17d9..828497a 100644 --- 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" From 64abb21cea02d17794e87c37e822b6b20be8a227 Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Fri, 18 Oct 2024 17:39:55 +0800 Subject: [PATCH 4/5] Bump "common-gradle-dependencies" to "0.8.0-20241016-SNAPSHOT" --- buildSrc/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 5e442b1..5ac0f1c 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -16,5 +16,5 @@ dependencies { val huanshankejiGradlePluginsVersion = "0.6.0-SNAPSHOT" // TODO 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.2-20241016-SNAPSHOT") // TODO don't use a snapshot version in a main branch + implementation("com.huanshankeji:common-gradle-dependencies:0.8.0-20241016-SNAPSHOT") // TODO don't use a snapshot version in a main branch } From 0ddd8160c33fd44128322857dd28bfc09529cca0 Mon Sep 17 00:00:00 2001 From: Shreck Ye Date: Sat, 19 Oct 2024 18:05:53 +0800 Subject: [PATCH 5/5] Bump our Gradle dependencies to the release versions The Gradle plugins are broken on the Gradle Plugin Portal. Temporarily the local ones are loaded. --- buildSrc/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 5ac0f1c..e91f394 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -13,8 +13,8 @@ dependencies { implementation(kotlin("gradle-plugin", kotlinVersion)) implementation("org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion") implementation("org.jetbrains.compose:compose-gradle-plugin:1.7.0") - val huanshankejiGradlePluginsVersion = "0.6.0-SNAPSHOT" // TODO don't use a snapshot version in a main branch + 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.8.0-20241016-SNAPSHOT") // TODO don't use a snapshot version in a main branch + implementation("com.huanshankeji:common-gradle-dependencies:0.8.0-20241016") // don't use a snapshot version in a main branch }