Build: Use maven-publish in configurePublishing helper

libraries/commonConfiguration.gradle

@@ -116,6 +116,10 @@ ext.signPom = { Project project, MavenDeployer deployer ->
 }
 
 ext.configurePublishing = { Project project ->
+    ArtifactsKt.publish(project, false)
+}
+
+ext.configureLegacyPublishing = { Project project ->
     project.configure(project) {
         apply plugin: 'maven'
 

libraries/kotlin.test/annotations-common/build.gradle

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

libraries/kotlin.test/common/build.gradle

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

libraries/kotlin.test/js/build.gradle

@@ -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

libraries/kotlin.test/junit/build.gradle

@@ -27,11 +27,7 @@ jar {
     }
 }
 
-artifacts {
+configureSourcesJar()
-    archives sourcesJar
-    sources sourcesJar
-}
-
 configureJavadocJar()
 
 compileKotlin {

libraries/kotlin.test/junit5/build.gradle

@@ -32,11 +32,7 @@ jar {
     }
 }
 
-artifacts {
+configureSourcesJar()
-    archives sourcesJar
-    sources sourcesJar
-}
-
 configureJavadocJar()
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {

libraries/kotlin.test/jvm/build.gradle

@@ -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)
 

libraries/kotlin.test/testng/build.gradle

@@ -30,11 +30,7 @@ jar {
     }
 }
 
-artifacts {
+configureSourcesJar()
-    archives sourcesJar
-    sources sourcesJar
-}
-
 configureJavadocJar()
 
 compileKotlin {

libraries/stdlib/common/build.gradle

@@ -62,20 +62,7 @@ jar {
     manifestAttributes(manifest, project, 'Main')
 }
 
-task sourcesJar(type: Jar, dependsOn: classes) {
+configureSourcesJar()
-    classifier = 'sources'
-    from sourceSets.main.kotlin
-}
-
-configurations {
-    sources
-}
-
-artifacts {
-    archives sourcesJar
-    sources sourcesJar
-}
-
 configureJavadocJar()
 
 classes.setDependsOn(classes.dependsOn.findAll { it != "compileJava" })

libraries/stdlib/jdk7/build.gradle

@@ -3,7 +3,8 @@ description = 'Kotlin Standard Library JDK 7 extension'
 apply plugin: 'kotlin'
 
 configureJvm6Project(project)
-configurePublishing(project)
+// TODO: Migrate to maven-publish publishing
+configureLegacyPublishing(project)
 ext.javaHome = JDK_17
 
 sourceSets {

libraries/stdlib/jdk8/build.gradle

@@ -3,7 +3,8 @@ description = 'Kotlin Standard Library JDK 8 extension'
 apply plugin: 'kotlin'
 
 configureJvm6Project(project)
-configurePublishing(project)
+// TODO: Migrate to maven-publish publishing
+configureLegacyPublishing(project)
 ext.javaHome = JDK_18
 ext.jvmTarget = "1.8"
 

libraries/stdlib/js-v1/build.gradle

@@ -7,7 +7,8 @@ description = 'Kotlin Standard Library for JS'
 apply plugin: 'kotlin-platform-js'
 apply plugin: 'idea'
 
-configurePublishing(project)
+// TODO: Migrate to maven-publish publishing
+configureLegacyPublishing(project)
 
 configurations {
     sources

libraries/stdlib/jvm/build.gradle

@@ -5,7 +5,8 @@ apply plugin: 'kotlin-platform-jvm'
 archivesBaseName = 'kotlin-stdlib'
 
 configureJvm6Project(project)
-configurePublishing(project)
+// TODO: Migrate to maven-publish publishing
+configureLegacyPublishing(project)
 
 configurations {
     distSources

libraries/tools/gradle-tools/pluginMarkers.gradle

@@ -20,7 +20,8 @@ ext.pluginMarkerProject = { String pluginProjectId ->
     // Remove the default JAR artifact added by the Java plugin
     configurations.archives.artifacts.clear()
 
-    configurePublishing(project)
+    // TODO: Migrate to maven-publish publishing
+    configureLegacyPublishing(project)
 
     task emptyJar(type: Jar)
 

libraries/tools/kotlin-annotations-jvm/build.gradle

@@ -17,11 +17,7 @@ dependencies {
     compileOnly DependenciesKt.kotlinBuiltins(project)
 }
 
-artifacts {
+configureSourcesJar()
-    archives sourcesJar
-    sources sourcesJar
-}
-
 configureJavadocJar()
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {

libraries/tools/script-runtime/build.gradle

@@ -26,11 +26,10 @@ jar {
 }
 
 artifacts {
-    archives sourcesJar
-    sources sourcesJar
     mainJar jar
 }
 
+configureSourcesJar()
 configureJavadocJar()
 
 compileKotlin {