From 5fb2c661d8b9587875a328617464be4149e9fa71 Mon Sep 17 00:00:00 2001 From: Stephen Gold Date: Thu, 26 Jan 2023 13:17:20 -0800 Subject: [PATCH 1/3] buildscript: move def of "niftyVersion" to "common.gradle" (shared between projects) --- common.gradle | 1 + jme3-niftygui/build.gradle | 2 -- jme3-testdata/build.gradle | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/common.gradle b/common.gradle index 5961ec84b3..cadabbba0a 100644 --- a/common.gradle +++ b/common.gradle @@ -27,6 +27,7 @@ tasks.withType(JavaCompile) { // compile-time options: ext { lwjgl3Version = '3.3.1' // used in both the jme3-lwjgl3 and jme3-vr build scripts + niftyVersion = '1.4.3' // used in both the jme3-niftygui and jme3-examples build scripts } repositories { diff --git a/jme3-niftygui/build.gradle b/jme3-niftygui/build.gradle index 28ed886d01..088cb562ef 100644 --- a/jme3-niftygui/build.gradle +++ b/jme3-niftygui/build.gradle @@ -1,5 +1,3 @@ -def niftyVersion = '1.4.3' - dependencies { api project(':jme3-core') api "com.github.nifty-gui:nifty:${niftyVersion}" diff --git a/jme3-testdata/build.gradle b/jme3-testdata/build.gradle index 3650706333..41ea3107e2 100644 --- a/jme3-testdata/build.gradle +++ b/jme3-testdata/build.gradle @@ -1,5 +1,3 @@ -def niftyVersion = '1.4.3' - dependencies { runtimeOnly "com.github.nifty-gui:nifty-examples:$niftyVersion" runtimeOnly "com.github.nifty-gui:nifty-style-black:$niftyVersion" From 1e2c60436c665712b53c9bceba0da5dd5176a828 Mon Sep 17 00:00:00 2001 From: Stephen Gold Date: Thu, 26 Jan 2023 13:19:01 -0800 Subject: [PATCH 2/3] jme3-testdata: rm dependency on "nifty-style-black" (redundant with "jme3-niftygui") --- jme3-testdata/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/jme3-testdata/build.gradle b/jme3-testdata/build.gradle index 41ea3107e2..c7201401bb 100644 --- a/jme3-testdata/build.gradle +++ b/jme3-testdata/build.gradle @@ -1,4 +1,3 @@ dependencies { runtimeOnly "com.github.nifty-gui:nifty-examples:$niftyVersion" - runtimeOnly "com.github.nifty-gui:nifty-style-black:$niftyVersion" } From 2525e0b7d194da665202ba0658b369cfd4a51202 Mon Sep 17 00:00:00 2001 From: Stephen Gold Date: Thu, 26 Jan 2023 13:20:05 -0800 Subject: [PATCH 3/3] buildscript: mv "nifty-examples" dependency from "jme3-testdata" to "jme3-examples" --- jme3-examples/build.gradle | 1 + jme3-testdata/build.gradle | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/jme3-examples/build.gradle b/jme3-examples/build.gradle index fbed866b7d..60912ff1a8 100644 --- a/jme3-examples/build.gradle +++ b/jme3-examples/build.gradle @@ -27,6 +27,7 @@ dependencies { implementation project(':jme3-terrain') implementation project(':jme3-awt-dialogs') runtimeOnly project(':jme3-testdata') + runtimeOnly "com.github.nifty-gui:nifty-examples:${niftyVersion}" // for the "all/intro.xml" example GUI } jar.doFirst{ diff --git a/jme3-testdata/build.gradle b/jme3-testdata/build.gradle index c7201401bb..7d82dc72fb 100644 --- a/jme3-testdata/build.gradle +++ b/jme3-testdata/build.gradle @@ -1,3 +1,2 @@ dependencies { - runtimeOnly "com.github.nifty-gui:nifty-examples:$niftyVersion" }