Minor updates to configuration

Strumenta · Feb 23, 2025 · 97f8080 · 97f8080
1 parent ca59531
commit 97f8080
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -76,18 +76,22 @@ publishing {
             def snapshotRepo = "https://oss.sonatype.org/content/repositories/snapshots/"
             url = isReleaseVersion ? releaseRepo : snapshotRepo
             credentials {
-                username = project.hasProperty('ossrhTokenUsername') ? ossrhTokenUsername : "Unknown user"
-                password = project.hasProperty('ossrhTokenPassword') ? ossrhTokenPassword : "Unknown password"
+                username = project.findProperty('ossrhTokenUsername') ?: System.getenv('OSSRH_TOKEN_USERNAME') ?: "Unknown user"
+                password = project.findProperty('ossrhTokenPassword') ?: System.getenv('OSSRH_TOKEN_PASSWORD') ?: "Unknown password"
             }
         }
     }
 
     publications {
-        kolasu_core(MavenPublication) {
+        create("kolasu_core", MavenPublication) {
             from components.java
-            artifactId "kolasu-" + project.name
+            groupId = project.group
+            artifactId = "kolasu-${project.name}"
+            version = project.version
+
             artifact sourcesJar
             artifact javadocJar
+
             suppressPomMetadataWarningsFor('cliApiElements')
             suppressPomMetadataWarningsFor('cliRuntimeElements')
             pom {
@@ -135,7 +139,12 @@ publishing {
 }
 
 signing {
-    sign publishing.publications.kolasu_core
+    required { isReleaseVersion && gradle.taskGraph.hasTask("publish") }
+    sign publishing.publications["kolasu_core"]
+}
+
+tasks.withType(AbstractPublishToMaven) {
+    dependsOn("sourcesJar", "javadocJar")
 }
 
 tasks.findByName("generateGrammarSource").dependsOn("sourcesJar")