Publish non mpp

sksamuel · Aug 9, 2023 · 34c696f · 34c696f
1 parent 6267c80
commit 34c696f
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 47 deletions.
diff --git a/publish-mpp.gradle.kts b/publish-mpp.gradle.kts
diff --git a/signing-pom-details.gradle.kts → publish.gradle.kts b/signing-pom-details.gradle.kts → publish.gradle.kts
@@ -1,12 +1,12 @@
+apply(plugin = "java")
+apply(plugin = "java-library")
 apply(plugin = "maven-publish")
 apply(plugin = "signing")
 
 repositories {
    mavenCentral()
 }
 
-val ossrhUsername: String by project
-val ossrhPassword: String by project
 val signingKey: String? by project
 val signingPassword: String? by project
 
@@ -16,6 +16,10 @@ fun Project.publishing(action: PublishingExtension.() -> Unit) =
 fun Project.signing(configure: SigningExtension.() -> Unit): Unit =
    configure(configure)
 
+fun Project.java(configure: JavaPluginExtension.() -> Unit): Unit =
+   configure(configure)
+
+
 val publications: PublicationContainer = (extensions.getByName("publishing") as PublishingExtension).publications
 
 signing {
@@ -29,6 +33,11 @@ signing {
    }
 }
 
+java {
+   withJavadocJar()
+   withSourcesJar()
+}
+
 publishing {
    repositories {
       maven {
@@ -37,14 +46,15 @@ publishing {
          name = "deploy"
          url = if (Ci.isRelease) releasesRepoUrl else snapshotsRepoUrl
          credentials {
-            username = java.lang.System.getenv("OSSRH_USERNAME") ?: ossrhUsername
-            password = java.lang.System.getenv("OSSRH_PASSWORD") ?: ossrhPassword
+            username = java.lang.System.getenv("OSSRH_USERNAME") ?: ""
+            password = java.lang.System.getenv("OSSRH_PASSWORD") ?: ""
          }
       }
    }
 
-   publications.withType<MavenPublication>().forEach {
-      it.apply {
+   publications {
+      register("mavenJava", MavenPublication::class) {
+         from(components["java"])
          pom {
             name.set("tribune")
             description.set("Multiplatform Kotlin Validation")

diff --git a/tribune-core/build.gradle.kts b/tribune-core/build.gradle.kts
@@ -4,4 +4,4 @@ dependencies {
    testImplementation(libs.kotest.runner.junit5)
 }
 
-apply(from = "../publish-mpp.gradle.kts")
+apply(from = "../publish.gradle.kts")
diff --git a/tribune-datetime/build.gradle.kts b/tribune-datetime/build.gradle.kts
@@ -6,4 +6,4 @@ dependencies {
    implementation(libs.kotest.runner.junit5)
 }
 
-apply(from = "../publish-mpp.gradle.kts")
+apply(from = "../publish.gradle.kts")
diff --git a/tribune-ktor/build.gradle.kts b/tribune-ktor/build.gradle.kts
@@ -8,4 +8,4 @@ dependencies {
    testImplementation(libs.kotest.runner.junit5)
 }
 
-apply(from = "../publish-mpp.gradle.kts")
+apply(from = "../publish.gradle.kts")
diff --git a/tribune-spring/build.gradle.kts b/tribune-spring/build.gradle.kts
@@ -10,4 +10,4 @@ dependencies {
    testImplementation(libs.kotest.runner.junit5)
 }
 
-apply(from = "../publish-mpp.gradle.kts")
+apply(from = "../publish.gradle.kts")