Build: Use maven-publish in configurePublishing helper

2020-04-26 15:47:27 +03:00
parent 94b4f4a91a
commit 8737168d41
16 changed files with 26 additions and 61 deletions
@@ -17,13 +17,5 @@ jar {
    manifestAttributes(manifest, project, 'Test')
 }

-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
-    from sourceSets.main.kotlin
-}
-
-artifacts {
-    archives sourcesJar
-}
-
+configureSourcesJar()
 configureJavadocJar()
@@ -13,15 +13,7 @@ jar {
    manifestAttributes(manifest, project, 'Test')
 }

-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
-    from sourceSets.main.kotlin
-}
-
-artifacts {
-    archives sourcesJar
-}
-
+configureSourcesJar()
 configureJavadocJar()

 tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinCompile) {
@@ -2,7 +2,8 @@ description = 'Kotlin Test for JS'

 apply plugin: 'kotlin-platform-js'

-configurePublishing(project)
+// TODO: Migrate to maven-publish publishing
+configureLegacyPublishing(project)

 configurations {
    sources
@@ -27,11 +27,7 @@ jar {
    }
 }

-artifacts {
-    archives sourcesJar
-    sources sourcesJar
-}
-
+configureSourcesJar()
 configureJavadocJar()

 compileKotlin {
@@ -32,11 +32,7 @@ jar {
    }
 }

-artifacts {
-    archives sourcesJar
-    sources sourcesJar
-}
-
+configureSourcesJar()
 configureJavadocJar()

 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
@@ -3,7 +3,8 @@ description = 'Kotlin Test'
 apply plugin: 'kotlin-platform-jvm'

 configureJvm6Project(project)
-configurePublishing(project)
+// TODO: Migrate to maven-publish publishing
+configureLegacyPublishing(project)

 def includeJava9 = BuildPropertiesExtKt.getIncludeJava9(project.kotlinBuildProperties)

@@ -30,11 +30,7 @@ jar {
    }
 }

-artifacts {
-    archives sourcesJar
-    sources sourcesJar
-}
-
+configureSourcesJar()
 configureJavadocJar()

 compileKotlin {