Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Tooling n version #372

Merged
merged 2 commits into from
Aug 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 24 additions & 25 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ repositories {
url "https://maven.google.com/"
}
mavenCentral()
jcenter() // because of 'com.simsilica:sim-math:1.4.1'
}

configurations {
Expand All @@ -32,32 +31,32 @@ configurations {
dependencies {

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("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.
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("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) {
Expand Down Expand Up @@ -463,7 +462,7 @@ task createProjectXml(dependsOn: configurations.corelibs) {
def layerXml = new MarkupBuilder(layerWriter)
// layerXml.mkp.xmlDeclaration(version:'1.0')
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{
folder(name:"org-netbeans-api-project-libraries"){
folder(name:"Libraries"){
Expand Down Expand Up @@ -637,7 +636,7 @@ task fixPlatformIndependent(dependsOn: patchPlatformIndependent, type: Zip) {
}

wrapper {
gradleVersion = '6.9.2'
gradleVersion = '7.5.1'
}

//jar.dependsOn(buildSdk)
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# 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!
jmeMainVersion = 3.4
jmeMainVersion = 3.5
# Version addition pre-alpha-svn, Stable, Beta
#jmeVersionTag = SNAPSHOT
jmeVersionTag = stable
# Increment this each time jmeVersionTag changes but jmeVersion stays the same
#jmeVersionTagID = 0

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
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
zipStorePath=wrapper/dists
16 changes: 11 additions & 5 deletions gradlew
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

#
# Copyright 2015-2021 the original authors.
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -32,10 +32,10 @@
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * 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:
#
Expand Down Expand Up @@ -205,6 +205,12 @@ set -- \
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.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
Expand Down
14 changes: 8 additions & 6 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
Expand All @@ -25,7 +25,7 @@
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
if "%DIRNAME%"=="" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand All @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Expand Down Expand Up @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
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
if "%OS%"=="Windows_NT" endlocal
Expand Down