fix artifact names. (#11)

Infumia · Aug 26, 2024 · 2739abb · 2739abb
1 parent acef754
commit 2739abb
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 71 deletions.
diff --git a/blank/build.gradle.kts b/blank/build.gradle.kts
@@ -1,6 +1,6 @@
-import net.infumia.gradle.publish
+import net.infumia.gradle.applyPublish
 
-publish("blank")
+applyPublish("blank")
 
 dependencies {
     compileOnly(project(":common"))

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,7 @@
-import net.infumia.gradle.spotless
+import net.infumia.gradle.applySpotless
 
 plugins { java }
 
 subprojects { apply<JavaPlugin>() }
 
-spotless()
+applySpotless()
diff --git a/buildSrc/src/main/kotlin/net/infumia/gradle/common.kt b/buildSrc/src/main/kotlin/net/infumia/gradle/common.kt
diff --git a/buildSrc/src/main/kotlin/net/infumia/gradle/java.kt b/buildSrc/src/main/kotlin/net/infumia/gradle/java.kt
@@ -0,0 +1,21 @@
+package net.infumia.gradle
+
+import org.gradle.api.Project
+import org.gradle.api.plugins.JavaPlugin
+import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+import org.gradle.jvm.toolchain.JvmVendorSpec
+import org.gradle.kotlin.dsl.*
+
+fun Project.applyJava(javaVersion: Int = 8) {
+    apply<JavaPlugin>()
+
+    repositories.mavenCentral()
+
+    extensions.configure<JavaPluginExtension> {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(javaVersion)
+            vendor = JvmVendorSpec.ADOPTIUM
+        }
+    }
+}
diff --git a/buildSrc/src/main/kotlin/net/infumia/gradle/publish.kt b/buildSrc/src/main/kotlin/net/infumia/gradle/publish.kt
@@ -3,21 +3,28 @@ package net.infumia.gradle
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 import com.vanniktech.maven.publish.MavenPublishPlugin
 import com.vanniktech.maven.publish.SonatypeHost
+import com.vanniktech.maven.publish.tasks.JavadocJar
 import org.gradle.api.Project
+import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.api.tasks.bundling.Jar
 import org.gradle.kotlin.dsl.*
 
-fun Project.publish(
-    moduleName: String? = null,
-    javaVersion: Int = 8,
-    sources: Boolean = true,
-    javadoc: Boolean = true
-) {
-    applyCommon(javaVersion, sources, javadoc)
+fun Project.applyPublish(moduleName: String? = null, javaVersion: Int = 8) {
+    applyJava(javaVersion)
     apply<MavenPublishPlugin>()
 
     val projectName = "pack${if (moduleName == null) "" else "-$moduleName"}"
     val signRequired = project.hasProperty("sign-required")
 
+    val sourceSets = extensions.getByType<JavaPluginExtension>().sourceSets
+    tasks.register("sourcesJar", Jar::class) {
+        dependsOn("classes")
+        archiveClassifier = "sources"
+        from(sourceSets["main"].allSource)
+    }
+
+    tasks.withType<JavadocJar> { afterEvaluate { archiveBaseName = name } }
+
     extensions.configure<MavenPublishBaseExtension> {
         coordinates(project.group.toString(), projectName, project.version.toString())
         publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, true)
@@ -26,26 +33,26 @@ fun Project.publish(
         }
 
         pom {
-            name.set(projectName)
-            description.set("Minecraft resource pack generator.")
-            url.set("https://github.com/Infumia/pack")
+            name = projectName
+            description = "Minecraft resource pack generator."
+            url = "https://github.com/Infumia/pack"
             licenses {
                 license {
-                    name.set("MIT License")
-                    url.set("https://mit-license.org/license.txt")
+                    name = "MIT License"
+                    url = "https://mit-license.org/license.txt"
                 }
             }
             developers {
                 developer {
-                    id.set("portlek")
-                    name.set("Hasan Demirtaş")
-                    email.set("utsukushihito@outlook.com")
+                    id = "portlek"
+                    name = "Hasan Demirtaş"
+                    email = "utsukushihito@outlook.com"
                 }
             }
             scm {
-                connection.set("scm:git:git://github.com/infumia/pack.git")
-                developerConnection.set("scm:git:ssh://github.com/infumia/pack.git")
-                url.set("https://github.com/infumia/pack/")
+                connection = "scm:git:git://github.com/infumia/pack.git"
+                developerConnection = "scm:git:ssh://github.com/infumia/pack.git"
+                url = "https://github.com/infumia/pack/"
             }
         }
     }

diff --git a/buildSrc/src/main/kotlin/net/infumia/gradle/spotless.kt b/buildSrc/src/main/kotlin/net/infumia/gradle/spotless.kt
@@ -2,10 +2,11 @@ package net.infumia.gradle
 
 import com.diffplug.gradle.spotless.SpotlessExtension
 import com.diffplug.gradle.spotless.SpotlessPlugin
+import com.diffplug.spotless.LineEnding
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.*
 
-fun Project.spotless() {
+fun Project.applySpotless() {
     val subProjects = subprojects.map { it.projectDir.toRelativeString(projectDir) }
 
     repositories.mavenCentral()
@@ -14,7 +15,7 @@ fun Project.spotless() {
 
     extensions.configure<SpotlessExtension> {
         isEnforceCheck = false
-        lineEndings = com.diffplug.spotless.LineEnding.UNIX
+        lineEndings = LineEnding.UNIX
 
         val prettierConfig =
             mapOf(

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -1,5 +1,5 @@
-import net.infumia.gradle.publish
+import net.infumia.gradle.applyPublish
 
-publish()
+applyPublish()
 
 dependencies { compileOnly(libs.creative.api) }
diff --git a/generator/build.gradle.kts b/generator/build.gradle.kts
@@ -1,6 +1,6 @@
-import net.infumia.gradle.publish
+import net.infumia.gradle.applyPublish
 
-publish("generator")
+applyPublish("generator")
 
 dependencies {
     compileOnly(project(":common"))

diff --git a/language/build.gradle.kts b/language/build.gradle.kts
@@ -1,6 +1,6 @@
-import net.infumia.gradle.publish
+import net.infumia.gradle.applyPublish
 
-publish("language")
+applyPublish("language")
 
 dependencies {
     compileOnly(project(":common"))