Merge pull request #306 from KyoriPowered/feature/manifest-meta

KyoriPowered · Mar 8, 2021 · 68b7e13 · 68b7e13
2 parents 82ee18b + 4faba74
commit 68b7e13
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 50 deletions.
diff --git a/api/build.gradle b/api/build.gradle
@@ -11,8 +11,4 @@ dependencies {
   testImplementation("com.google.guava:guava:23.0")
 }
 
-jar {
-  manifest.attributes(
-    "Automatic-Module-Name": "net.kyori.adventure"
-  )
-}
+applyJarMetadata(this, "net.kyori.adventure")
diff --git a/bom/build.gradle b/bom/build.gradle
@@ -12,6 +12,7 @@ dependencies {
   constraints {
     [
       "api",
+      "extra-kotlin",
       "key",
       "nbt",
       "serializer-configurate3",

diff --git a/build.gradle b/build.gradle
@@ -17,6 +17,25 @@ group "net.kyori"
 version "4.7.0-SNAPSHOT"
 description "A user-interface library for Minecraft: Java Edition."
 
+def applyJarMetadata(project, moduleName) {
+  if("jar" in project.tasks.names) {
+    project.tasks.named("jar", Jar).configure {
+      manifest.attributes(
+        "Automatic-Module-Name": moduleName,
+        "Specification-Title": moduleName,
+        "Specification-Version": project.version,
+        "Specification-Vendor": "KyoriPowered"
+      )
+      if(project.grgit) {
+        manifest.attributes(
+          "Git-Commit": project.grgit.head().id,
+          "Git-Branch": project.grgit.branch.current().name
+        )
+      }
+    }
+  }
+}
+
 subprojects {
   // The bom is special... this is a bit ugly, but not much more we can do without making our own script plugin
   if(name != "adventure-bom") {

diff --git a/extra-kotlin/build.gradle b/extra-kotlin/build.gradle
@@ -20,8 +20,4 @@ dependencies {
   testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
 }
 
-jar {
-  manifest.attributes(
-    "Automatic-Module-Name": "net.kyori.adventure.extra.kotlin"
-  )
-}
+applyJarMetadata(this, "net.kyori.adventure.extra.kotlin")
diff --git a/key/build.gradle b/key/build.gradle
@@ -10,8 +10,4 @@ dependencies {
   testImplementation("com.google.guava:guava:23.0")
 }
 
-jar {
-  manifest.attributes(
-    "Automatic-Module-Name": "net.kyori.adventure.key"
-  )
-}
+applyJarMetadata(this, "net.kyori.adventure.key")
diff --git a/nbt/build.gradle b/nbt/build.gradle
@@ -5,8 +5,4 @@ dependencies {
   compileOnlyApi("org.jetbrains:annotations:20.1.0")
 }
 
-jar {
-  manifest.attributes(
-    "Automatic-Module-Name": "net.kyori.adventure.nbt"
-  )
-}
+applyJarMetadata(this, "net.kyori.adventure.nbt")
diff --git a/serializer-configurate3/build.gradle b/serializer-configurate3/build.gradle
@@ -4,8 +4,4 @@ dependencies {
   testImplementation(project(":adventure-text-serializer-gson"))
 }
 
-jar {
-  manifest.attributes(
-    "Automatic-Module-Name": "net.kyori.adventure.serializer.configurate3"
-  )
-}
+applyJarMetadata(this, "net.kyori.adventure.serializer.configurate3")
diff --git a/serializer-configurate4/build.gradle b/serializer-configurate4/build.gradle
@@ -4,8 +4,4 @@ dependencies {
   testImplementation(project(":adventure-text-serializer-gson"))
 }
 
-jar {
-  manifest.attributes(
-    "Automatic-Module-Name": "net.kyori.adventure.serializer.configurate4"
-  )
-}
+applyJarMetadata(this, "net.kyori.adventure.serializer.configurate4")
diff --git a/text-serializer-gson-legacy-impl/build.gradle b/text-serializer-gson-legacy-impl/build.gradle
@@ -4,8 +4,4 @@ dependencies {
   api(project(":adventure-nbt"))
 }
 
-jar {
-  manifest.attributes(
-    "Automatic-Module-Name": "net.kyori.adventure.text.serializer.gson.legacyimpl"
-  )
-}
+applyJarMetadata(this, "net.kyori.adventure.text.serializer.gson.legacyimpl")
diff --git a/text-serializer-gson/build.gradle b/text-serializer-gson/build.gradle
@@ -4,8 +4,4 @@ dependencies {
   testImplementation(project(":adventure-nbt"))
 }
 
-jar {
-  manifest.attributes(
-    "Automatic-Module-Name": "net.kyori.adventure.text.serializer.gson"
-  )
-}
+applyJarMetadata(this, "net.kyori.adventure.text.serializer.gson")
diff --git a/text-serializer-legacy/build.gradle b/text-serializer-legacy/build.gradle
@@ -2,8 +2,4 @@ dependencies {
   api(project(":adventure-api"))
 }
 
-jar {
-  manifest.attributes(
-    "Automatic-Module-Name": "net.kyori.adventure.text.serializer.legacy"
-  )
-}
+applyJarMetadata(this, "net.kyori.adventure.text.serializer.legacy")
diff --git a/text-serializer-plain/build.gradle b/text-serializer-plain/build.gradle
@@ -2,8 +2,4 @@ dependencies {
   api(project(":adventure-api"))
 }
 
-jar {
-  manifest.attributes(
-    "Automatic-Module-Name": "net.kyori.adventure.text.serializer.plain"
-  )
-}
+applyJarMetadata(this, "net.kyori.adventure.text.serializer.plain")
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ dependencies { @@
       constraints {
         [
           "api",
+          "extra-kotlin",
           "key",
           "nbt",
           "serializer-configurate3",
@@ Expand Down @@