Skip to content

Commit

Permalink
Merge pull request #9 from huanshankeji/dependent-on-snapshots
Browse files Browse the repository at this point in the history
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
  • Loading branch information
ShreckYe authored Dec 3, 2024
2 parents 6a68cc5 + 45fcd05 commit b3f24c6
Show file tree
Hide file tree
Showing 5 changed files with 139 additions and 156 deletions.
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ repositories {

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"
val kotlinVersion = "2.1.0"
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" // don't use a snapshot version in a main branch
val huanshankejiGradlePluginsVersion = "0.8.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") // don't use a snapshot version in a main branch
Expand Down
12 changes: 0 additions & 12 deletions buildSrc/src/main/kotlin/dokka-convention.gradle.kts

This file was deleted.

2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/lib-conventions.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("lib-conventions-without-publishing")
id("com.huanshankeji.kotlin-multiplatform-sonatype-ossrh-publish-conventions")
id("dokka-convention")
id("com.huanshankeji.team.dokka.github-dokka-convention")
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading

0 comments on commit b3f24c6

Please sign in to comment.