Skip to content

Commit 9b17a39

Browse files
authored
Merge pull request #6 from huanshankeji/dev-dependent-on-snapshots
Develop dependent on snapshots
2 parents a86c997 + 0ddd816 commit 9b17a39

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

buildSrc/build.gradle.kts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,19 @@ plugins {
22
`kotlin-dsl`
33
}
44
repositories {
5-
//mavenLocal()
5+
mavenLocal() // TODO comment out when not needed
66
gradlePluginPortal()
77
//maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
88
}
99

10-
val huanshankejiGradlePluginsVersion = "0.5.1"
11-
1210
dependencies {
1311
// With Kotlin 2.0.20, a "Could not parse POM" build error occurs in the JVM projects of some dependent projects.
1412
val kotlinVersion = "2.0.10"
1513
implementation(kotlin("gradle-plugin", kotlinVersion))
1614
implementation("org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion")
17-
implementation("org.jetbrains.compose:compose-gradle-plugin:1.6.10")
15+
implementation("org.jetbrains.compose:compose-gradle-plugin:1.7.0")
16+
val huanshankejiGradlePluginsVersion = "0.6.0" // don't use a snapshot version in a main branch
1817
implementation("com.huanshankeji:kotlin-common-gradle-plugins:$huanshankejiGradlePluginsVersion")
1918
implementation("com.huanshankeji.team:gradle-plugins:$huanshankejiGradlePluginsVersion")
20-
implementation("com.huanshankeji:common-gradle-dependencies:0.7.1-20240516")
19+
implementation("com.huanshankeji:common-gradle-dependencies:0.8.0-20241016") // don't use a snapshot version in a main branch
2120
}

buildSrc/src/main/kotlin/VersionsAndDependencies.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import com.huanshankeji.CommonDependencies
33
const val projectVersion = "0.4.0-SNAPSHOT"
44

55
object DependencyVersions {
6-
val kobweb = "0.18.0"
7-
val materialWeb = "1.4.1"
6+
val kobweb = "0.19.2"
7+
val materialWeb = "2.2.0"
88

99

1010
// legacy versions that don't need to be updated

buildSrc/src/main/kotlin/lib-conventions-without-publishing.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ plugins {
66
}
77

88
repositories {
9+
mavenCentral()
910
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
1011
maven("https://us-central1-maven.pkg.dev/varabyte-repos/public") // for Kobweb
1112
}

kotlin-js-store/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -708,10 +708,10 @@
708708
"@material/theme" "14.0.0-canary.261f2db59.0"
709709
tslib "^2.1.0"
710710

711-
"@material/web@1.4.1":
712-
version "1.4.1"
713-
resolved "https://registry.yarnpkg.com/@material/web/-/web-1.4.1.tgz#116480759d0b5815ea181086d32cc3ccb54a30f6"
714-
integrity sha512-17MZA6Bt7ie6uDc5cVEGtm6frQfm7ASLGVJhJuYJ0W2Fs7Zogd8wJ3ExoYU8jyzv8LEXcfvnZKcvr8dlquGsig==
711+
"@material/web@2.2.0":
712+
version "2.2.0"
713+
resolved "https://registry.yarnpkg.com/@material/web/-/web-2.2.0.tgz#b98d57fc863301fe6c0036cc6f04869386067e08"
714+
integrity sha512-k1Pi7f04qDRkHfIEdcnL++udN+x5Oq34R47n0Fk7Xo49uz9aKb6ZkO42jC6uvMH0ahOiFDktX9txHgYMDvNa+A==
715715
dependencies:
716716
lit "^2.7.4 || ^3.0.0"
717717
tslib "^2.4.0"

0 commit comments

Comments
 (0)