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

0.1.2-kotlin-1.6.10 release
huanshankeji · May 25, 2022 · 111a5be · 111a5be
2 parents 76cffce + 846bc2b
commit 111a5be
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
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.1-kotlin-1.6.10"
+version = "0.1.2-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,4 @@ plugins {
     id("build-dependency-library-conventions")
 }
 
-version = "0.1.0-20220522-dev"
+version = "0.1.0-20220522-kotlin-1.6.10-dev"
diff --git a/...n-common-gradle-plugins/src/main/kotlin/com/huanshankeji/default-maven-publish.gradle.kts b/...n-common-gradle-plugins/src/main/kotlin/com/huanshankeji/default-maven-publish.gradle.kts
@@ -5,9 +5,3 @@ plugins {
 }
 
 group = "com.huanshankeji"
-
-publishing {
-    repositories {
-        mavenCentral()
-    }
-}
diff --git a/...keji/kotlin-multiplatform-jvm-and-js-browser-default-maven-publish-conventions.gradle.kts b/...keji/kotlin-multiplatform-jvm-and-js-browser-default-maven-publish-conventions.gradle.kts
@@ -5,10 +5,15 @@ plugins {
     id("com.huanshankeji.default-maven-publish")
 }
 
+val javadocJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("javadoc")
+}
+
 publishing {
     publications {
         withType<MavenPublication> {
             artifactId = "$defaultPrefixForPublishing-$artifactId"
+            artifact(javadocJar)
         }
     }
 }