Prechádzať zdrojové kódy

buildscripts: define the LWJGL version number in a single place

Stephen Gold 3 rokov pred
rodič
commit
31775025a5
3 zmenil súbory, kde vykonal 54 pridanie a 53 odobranie
  1. 5 0
      common.gradle
  2. 41 43
      jme3-lwjgl3/build.gradle
  3. 8 10
      jme3-vr/build.gradle

+ 5 - 0
common.gradle

@@ -21,10 +21,15 @@ if(JavaVersion.current() >= JavaVersion.VERSION_1_9) {
 
 gradle.projectsEvaluated {
     tasks.withType(JavaCompile) { // compile-time options:
+        //options.compilerArgs << '-Xlint:deprecation' // to show deprecation warnings
         options.compilerArgs << '-Xlint:unchecked'
     }
 }
 
+ext {
+    lwjgl3Version = '3.2.3' // used in both the jme3-lwjgl3 and jme3-vr build scripts
+}
+
 repositories {
     mavenCentral()
     flatDir {

+ 41 - 43
jme3-lwjgl3/build.gradle

@@ -1,52 +1,50 @@
-def lwjglVersion = '3.2.3'
-
 sourceCompatibility = '1.8'
 
 dependencies {
     api project(':jme3-core')
     api project(':jme3-desktop')
 
-    api "org.lwjgl:lwjgl:${lwjglVersion}"
-    api "org.lwjgl:lwjgl-glfw:${lwjglVersion}"
-    api "org.lwjgl:lwjgl-jemalloc:${lwjglVersion}"
-    api "org.lwjgl:lwjgl-openal:${lwjglVersion}"
-    api "org.lwjgl:lwjgl-opencl:${lwjglVersion}"
-    api "org.lwjgl:lwjgl-opengl:${lwjglVersion}"
-
-    runtimeOnly "org.lwjgl:lwjgl:${lwjglVersion}:natives-windows"
-    runtimeOnly "org.lwjgl:lwjgl:${lwjglVersion}:natives-windows-x86"
-    runtimeOnly "org.lwjgl:lwjgl:${lwjglVersion}:natives-linux"
-    runtimeOnly "org.lwjgl:lwjgl:${lwjglVersion}:natives-linux-arm32"
-    runtimeOnly "org.lwjgl:lwjgl:${lwjglVersion}:natives-linux-arm64"
-    runtimeOnly "org.lwjgl:lwjgl:${lwjglVersion}:natives-macos"
-
-    runtimeOnly "org.lwjgl:lwjgl-glfw:${lwjglVersion}:natives-windows"
-    runtimeOnly "org.lwjgl:lwjgl-glfw:${lwjglVersion}:natives-windows-x86"
-    runtimeOnly "org.lwjgl:lwjgl-glfw:${lwjglVersion}:natives-linux"
-    runtimeOnly "org.lwjgl:lwjgl-glfw:${lwjglVersion}:natives-linux-arm32"
-    runtimeOnly "org.lwjgl:lwjgl-glfw:${lwjglVersion}:natives-linux-arm64"
-    runtimeOnly "org.lwjgl:lwjgl-glfw:${lwjglVersion}:natives-macos"
-
-    runtimeOnly "org.lwjgl:lwjgl-jemalloc:${lwjglVersion}:natives-windows"
-    runtimeOnly "org.lwjgl:lwjgl-jemalloc:${lwjglVersion}:natives-windows-x86"
-    runtimeOnly "org.lwjgl:lwjgl-jemalloc:${lwjglVersion}:natives-linux"
-    runtimeOnly "org.lwjgl:lwjgl-jemalloc:${lwjglVersion}:natives-linux-arm32"
-    runtimeOnly "org.lwjgl:lwjgl-jemalloc:${lwjglVersion}:natives-linux-arm64"
-    runtimeOnly "org.lwjgl:lwjgl-jemalloc:${lwjglVersion}:natives-macos"
-
-    runtimeOnly "org.lwjgl:lwjgl-opengl:${lwjglVersion}:natives-windows"
-    runtimeOnly "org.lwjgl:lwjgl-opengl:${lwjglVersion}:natives-windows-x86"
-    runtimeOnly "org.lwjgl:lwjgl-opengl:${lwjglVersion}:natives-linux"
-    runtimeOnly "org.lwjgl:lwjgl-opengl:${lwjglVersion}:natives-linux-arm32"
-    runtimeOnly "org.lwjgl:lwjgl-opengl:${lwjglVersion}:natives-linux-arm64"
-    runtimeOnly "org.lwjgl:lwjgl-opengl:${lwjglVersion}:natives-macos"
-
-    runtimeOnly "org.lwjgl:lwjgl-openal:${lwjglVersion}:natives-windows"
-    runtimeOnly "org.lwjgl:lwjgl-openal:${lwjglVersion}:natives-windows-x86"
-    runtimeOnly "org.lwjgl:lwjgl-openal:${lwjglVersion}:natives-linux"
-    runtimeOnly "org.lwjgl:lwjgl-openal:${lwjglVersion}:natives-linux-arm32"
-    runtimeOnly "org.lwjgl:lwjgl-openal:${lwjglVersion}:natives-linux-arm64"
-    runtimeOnly "org.lwjgl:lwjgl-openal:${lwjglVersion}:natives-macos"
+    api "org.lwjgl:lwjgl:${lwjgl3Version}"
+    api "org.lwjgl:lwjgl-glfw:${lwjgl3Version}"
+    api "org.lwjgl:lwjgl-jemalloc:${lwjgl3Version}"
+    api "org.lwjgl:lwjgl-openal:${lwjgl3Version}"
+    api "org.lwjgl:lwjgl-opencl:${lwjgl3Version}"
+    api "org.lwjgl:lwjgl-opengl:${lwjgl3Version}"
+
+    runtimeOnly "org.lwjgl:lwjgl:${lwjgl3Version}:natives-windows"
+    runtimeOnly "org.lwjgl:lwjgl:${lwjgl3Version}:natives-windows-x86"
+    runtimeOnly "org.lwjgl:lwjgl:${lwjgl3Version}:natives-linux"
+    runtimeOnly "org.lwjgl:lwjgl:${lwjgl3Version}:natives-linux-arm32"
+    runtimeOnly "org.lwjgl:lwjgl:${lwjgl3Version}:natives-linux-arm64"
+    runtimeOnly "org.lwjgl:lwjgl:${lwjgl3Version}:natives-macos"
+
+    runtimeOnly "org.lwjgl:lwjgl-glfw:${lwjgl3Version}:natives-windows"
+    runtimeOnly "org.lwjgl:lwjgl-glfw:${lwjgl3Version}:natives-windows-x86"
+    runtimeOnly "org.lwjgl:lwjgl-glfw:${lwjgl3Version}:natives-linux"
+    runtimeOnly "org.lwjgl:lwjgl-glfw:${lwjgl3Version}:natives-linux-arm32"
+    runtimeOnly "org.lwjgl:lwjgl-glfw:${lwjgl3Version}:natives-linux-arm64"
+    runtimeOnly "org.lwjgl:lwjgl-glfw:${lwjgl3Version}:natives-macos"
+
+    runtimeOnly "org.lwjgl:lwjgl-jemalloc:${lwjgl3Version}:natives-windows"
+    runtimeOnly "org.lwjgl:lwjgl-jemalloc:${lwjgl3Version}:natives-windows-x86"
+    runtimeOnly "org.lwjgl:lwjgl-jemalloc:${lwjgl3Version}:natives-linux"
+    runtimeOnly "org.lwjgl:lwjgl-jemalloc:${lwjgl3Version}:natives-linux-arm32"
+    runtimeOnly "org.lwjgl:lwjgl-jemalloc:${lwjgl3Version}:natives-linux-arm64"
+    runtimeOnly "org.lwjgl:lwjgl-jemalloc:${lwjgl3Version}:natives-macos"
+
+    runtimeOnly "org.lwjgl:lwjgl-opengl:${lwjgl3Version}:natives-windows"
+    runtimeOnly "org.lwjgl:lwjgl-opengl:${lwjgl3Version}:natives-windows-x86"
+    runtimeOnly "org.lwjgl:lwjgl-opengl:${lwjgl3Version}:natives-linux"
+    runtimeOnly "org.lwjgl:lwjgl-opengl:${lwjgl3Version}:natives-linux-arm32"
+    runtimeOnly "org.lwjgl:lwjgl-opengl:${lwjgl3Version}:natives-linux-arm64"
+    runtimeOnly "org.lwjgl:lwjgl-opengl:${lwjgl3Version}:natives-macos"
+
+    runtimeOnly "org.lwjgl:lwjgl-openal:${lwjgl3Version}:natives-windows"
+    runtimeOnly "org.lwjgl:lwjgl-openal:${lwjgl3Version}:natives-windows-x86"
+    runtimeOnly "org.lwjgl:lwjgl-openal:${lwjgl3Version}:natives-linux"
+    runtimeOnly "org.lwjgl:lwjgl-openal:${lwjgl3Version}:natives-linux-arm32"
+    runtimeOnly "org.lwjgl:lwjgl-openal:${lwjgl3Version}:natives-linux-arm64"
+    runtimeOnly "org.lwjgl:lwjgl-openal:${lwjgl3Version}:natives-macos"
 }
 
 javadoc {

+ 8 - 10
jme3-vr/build.gradle

@@ -1,5 +1,3 @@
-def lwjglVersion = '3.2.3'
-
 sourceCompatibility = '1.8'
 
 dependencies {
@@ -13,16 +11,16 @@ dependencies {
     implementation 'com.nativelibs4java:jnaerator-runtime:0.12'
 
     // Native LibOVR/Oculus support
-    api "org.lwjgl:lwjgl-ovr:${lwjglVersion}"
-    runtimeOnly "org.lwjgl:lwjgl-ovr:${lwjglVersion}:natives-windows"
+    api "org.lwjgl:lwjgl-ovr:${lwjgl3Version}"
+    runtimeOnly "org.lwjgl:lwjgl-ovr:${lwjgl3Version}:natives-windows"
     
     // Native OpenVR/LWJGL support
-    api "org.lwjgl:lwjgl-openvr:${lwjglVersion}"
-    implementation "org.lwjgl:lwjgl-openvr:${lwjglVersion}:natives-linux"
-    implementation "org.lwjgl:lwjgl-openvr:${lwjglVersion}:natives-macos"
-    runtimeOnly "org.lwjgl:lwjgl-openvr:${lwjglVersion}:natives-windows"
-    runtimeOnly "org.lwjgl:lwjgl-openvr:${lwjglVersion}:natives-linux"
-    runtimeOnly "org.lwjgl:lwjgl-openvr:${lwjglVersion}:natives-macos"
+    api "org.lwjgl:lwjgl-openvr:${lwjgl3Version}"
+    implementation "org.lwjgl:lwjgl-openvr:${lwjgl3Version}:natives-linux"
+    implementation "org.lwjgl:lwjgl-openvr:${lwjgl3Version}:natives-macos"
+    runtimeOnly "org.lwjgl:lwjgl-openvr:${lwjgl3Version}:natives-windows"
+    runtimeOnly "org.lwjgl:lwjgl-openvr:${lwjgl3Version}:natives-linux"
+    runtimeOnly "org.lwjgl:lwjgl-openvr:${lwjgl3Version}:natives-macos"
 }
 
 javadoc {