Centralize short name calculation

vyfor · Apr 5, 2018 · 8ee37e9 · 8ee37e9
1 parent 3ccb30a
commit 8ee37e9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -29,7 +29,8 @@ clean {
 }
 
 subprojects {
-    description = "A multithreaded but easy to use Discord Java API (${name - ~/^javacord-/})"
+    ext.shortName = name - ~/^javacord-/
+    description = "A multithreaded but easy to use Discord Java API ($shortName)"
 }
 
 tasks.remove knows

diff --git a/gradle/java9.gradle b/gradle/java9.gradle
@@ -57,17 +57,10 @@ if (JavaVersion.current().java9Compatible) {
             logger.warn 'Building on Java 8, resulting JARs will not be Jigsaw ready properly!'
         }
     }
-    project(':javacord-api') {
-        jar {
-            manifest {
-                attributes 'Automatic-Module-Name': 'org.javacord.api'
-            }
-        }
-    }
-    project(':javacord-core') {
+    subprojects {
         jar {
             manifest {
-                attributes 'Automatic-Module-Name': 'org.javacord.core'
+                attributes 'Automatic-Module-Name': "org.javacord.$shortName"
             }
         }
     }

diff --git a/gradle/javadoc.gradle b/gradle/javadoc.gradle
@@ -1,7 +1,7 @@
 import javax.naming.ConfigurationException
 import static org.gradle.api.JavaVersion.toVersion
 
-allprojects {
+subprojects {
     tasks.withType(Javadoc) { javadocTask ->
         def java9ToolChain = toVersion(toolChain.version).java9Compatible
         // use taskGraph.whenReady to not always have a custom action which makes the task uncachable
@@ -22,7 +22,7 @@ allprojects {
         options {
             locale 'en'
             encoding 'UTF-8'
-            docTitle "Javacord $project.version (${project.name - ~/^javacord-/})"
+            docTitle "Javacord $project.version ($project.shortName)"
             windowTitle "$docTitle Documentation"
             links 'https://docs.oracle.com/javase/8/docs/api/'
             delegate.use()

diff --git a/gradle/pom.gradle b/gradle/pom.gradle
@@ -2,11 +2,7 @@ allprojects { project ->
     apply plugin: 'me.tatarka.gradle.pom'
 
     pom {
-        if (project.name =~ ~/^javacord-/) {
-            name "Javacord (${project.name - ~/^javacord-/})"
-        } else {
-            name 'Javacord'
-        }
+        name rootProject.name.capitalize() + (project.parent ? " ($shortName)" : '')
         description project.description
         url 'https://github.com/BtoBastian/Javacord/wiki'
         issueManagement {