Publish kotlinMultiplatform publication (#904)

raniejade · web-flow · commit 7636fdd9982f · 2020-07-25T23:17:16.000+10:00
diff --git a/integration-test/build.gradle.kts b/integration-test/build.gradle.kts
@@ -25,8 +25,8 @@ kotlin {
 
     val commonTest by getting {
       dependencies {
-        implementation("org.spekframework.spek2:spek-dsl-metadata")
-        implementation("org.spekframework.spek2:spek-runtime-metadata")
+        implementation("org.spekframework.spek2:spek-dsl")
+        implementation("org.spekframework.spek2:spek-runtime")
         implementation(kotlin("test"))
       }
     }
@@ -67,8 +67,6 @@ kotlin {
       compilations["test"].defaultSourceSet {
         dependencies {
           dependsOn(nativeTest)
-          implementation("org.spekframework.spek2:spek-dsl-linux")
-          implementation("org.spekframework.spek2:spek-runtime-linux")
         }
       }
     }
@@ -83,8 +81,6 @@ kotlin {
       compilations["test"].defaultSourceSet {
         dependencies {
           dependsOn(nativeTest)
-          implementation("org.spekframework.spek2:spek-dsl-macos")
-          implementation("org.spekframework.spek2:spek-runtime-macos")
         }
       }
     }
@@ -99,8 +95,6 @@ kotlin {
       compilations["test"].defaultSourceSet {
         dependencies {
           dependsOn(nativeTest)
-          implementation("org.spekframework.spek2:spek-dsl-windows")
-          implementation("org.spekframework.spek2:spek-runtime-windows")
         }
       }
     }
diff --git a/integration-test/settings.gradle.kts b/integration-test/settings.gradle.kts
@@ -1,11 +1,13 @@
 includeBuild("../") {
   dependencySubstitution {
     substitute(module("org.spekframework.spek2:spek-gradle-plugin:0.1.0")).with(project(":spek-gradle-plugin"))
+    substitute(module("org.spekframework.spek2:spek-dsl")).with(project(":spek-dsl"))
     substitute(module("org.spekframework.spek2:spek-dsl-metadata")).with(project(":spek-dsl"))
     substitute(module("org.spekframework.spek2:spek-dsl-jvm")).with(project(":spek-dsl"))
     substitute(module("org.spekframework.spek2:spek-dsl-linux")).with(project(":spek-dsl"))
     substitute(module("org.spekframework.spek2:spek-dsl-windows")).with(project(":spek-dsl"))
     substitute(module("org.spekframework.spek2:spek-dsl-macos")).with(project(":spek-dsl"))
+    substitute(module("org.spekframework.spek2:spek-runtime")).with(project(":spek-runtime"))
     substitute(module("org.spekframework.spek2:spek-runtime-metadata")).with(project(":spek-runtime"))
     substitute(module("org.spekframework.spek2:spek-runtime-jvm")).with(project(":spek-runtime"))
     substitute(module("org.spekframework.spek2:spek-runtime-linux")).with(project(":spek-runtime"))
diff --git a/spek-dsl/build.gradle.kts b/spek-dsl/build.gradle.kts
@@ -97,7 +97,7 @@ val stubJavaDocJar by tasks.registering(Jar::class) {
 }
 
 project.extra["artifacts"] = when (currentOS) {
-  OS.LINUX -> arrayOf("metadata", "jvm", "js", "linux")
+  OS.LINUX -> arrayOf("kotlinMultiplatform", "metadata", "jvm", "js", "linux")
   OS.WINDOWS -> arrayOf("windows")
   OS.MACOS -> arrayOf("macos")
 }
@@ -113,4 +113,11 @@ publishing {
       targetPublication.artifact(stubJavaDocJar.get())
     }
   }
+
+  publications {
+    getByName("kotlinMultiplatform", MavenPublication::class) {
+      groupId = "org.spekframework.spek2"
+      artifactId = "spek-dsl"
+    }
+  }
 }
diff --git a/spek-runtime/build.gradle.kts b/spek-runtime/build.gradle.kts
@@ -102,7 +102,7 @@ val stubJavaDocJar by tasks.registering(Jar::class) {
 }
 
 project.extra["artifacts"] = when (currentOS) {
-    OS.LINUX -> arrayOf("metadata", "jvm", "js", "linux")
+    OS.LINUX -> arrayOf("kotlinMultiplatform", "metadata", "jvm", "js", "linux")
     OS.WINDOWS -> arrayOf("windows")
     OS.MACOS -> arrayOf("macos")
 }
@@ -118,4 +118,11 @@ publishing {
             targetPublication.artifact(stubJavaDocJar.get())
         }
     }
+
+    publications {
+        getByName("kotlinMultiplatform", MavenPublication::class) {
+            groupId = "org.spekframework.spek2"
+            artifactId = "spek-runtime"
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ kotlin {`
`25`	`25`
`26`	`26`	`val commonTest by getting {`
`27`	`27`	`dependencies {`
`28`		`- implementation("org.spekframework.spek2:spek-dsl-metadata")`
`29`		`- implementation("org.spekframework.spek2:spek-runtime-metadata")`
	`28`	`+ implementation("org.spekframework.spek2:spek-dsl")`
	`29`	`+ implementation("org.spekframework.spek2:spek-runtime")`
`30`	`30`	`implementation(kotlin("test"))`
`31`	`31`	`}`
`32`	`32`	`}`
`@@ -67,8 +67,6 @@ kotlin {`
`67`	`67`	`compilations["test"].defaultSourceSet {`
`68`	`68`	`dependencies {`
`69`	`69`	`dependsOn(nativeTest)`
`70`		`- implementation("org.spekframework.spek2:spek-dsl-linux")`
`71`		`- implementation("org.spekframework.spek2:spek-runtime-linux")`
`72`	`70`	`}`
`73`	`71`	`}`
`74`	`72`	`}`
`@@ -83,8 +81,6 @@ kotlin {`
`83`	`81`	`compilations["test"].defaultSourceSet {`
`84`	`82`	`dependencies {`
`85`	`83`	`dependsOn(nativeTest)`
`86`		`- implementation("org.spekframework.spek2:spek-dsl-macos")`
`87`		`- implementation("org.spekframework.spek2:spek-runtime-macos")`
`88`	`84`	`}`
`89`	`85`	`}`
`90`	`86`	`}`
`@@ -99,8 +95,6 @@ kotlin {`
`99`	`95`	`compilations["test"].defaultSourceSet {`
`100`	`96`	`dependencies {`
`101`	`97`	`dependsOn(nativeTest)`
`102`		`- implementation("org.spekframework.spek2:spek-dsl-windows")`
`103`		`- implementation("org.spekframework.spek2:spek-runtime-windows")`
`104`	`98`	`}`
`105`	`99`	`}`
`106`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ val stubJavaDocJar by tasks.registering(Jar::class) {`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`project.extra["artifacts"] = when (currentOS) {`
`100`		`- OS.LINUX -> arrayOf("metadata", "jvm", "js", "linux")`
	`100`	`+ OS.LINUX -> arrayOf("kotlinMultiplatform", "metadata", "jvm", "js", "linux")`
`101`	`101`	`OS.WINDOWS -> arrayOf("windows")`
`102`	`102`	`OS.MACOS -> arrayOf("macos")`
`103`	`103`	`}`
`@@ -113,4 +113,11 @@ publishing {`
`113`	`113`	`targetPublication.artifact(stubJavaDocJar.get())`
`114`	`114`	`}`
`115`	`115`	`}`
	`116`	`+`
	`117`	`+ publications {`
	`118`	`+ getByName("kotlinMultiplatform", MavenPublication::class) {`
	`119`	`+ groupId = "org.spekframework.spek2"`
	`120`	`+ artifactId = "spek-dsl"`
	`121`	`+ }`
	`122`	`+ }`
`116`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ val stubJavaDocJar by tasks.registering(Jar::class) {`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`project.extra["artifacts"] = when (currentOS) {`
`105`		`- OS.LINUX -> arrayOf("metadata", "jvm", "js", "linux")`
	`105`	`+ OS.LINUX -> arrayOf("kotlinMultiplatform", "metadata", "jvm", "js", "linux")`
`106`	`106`	`OS.WINDOWS -> arrayOf("windows")`
`107`	`107`	`OS.MACOS -> arrayOf("macos")`
`108`	`108`	`}`
`@@ -118,4 +118,11 @@ publishing {`
`118`	`118`	`targetPublication.artifact(stubJavaDocJar.get())`
`119`	`119`	`}`
`120`	`120`	`}`
	`121`	`+`
	`122`	`+ publications {`
	`123`	`+ getByName("kotlinMultiplatform", MavenPublication::class) {`
	`124`	`+ groupId = "org.spekframework.spek2"`
	`125`	`+ artifactId = "spek-runtime"`
	`126`	`+ }`
	`127`	`+ }`
`121`	`128`	`}`