Merge branch 'kotlin-1.6.10' into kotlin-1.6.10-release

v0.1.4-kotlin-1.6.10 release
huanshankeji · May 27, 2022 · cf7a27b · cf7a27b
2 parents e63f9f4 + 9935c9c
commit cf7a27b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/buildSrc/src/main/kotlin/build-dependency-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/build-dependency-library-conventions.gradle.kts
@@ -13,4 +13,7 @@ group = "com.huanshankeji"
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
+
+    withSourcesJar()
+    withJavadocJar()
 }
diff --git a/buildSrc/src/main/kotlin/plugin-conventions.gradle.kts b/buildSrc/src/main/kotlin/plugin-conventions.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
     implementation(kotlin("gradle-plugin", "1.6.10"))
 }
 
-version = "0.1.3-kotlin-1.6.10"
+version = "0.1.4-kotlin-1.6.10"
 
 pluginBundle {
     website = "https://github.com/huanshankeji/gradle-plugin"

diff --git a/common-gradle-dependencies/build.gradle.kts b/common-gradle-dependencies/build.gradle.kts
@@ -2,4 +2,6 @@ plugins {
     id("build-dependency-library-conventions")
 }
 
-version = "0.1.0-20220522-kotlin-1.6.10-dev"
+// `SNAPSHOT` means it's under development until that version,
+// and `dev` means it has been under development since that version.
+version = "0.1.1-SNAPSHOT-20220527-dev-kotlin-1.6.10"
diff --git a/common-gradle-dependencies/src/main/kotlin/com/huanshankeji/CommonDependencies.kt b/common-gradle-dependencies/src/main/kotlin/com/huanshankeji/CommonDependencies.kt
@@ -1,5 +1,7 @@
 package com.huanshankeji
 
+import org.gradle.api.artifacts.dsl.DependencyHandler
+
 // some but not all default dependencies
 object CommonDependencies {
     object KotlinCommon {
@@ -83,11 +85,18 @@ object CommonDependencies {
 
     object Vertx {
         val defaultVersion = DefaultVersions.vertx
-        fun stackDepchain(version: String = defaultVersion) =
-            "io.vertx:vertx-stack-depchain:$version"
 
-        fun module(module: String) =
+        private fun stackDepchain(version: String = defaultVersion) =
+            moduleWithVersion("stack-depchain", version)
+
+        fun DependencyHandler.platformStackDepchain(version: String = defaultVersion) =
+            platform(stackDepchain(version))
+
+        fun moduleWithoutVersion(module: String) =
             "io.vertx:vertx-$module"
+
+        fun moduleWithVersion(module: String, version: String = defaultVersion) =
+            "${moduleWithoutVersion(module)}:$version"
     }
 
     object Arrow {

diff --git a/common-gradle-dependencies/src/main/kotlin/com/huanshankeji/DefaultVersions.kt b/common-gradle-dependencies/src/main/kotlin/com/huanshankeji/DefaultVersions.kt
@@ -3,7 +3,7 @@ package com.huanshankeji
 object DefaultVersions {
     val kotlin = "1.6.10"
 
-    val kotlinCommon = "0.1.0-kotlin-1.6.10"
+    val kotlinCommon = "0.1.1-kotlin-1.6.10"
 
     val exposed = "0.38.2"
     val kotlinxCoroutines = "1.6.1"