Skip to content

Commit 72dbe3f

Browse files
Downgrade to Java 16 for Construo compatibility
1 parent a24f2dd commit 72dbe3f

File tree

9 files changed

+47
-38
lines changed

9 files changed

+47
-38
lines changed

build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ buildscript {
88
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
99
maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }
1010
}
11+
dependencies {
12+
13+
14+
}
1115
}
1216

1317
allprojects {
@@ -25,7 +29,7 @@ allprojects {
2529

2630
configure(subprojects) {
2731
apply plugin: 'java-library'
28-
sourceCompatibility = 17
32+
sourceCompatibility = 16
2933

3034
// Add the JUnit dependency for testing
3135
dependencies {

core/build.gradle

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
22
eclipse.project.name = appName + '-core'
3-
ext.gdxVersion = '1.12.0'
43

54
dependencies {
65
api "com.badlogicgames.gdx:gdx:$gdxVersion"
76

87
if(enableGraalNative == 'true') {
98
implementation "io.github.berstanio:gdx-svmhelper-annotations:$graalHelperVersion"
109
}
11-
12-
implementation "com.badlogicgames.gdx:gdx:$gdxVersion"
13-
implementation "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion" // dla desktopa
14-
implementation "com.badlogicgames.gdx:gdx-freetype:$gdxVersion" // dodaj zależność dla FreeType
15-
16-
1710
}

gradle.properties

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
1+
# This doesn't need to be false, and some projects may be able to take advantage of setting daemon to true.
2+
# We set it to false by default in order to avoid too many daemons from being created and persisting; each needs RAM.
13
org.gradle.daemon=false
4+
# Sets starting memory usage to 512MB, maximum memory usage to 1GB, and tries to set as much to use Unicode as we can.
25
org.gradle.jvmargs=-Xms512M -Xmx1G -Dfile.encoding=UTF-8 -Dconsole.encoding=UTF-8
6+
# "Configure on-demand" must be false because it breaks projects that have Android modules. The default is also false.
37
org.gradle.configureondemand=false
8+
# The logging level determines which messages get shown about how Gradle itself is working, such as if build.gradle
9+
# files are fully future-proof (which they never are, because Gradle constantly deprecates working APIs).
10+
# You can change 'quiet' below to 'lifecycle' to use Gradle's default behavior, which shows some confusing messages.
11+
# You could instead change 'quiet' below to 'info' to see info that's important mainly while debugging build files.
12+
# Documented at: https://docs.gradle.org/current/userguide/command_line_interface.html#sec:command_line_logging
13+
org.gradle.logging.level=quiet
414
graalHelperVersion=2.0.1
515
enableGraalNative=false
616
gdxVersion=1.13.1
7-
projectVersion=1.0.0
17+
projectVersion=1.0.1
Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
#This file is generated by updateDaemonJvm
2-
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/538ec8b643622db586076dcc6de01496/redirect
3-
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/3c821b3d2a2ed31cd255a8836df5ca27/redirect
4-
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/538ec8b643622db586076dcc6de01496/redirect
5-
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/3c821b3d2a2ed31cd255a8836df5ca27/redirect
6-
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/4eb299e08ff72ece03792f6745206490/redirect
7-
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/240ef070840c3324981ae8cc2985a9e6/redirect
8-
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/538ec8b643622db586076dcc6de01496/redirect
9-
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/3c821b3d2a2ed31cd255a8836df5ca27/redirect
10-
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ad1096e6e0353fb5900e1a5ece7d864a/redirect
11-
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/41f6d00ddc15a000f14896a6d3bfb1b8/redirect
12-
toolchainVendor=BELLSOFT
2+
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/65aaef917b9f394804f058f1861225c9/redirect
3+
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/c728c5388b044fbdbbc44b0c6acee0df/redirect
4+
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/65aaef917b9f394804f058f1861225c9/redirect
5+
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/c728c5388b044fbdbbc44b0c6acee0df/redirect
6+
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/dc463b4a8183dbcaa1b32544189c7f03/redirect
7+
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/cb7dc109dd590ebca2d703734d23c9d3/redirect
8+
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/65aaef917b9f394804f058f1861225c9/redirect
9+
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/c728c5388b044fbdbbc44b0c6acee0df/redirect
10+
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/43ee83889b87bacad5d3071ae7bbd349/redirect
11+
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/2d57bdd1e17a18f83ff073919daa35ba/redirect
1312
toolchainVersion=17

gradle/wrapper/gradle-wrapper.jar

59 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
118118

119119

120120
# Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
213213
set -- \
214214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215215
-classpath "$CLASSPATH" \
216-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217217
"$@"
218218

219219
# Stop when "xargs" is not available.

gradlew.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7474

7575

7676
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

lwjgl3/build.gradle

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ sourceSets.main.resources.srcDirs += [ rootProject.file('assets').path ]
2222
mainClassName = 'org.toadallyarmed.lwjgl3.Lwjgl3Launcher'
2323
application.setMainClass(mainClassName)
2424
eclipse.project.name = appName + '-lwjgl3'
25-
java.sourceCompatibility = 17
26-
java.targetCompatibility = 17
25+
java.sourceCompatibility = 16
26+
java.targetCompatibility = 16
2727
if (JavaVersion.current().isJava9Compatible()) {
28-
compileJava.options.release.set(17)
28+
compileJava.options.release.set(16)
2929
}
3030

3131
dependencies {
@@ -122,29 +122,32 @@ construo {
122122
version.set("$projectVersion")
123123

124124
targets.configure {
125-
create("linuxX64", Target.Linux) {
125+
register("linuxX64", Target.Linux) {
126126
architecture.set(Target.Architecture.X86_64)
127-
jdkUrl.set("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.12_7.tar.gz")
127+
jdkUrl.set("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_x64_linux_hotspot_17.0.15_6.tar.gz")
128+
// Linux does not currently have a way to set the icon on the executable
128129
}
129-
create("macM1", Target.MacOs) {
130+
register("macM1", Target.MacOs) {
130131
architecture.set(Target.Architecture.AARCH64)
131-
jdkUrl.set("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.12_7.tar.gz")
132+
jdkUrl.set("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.15_6.tar.gz")
132133
// macOS needs an identifier
133134
identifier.set("org.toadallyarmed." + appName)
134-
// Optional: icon for macOS
135+
// Optional: icon for macOS, as an ICNS file
135136
macIcon.set(project.file("icons/logo.icns"))
136137
}
137-
create("macX64", Target.MacOs) {
138+
register("macX64", Target.MacOs) {
138139
architecture.set(Target.Architecture.X86_64)
139-
jdkUrl.set("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.12_7.tar.gz")
140+
jdkUrl.set("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_x64_mac_hotspot_17.0.15_6.tar.gz")
140141
// macOS needs an identifier
141142
identifier.set("org.toadallyarmed." + appName)
142-
// Optional: icon for macOS
143+
// Optional: icon for macOS, as an ICNS file
143144
macIcon.set(project.file("icons/logo.icns"))
144145
}
145-
create("winX64", Target.Windows) {
146+
register("winX64", Target.Windows) {
146147
architecture.set(Target.Architecture.X86_64)
147-
jdkUrl.set("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_windows_hotspot_17.0.12_7.zip")
148+
// Optional: icon for Windows, as a PNG
149+
icon.set(project.file("icons/logo.png"))
150+
jdkUrl.set("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_x64_windows_hotspot_17.0.15_6.zip")
148151
// Uncomment the next line to show a console when the game runs, to print messages.
149152
//useConsole.set(true)
150153
}

0 commit comments

Comments
 (0)