SNAPSHOTs #4

GradleUp · Feb 19, 2024 · bd18dae · bd18dae
1 parent fc0df4d
commit bd18dae
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/build-logic/src/main/kotlin/internal/publishing.kt b/build-logic/src/main/kotlin/internal/publishing.kt
@@ -139,9 +139,10 @@ internal fun Project.configurePublishing(
     if (signingOptions != null) {
         plugins.apply("signing")
         val signing = extensions.getByType(SigningExtension::class.java)
+
         signing.useInMemoryPgpKeys(
-            System.getenv(signingOptions.privateKey),
-            System.getenv(signingOptions.privateKeyPassword)
+            signingOptions.privateKey,
+            signingOptions.privateKeyPassword
         )
         signing.sign(publishing.publications)
 

diff --git a/build-logic/src/main/kotlin/main.kt b/build-logic/src/main/kotlin/main.kt
@@ -4,7 +4,9 @@ import internal.SonatypeHost
 import internal.SonatypeOptions
 import internal.configurePublishing
 import internal.targetJdk
+import org.gradle.api.Action
 import org.gradle.api.Project
+import org.gradle.api.publish.PublicationContainer
 
 private val sonatypeOptions = System.getenv("OSSRH_USER")?.let {
     SonatypeOptions(
@@ -25,7 +27,7 @@ private val projectOptions = ProjectOptions(
     licenseUrl = "https://github.com/GradleUp/gratatouille/blob/main/LICENSE"
 )
 
-fun Project.configureLib() {
+fun Project.configureLib(configurePublications: Action<PublicationContainer> = Action {  }) {
     targetJdk(11)
 
     configurePublishing(
@@ -37,6 +39,7 @@ fun Project.configureLib() {
                 privateKeyPassword = System.getenv("GPG_KEY_PASSWORD") ?: error("GPG_KEY_PASSWORD not found")
             )
         },
+        configurePublications = configurePublications
     )
 }
 

diff --git a/gratatouille-core/build.gradle.kts b/gratatouille-core/build.gradle.kts
@@ -3,7 +3,11 @@ plugins {
     id("org.jetbrains.kotlin.plugin.serialization")
 }
 
-configureLib()
+configureLib {
+    create("default", MavenPublication::class.java) {
+        from(components["java"])
+    }
+}
 
 dependencies {
     implementation(libs.kotlin.test)