diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index c8928e9..7b5a11e 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -7,18 +7,12 @@ repositories { //maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } -val kotlinVersion = "1.9.20" -val huanshankejiGradlePluginsVersion = "0.4.1" +val huanshankejiGradlePluginsVersion = "0.5.1" dependencies { - implementation(kotlin("gradle-plugin", kotlinVersion)) - implementation("org.jetbrains.compose:compose-gradle-plugin:1.5.10") + implementation(kotlin("gradle-plugin", "1.9.23")) + implementation("org.jetbrains.compose:compose-gradle-plugin:1.6.1") implementation("com.huanshankeji:kotlin-common-gradle-plugins:$huanshankejiGradlePluginsVersion") implementation("com.huanshankeji.team:gradle-plugins:$huanshankejiGradlePluginsVersion") -} - -configurations.all { - resolutionStrategy { - force("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") - } + implementation("com.huanshankeji:common-gradle-dependencies:0.7.1-20240314") } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt similarity index 62% rename from buildSrc/src/main/kotlin/Versions.kt rename to buildSrc/src/main/kotlin/VersionsAndDependencies.kt index b0f05cc..558160c 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt @@ -1,3 +1,5 @@ +import com.huanshankeji.CommonDependencies + const val projectVersion = "0.2.2-SNAPSHOT" object DependencyVersions { @@ -6,3 +8,5 @@ object DependencyVersions { val mdc = "13.0.0" } + +val commonDependencies = CommonDependencies() diff --git a/compose-web-common/build.gradle.kts b/compose-web-common/build.gradle.kts index 5a29388..f570584 100644 --- a/compose-web-common/build.gradle.kts +++ b/compose-web-common/build.gradle.kts @@ -11,6 +11,7 @@ kotlin { dependencies { implementation(compose.html.core) implementation(compose.runtime) + implementation(commonDependencies.kotlinx.coroutines.core()) } } } diff --git a/compose-web-material/build.gradle.kts b/compose-web-material/build.gradle.kts index a0712ba..d7f2fcc 100644 --- a/compose-web-material/build.gradle.kts +++ b/compose-web-material/build.gradle.kts @@ -33,6 +33,8 @@ kotlin { ) implementation(npm("@material/card", DependencyVersions.mdc)) + + implementation(commonDependencies.kotlinx.coroutines.core()) } } }