From 2562c700f7c33b2a1258c1004c61bd41631945d0 Mon Sep 17 00:00:00 2001 From: stephengold Date: Mon, 20 May 2024 12:34:42 -0700 Subject: [PATCH] buildscripts: move library/plugin version information to a catalog --- AcorusExamples/build.gradle | 17 ++++++++--------- AcorusLibrary/build.gradle | 4 ++-- build.gradle | 7 ------- common.gradle | 2 +- gradle/libs.versions.toml | 22 ++++++++++++++++++++++ 5 files changed, 33 insertions(+), 19 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/AcorusExamples/build.gradle b/AcorusExamples/build.gradle index c4ff7a6..f0ace34 100644 --- a/AcorusExamples/build.gradle +++ b/AcorusExamples/build.gradle @@ -76,18 +76,17 @@ if (!hasProperty('mainClass')) { jar.manifest.attributes('Main-Class': 'jme3utilities.ui.test.AppChooser') dependencies { - implementation 'org.apache.commons:commons-exec:1.3' - - implementation heartCoordinates - runtimeOnly 'org.jmonkeyengine:jme3-awt-dialogs:' + jme3Version - implementation 'org.jmonkeyengine:jme3-desktop:' + jme3Version - implementation 'org.jmonkeyengine:jme3-lwjgl3:' + jme3Version - runtimeOnly 'org.jmonkeyengine:jme3-testdata:' + jme3Version // for Jaime + implementation(libs.commons.exec) + implementation(libs.heart) + runtimeOnly(libs.jme3.awt.dialogs) + implementation(libs.jme3.desktop) + implementation(libs.jme3.lwjgl3) + runtimeOnly(libs.jme3.testdata) // for Jaime // AcorusExamples doesn't use jme3-jogg nor jme3-plugins // -- they are included solely to avoid warnings from AssetConfig. - runtimeOnly 'org.jmonkeyengine:jme3-jogg:' + jme3Version - runtimeOnly 'org.jmonkeyengine:jme3-plugins:' + jme3Version + runtimeOnly(libs.jme3.jogg) + runtimeOnly(libs.jme3.plugins) //implementation 'com.github.stephengold:Acorus:' + acorusVersion // for published library implementation project(':AcorusLibrary') // for local library build diff --git a/AcorusLibrary/build.gradle b/AcorusLibrary/build.gradle index 799185a..cc54c75 100644 --- a/AcorusLibrary/build.gradle +++ b/AcorusLibrary/build.gradle @@ -19,8 +19,8 @@ ext { } dependencies { - api heartCoordinates - implementation 'org.jmonkeyengine:jme3-desktop:' + jme3Version // for VideoRecorderAppState + api(libs.heart) + implementation(libs.jme3.desktop) // for VideoRecorderAppState } // Register publishing tasks: diff --git a/build.gradle b/build.gradle index f3771f8..c489ad4 100644 --- a/build.gradle +++ b/build.gradle @@ -6,13 +6,6 @@ plugins { ext { jmeTarget = '' // distinguish non-JME libraries built for specific JME releases - - // current version of the JMonkeyEngine libraries: - jme3Version = '3.7.0-beta1' - - // module coordinates of external dependencies: - heartCoordinates = 'com.github.stephengold:Heart:9.0.0' + jmeTarget - acorusSnapshot = '-SNAPSHOT' // for development builds //acorusSnapshot = '' // for release builds acorusVersion = '2.0.1' + jmeTarget diff --git a/common.gradle b/common.gradle index e35ae3b..8568997 100644 --- a/common.gradle +++ b/common.gradle @@ -9,7 +9,7 @@ java { } checkstyle { - toolVersion '9.3' + toolVersion libs.versions.checkstyle.get() } tasks.withType(JavaCompile).configureEach { // Java compile-time options: diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..1845151 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,22 @@ +## catalog of libraries and plugins used to build the Acorus project + +[versions] + +checkstyle = "9.3" +jme = "3.7.0-beta1" + +[libraries] + +commons-exec = "org.apache.commons:commons-exec:1.3" +heart = "com.github.stephengold:Heart:9.0.0" +jme3-awt-dialogs = { module = "org.jmonkeyengine:jme3-awt-dialogs", version.ref = "jme" } +jme3-desktop = { module = "org.jmonkeyengine:jme3-desktop", version.ref = "jme" } +jme3-heart = { module = "org.jmonkeyengine:jme3-heart", version.ref = "jme" } +jme3-jogg = { module = "org.jmonkeyengine:jme3-jogg", version.ref = "jme" } +jme3-lwjgl3 = { module = "org.jmonkeyengine:jme3-lwjgl3", version.ref = "jme" } +jme3-plugins = { module = "org.jmonkeyengine:jme3-plugins", version.ref = "jme" } +jme3-testdata = { module = "org.jmonkeyengine:jme3-testdata", version.ref = "jme" } + +[bundles] + +[plugins]