buildscripts: move the "ext" block out of "common.gradle"

stephengold · May 10, 2024 · 51bcabc · 51bcabc
1 parent b817550
commit 51bcabc
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,6 +4,12 @@ plugins {
     id 'base' // to add a "clean" task to the root project
 }
 
+ext {
+    group = 'com.github.stephengold'
+    version = '1.0.5-SNAPSHOT'
+    websiteUrl = 'https://github.com/stephengold/j-ogg-all'
+}
+
 subprojects {
     apply from: rootProject.file('common.gradle')
 }

diff --git a/common.gradle b/common.gradle
@@ -5,12 +5,6 @@ apply plugin: 'java-library'  // to build a JVM library
 apply plugin: 'maven-publish' // to publish artifacts to Maven repositories
 apply plugin: 'signing'       // to sign artifacts for publication
 
-ext {
-    group = 'com.github.stephengold'
-    version = '1.0.5-SNAPSHOT'
-    websiteUrl = 'https://github.com/stephengold/j-ogg-all'
-}
-
 java {
     sourceCompatibility = JavaVersion.VERSION_1_7
     targetCompatibility = JavaVersion.VERSION_1_8

diff --git a/library/build.gradle b/library/build.gradle
@@ -64,7 +64,7 @@ publishing {
             artifact sourcesJar
             artifactId artifact
             from components.java
-            groupId project.ext.group
+            groupId rootProject.ext.group
             pom {
                 description = 'J-Ogg is a collection of Java libraries for reading Ogg files and decoding different contained formats.'
                 developers {
@@ -77,18 +77,18 @@ publishing {
                     license {
                         distribution = 'repo'
                         name = 'Free and commercial use, modification and redistribution with attribution.'
-                        url = project.ext.websiteUrl + '/blob/master/LICENSE'
+                        url = rootProject.ext.websiteUrl + '/blob/master/LICENSE'
                     }
                 }
-                name = project.ext.group + ':' + artifact
+                name = rootProject.ext.group + ':' + artifact
                 scm {
                     connection = 'scm:git:git://github.com/stephengold/j-ogg-all.git'
                     developerConnection = 'scm:git:ssh://github.com:stephengold/j-ogg-all.git'
-                    url = project.ext.websiteUrl + '/tree/master'
+                    url = rootProject.ext.websiteUrl + '/tree/master'
                 }
-                url = project.ext.websiteUrl
+                url = rootProject.ext.websiteUrl
             }
-            version project.ext.version
+            version rootProject.ext.version
         }
     }
     // Staging to OSSRH relies on the existence of 2 properties

diff --git a/vorbis/build.gradle b/vorbis/build.gradle
@@ -58,7 +58,7 @@ publishing {
             artifact sourcesJar
             artifactId artifact
             from components.java
-            groupId project.ext.group
+            groupId rootProject.ext.group
             pom {
                 description = 'Library for reading Ogg files and decoding the Vorbis audio format.'
                 developers {
@@ -71,18 +71,18 @@ publishing {
                     license {
                         distribution = 'repo'
                         name = 'Free and commercial use, modification and redistribution with attribution.'
-                        url = project.ext.websiteUrl + '/blob/master/LICENSE'
+                        url = rootProject.ext.websiteUrl + '/blob/master/LICENSE'
                     }
                 }
-                name = project.ext.group + ':' + artifact
+                name = rootProject.ext.group + ':' + artifact
                 scm {
                     connection = 'scm:git:git://github.com/stephengold/j-ogg-all.git'
                     developerConnection = 'scm:git:ssh://github.com:stephengold/j-ogg-all.git'
-                    url = project.ext.websiteUrl + '/tree/master'
+                    url = rootProject.ext.websiteUrl + '/tree/master'
                 }
-                url = project.ext.websiteUrl
+                url = rootProject.ext.websiteUrl
             }
-            version project.ext.version
+            version rootProject.ext.version
         }
     }
     // Staging to OSSRH relies on the existence of 2 properties