Skip to content

Commit b3f24c6

Browse files
authored
Merge pull request #9 from huanshankeji/dependent-on-snapshots
Changes dependent on snapshots Use the new `com.huanshankeji.team.dokka.github-dokka-convention` plugin, bump Kotlin to 2.1.0 and the Gradle wrapper to v8.11.1
2 parents 6a68cc5 + 45fcd05 commit b3f24c6

File tree

5 files changed

+139
-156
lines changed

5 files changed

+139
-156
lines changed

buildSrc/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ repositories {
99

1010
dependencies {
1111
// With Kotlin 2.0.20, a "Could not parse POM" build error occurs in the JVM projects of some dependent projects.
12-
val kotlinVersion = "2.0.10"
12+
val kotlinVersion = "2.1.0"
1313
implementation(kotlin("gradle-plugin", kotlinVersion))
1414
implementation("org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion")
1515
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
16+
val huanshankejiGradlePluginsVersion = "0.8.0" // don't use a snapshot version in a main branch
1717
implementation("com.huanshankeji:kotlin-common-gradle-plugins:$huanshankejiGradlePluginsVersion")
1818
implementation("com.huanshankeji.team:gradle-plugins:$huanshankejiGradlePluginsVersion")
1919
implementation("com.huanshankeji:common-gradle-dependencies:0.8.0-20241016") // don't use a snapshot version in a main branch

buildSrc/src/main/kotlin/dokka-convention.gradle.kts

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
22
id("lib-conventions-without-publishing")
33
id("com.huanshankeji.kotlin-multiplatform-sonatype-ossrh-publish-conventions")
4-
id("dokka-convention")
4+
id("com.huanshankeji.team.dokka.github-dokka-convention")
55
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)