Skip to content

Commit

Permalink
Merge branch 'kotlin-2.1.0-gradlew-v8.11.1-and-above' into dependent-…
Browse files Browse the repository at this point in the history
…on-snapshots
  • Loading branch information
ShreckYe committed Dec 3, 2024
2 parents eaab148 + 23b4cf1 commit a62f8df
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}

repositories {
//mavenLocal() // comment out when not needed
mavenLocal() // TODO comment out when not needed so the build is always reproducible by others
gradlePluginPortal()
google()
mavenCentral()
Expand All @@ -14,7 +14,7 @@ dependencies {
implementation(kotlin("gradle-plugin", kotlinVersion))
implementation("org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion")
implementation("org.jetbrains.compose:compose-gradle-plugin:1.7.1")
implementation("com.huanshankeji.team:gradle-plugins:0.6.0") // don't use a snapshot version in a main branch
implementation("com.huanshankeji.team:gradle-plugins:0.8.0") // don't use a snapshot version in a main branch
implementation("com.android.tools.build:gradle:8.5.2")
implementation("com.huanshankeji:common-gradle-dependencies:0.8.0-20241016") // don't use a snapshot version in a main branch
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/VersionsAndDependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ val commonDependencies = CommonDependencies()
object DependencyVersions {
const val composeMultiplatform = ComposeBuildConfig.composeVersion // for "ui-unit"
val kobweb = "0.19.2"
val huanshankejiComposeHtml = "0.4.0" // don't use a snapshot version in a main branch
val huanshankejiComposeHtml = "0.4.1-SNAPSHOT" // TODO don't use a snapshot version in a main branch
val kmdc = "0.1.2"
val materialSymbols = "0.25.1"
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/common-conventions.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
}

repositories {
//mavenLocal() // commented out so the build is always reproducible by others // put back if needed when depending on a snapshot
mavenLocal() // TODO comment out when not needed so the build is always reproducible by others
mavenCentral()
google()
maven("https://us-central1-maven.pkg.dev/varabyte-repos/public") // for Kobweb
Expand Down

0 comments on commit a62f8df

Please sign in to comment.