Browse Source

Bump Gradle and dep versions

Toni Helenius 2 years ago
parent
commit
a1a44d450c
6 changed files with 46 additions and 39 deletions
  1. 24 25
      build.gradle
  2. 2 2
      gradle.properties
  3. BIN
      gradle/wrapper/gradle-wrapper.jar
  4. 1 1
      gradle/wrapper/gradle-wrapper.properties
  5. 11 5
      gradlew
  6. 8 6
      gradlew.bat

+ 24 - 25
build.gradle

@@ -19,7 +19,6 @@ repositories {
         url "https://maven.google.com/"
         url "https://maven.google.com/"
     }
     }
     mavenCentral()
     mavenCentral()
-    jcenter() // because of 'com.simsilica:sim-math:1.4.1'
 }
 }
 
 
 configurations {
 configurations {
@@ -32,32 +31,32 @@ configurations {
 dependencies {
 dependencies {
 
 
     corelibs dep("com.github.xbuf:jme3_xbuf:0.9.1", false, false)
     corelibs dep("com.github.xbuf:jme3_xbuf:0.9.1", false, false)
-    corelibs dep("com.badlogicgames.gdx:gdx-ai:1.8.1", true, true)
+    corelibs dep("com.badlogicgames.gdx:gdx-ai:1.8.2", true, true)
     corelibs dep("javax.help:javahelp:2.0.05", false, false)
     corelibs dep("javax.help:javahelp:2.0.05", false, false)
 
 
-    corelibs dep("org.jmonkeyengine:jme3-core:3.4.1-stable", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-desktop:3.4.1-stable", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-lwjgl:3.4.1-stable", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-effects:3.4.1-stable", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-core:$jmeVersion-$jmeVersionTag", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-desktop:$jmeVersion-$jmeVersionTag", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-lwjgl:$jmeVersion-$jmeVersionTag", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-effects:$jmeVersion-$jmeVersionTag", false, false)
     corelibs dep("org.jmonkeyengine:jme3-blender:3.3.2-stable", false, false) // Pin Pointed until jme3-blender has a dedicated release or support is phased out.
     corelibs dep("org.jmonkeyengine:jme3-blender:3.3.2-stable", false, false) // Pin Pointed until jme3-blender has a dedicated release or support is phased out.
-    optlibs dep("com.github.stephengold:Minie:4.6.0", false, false) // replacement for bullet-native
+    optlibs dep("com.github.stephengold:Minie:6.0.0", false, false) // replacement for bullet-native
     corelibs dep(fileTree("lib"), false, false)
     corelibs dep(fileTree("lib"), false, false)
-    corelibs dep("org.jmonkeyengine:jme3-jogg:3.4.1-stable", true, true)
-
-    corelibs dep("org.jmonkeyengine:jme3-networking:3.4.1-stable", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-niftygui:3.4.1-stable", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-plugins:3.4.1-stable", false, false)
-    corelibs dep("org.jmonkeyengine:jme3-terrain:3.4.1-stable", false, false)
-
-    optlibs dep("org.jmonkeyengine:jme3-jbullet:3.4.1-stable", false, false)
-    optlibs dep("org.jmonkeyengine:jme3-android:3.4.1-stable", false, false)
-    optlibs dep("org.jmonkeyengine:jme3-ios:3.4.1-stable", false, false)
-    optlibs dep("org.jmonkeyengine:jme3-android-native:3.4.1-stable", false, false)
-    optlibs dep("org.jmonkeyengine:jme3-lwjgl3:3.4.1-stable", false, false)
-    optlibs dep("com.github.stephengold:Heart:7.1.0", false, false)
-    optlibs dep("com.github.stephengold:Wes:0.6.7", false, false)
-    testdatalibs dep("org.jmonkeyengine:jme3-testdata:3.4.1-stable", false, false)
-    examplelibs dep("org.jmonkeyengine:jme3-examples:3.4.1-stable", false, true)
+    corelibs dep("org.jmonkeyengine:jme3-jogg:$jmeVersion-$jmeVersionTag", true, true)
+
+    corelibs dep("org.jmonkeyengine:jme3-networking:$jmeVersion-$jmeVersionTag", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-niftygui:$jmeVersion-$jmeVersionTag", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-plugins:$jmeVersion-$jmeVersionTag", false, false)
+    corelibs dep("org.jmonkeyengine:jme3-terrain:$jmeVersion-$jmeVersionTag", false, false)
+
+    optlibs dep("org.jmonkeyengine:jme3-jbullet:$jmeVersion-$jmeVersionTag", false, false)
+    optlibs dep("org.jmonkeyengine:jme3-android:$jmeVersion-$jmeVersionTag", false, false)
+    optlibs dep("org.jmonkeyengine:jme3-ios:$jmeVersion-$jmeVersionTag", false, false)
+    optlibs dep("org.jmonkeyengine:jme3-android-native:$jmeVersion-$jmeVersionTag", false, false)
+    optlibs dep("org.jmonkeyengine:jme3-lwjgl3:$jmeVersion-$jmeVersionTag", false, false)
+    optlibs dep("com.github.stephengold:Heart:8.1.0", false, false)
+    optlibs dep("com.github.stephengold:Wes:0.7.2", false, false)
+    testdatalibs dep("org.jmonkeyengine:jme3-testdata:$jmeVersion-$jmeVersionTag", false, false)
+    examplelibs dep("org.jmonkeyengine:jme3-examples:$jmeVersion-$jmeVersionTag", false, true)
 }
 }
 
 
 def dep(coords, javadoc = false, sources = false) {
 def dep(coords, javadoc = false, sources = false) {
@@ -463,7 +462,7 @@ task createProjectXml(dependsOn: configurations.corelibs) {
         def layerXml = new MarkupBuilder(layerWriter)
         def layerXml = new MarkupBuilder(layerWriter)
     //    layerXml.mkp.xmlDeclaration(version:'1.0')
     //    layerXml.mkp.xmlDeclaration(version:'1.0')
         layerWriter << '<?xml version="1.0" encoding="UTF-8"?>' << eol
         layerWriter << '<?xml version="1.0" encoding="UTF-8"?>' << eol
-        layerWriter << '<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN" "http://www.netbeans.org/dtds/filesystem-1_1.dtd">' << eol
+        layerWriter << '<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">' << eol
         layerXml.filesystem{
         layerXml.filesystem{
             folder(name:"org-netbeans-api-project-libraries"){
             folder(name:"org-netbeans-api-project-libraries"){
                 folder(name:"Libraries"){
                 folder(name:"Libraries"){
@@ -637,7 +636,7 @@ task fixPlatformIndependent(dependsOn: patchPlatformIndependent, type: Zip) {
 }
 }
 
 
 wrapper {
 wrapper {
-    gradleVersion = '6.9.2'
+    gradleVersion = '7.5.1'
 }
 }
 
 
 //jar.dependsOn(buildSdk)
 //jar.dependsOn(buildSdk)

+ 2 - 2
gradle.properties

@@ -1,9 +1,9 @@
 # Version number used for plugins, only 3 numbers (e.g. 3.1.3)
 # Version number used for plugins, only 3 numbers (e.g. 3.1.3)
-jmeVersion = 3.4.1
+jmeVersion = 3.5.2
 # Version used for application and settings folder, no spaces!
 # Version used for application and settings folder, no spaces!
 jmeMainVersion = 3.4
 jmeMainVersion = 3.4
 # Version addition pre-alpha-svn, Stable, Beta
 # Version addition pre-alpha-svn, Stable, Beta
-#jmeVersionTag = SNAPSHOT
+jmeVersionTag = stable
 # Increment this each time jmeVersionTag changes but jmeVersion stays the same
 # Increment this each time jmeVersionTag changes but jmeVersion stays the same
 #jmeVersionTagID = 0
 #jmeVersionTagID = 0
 
 

BIN
gradle/wrapper/gradle-wrapper.jar


+ 1 - 1
gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 zipStorePath=wrapper/dists

+ 11 - 5
gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 #!/bin/sh
 
 
 #
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #       requires all of these POSIX shell features:
 #         * functions;
 #         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #
 #   Important for patching:
 #   Important for patching:
 #
 #
@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
         "$@"
 
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 # Use "xargs" to parse quoted args.
 #
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

+ 8 - 6
gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem limitations under the License.
 @rem
 @rem
 
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem ##########################################################################
 @rem
 @rem
 @rem  Gradle startup script for Windows
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 if "%OS%"=="Windows_NT" setlocal
 
 
 set DIRNAME=%~dp0
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 set APP_HOME=%DIRNAME%
 
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 
 set JAVA_EXE=java.exe
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 
 echo.
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 :end
 :end
 @rem End local scope for the variables with windows NT shell
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 
 :fail
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 
 :mainEnd
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 if "%OS%"=="Windows_NT" endlocal