From b91e9a8809a014ad0b50bc851595c6874e4505b7 Mon Sep 17 00:00:00 2001 From: Tommy Ettinger Date: Wed, 20 Nov 2024 15:05:12 -0800 Subject: [PATCH] Update to recommended Gradle 8.11.1 . --- Guide.md | 4 ++-- README.md | 4 ++-- Troubleshooting.md | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- .../generator/gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Guide.md b/Guide.md index a958a3bc..cab0c0d3 100644 --- a/Guide.md +++ b/Guide.md @@ -86,8 +86,8 @@ used to avoid vulnerable log4j versions, now that Gradle has updated and conside libGDX 1.10.0 to improve behavior on iOS, and gdx-liftoff may need to apply some changes to template code for iOS projects to work more cleanly with libGDX 1.10.0. - Android should only be checked if you've set up your computer for Android development. Since gdx-liftoff uses - Gradle 8.10.2, having an Android project present shouldn't interfere with other platforms or IDE integration, as - long as your IDE supports Gradle 8.10.2 (current Android Studio and IDEA both support it). + Gradle 8.11.1, having an Android project present shouldn't interfere with other platforms or IDE integration, as + long as your IDE supports Gradle 8.11.1 (current Android Studio and IDEA both support it). - **You must set your project's JDK to a version 17 or higher** to use Android, due to a new requirement of the Android Gradle Plugin used by Android Studio and IDEA. JDK 17 is the most versatile option right now, because it can be used with gdx-setup projects and Android projects. JDK 17 or 18 will work. You could have to diff --git a/README.md b/README.md index 7565c5de..343586b7 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,8 @@ java -jar gdx-liftoff-VERSION.jar **You must build with Java 17 or newer!** Gradle's current version, as well as current Android tools, now require your installed JDK to be version 17 or higher. Regardless of what platforms you target, Gradle 8.10 and up need a JDK with a version at least 17! You can still target other releases, as low as 8 typically, while building with any of -the JDK versions 17 and up. All stable target releases of Java from 8 to 23 work here now. We use Gradle 8.10.2 because it -works out-of-the-box with Java 23 (even though it was just released!). +the JDK versions 17 and up. All stable target releases of Java from 8 to 23 work here now. We use Gradle 8.11.1 because it +works out-of-the-box with Java 23 (even though it was only recently released!). If you have any trouble, you can try our [🐛Troubleshooting Guide🐛](Troubleshooting.md). diff --git a/Troubleshooting.md b/Troubleshooting.md index 64397592..504224ea 100644 --- a/Troubleshooting.md +++ b/Troubleshooting.md @@ -340,11 +340,11 @@ version of Liftoff also includes one of the recommended workarounds for that Gra service. It is entirely likely that the way the daemon is disabled might not work, because Gradle really likes to try to use the daemon even when it is broken. Disabling the daemon doesn't appear to have much performance impact, especially since Gradle 8.10.1 is mostly meant to fix a performance regression in Gradle 8.10, and so could be faster either with -or without the daemon. If you are encountering this, you should upgrade Gradle to 8.10.2, which fixes the bug: +or without the daemon. If you are encountering this, you should upgrade Gradle to 8.10.2 or (better) 8.11.1, either of which fixes the bug: - Open the file `gradle/wrapper/gradle-wrapper.properties` in your project. - Find where it has the version string `8.10.1` ; this is on a line that starts with `distributionUrl` . -- Change `8.10.1` to `8.10.2` . +- Change `8.10.1` to `8.11.1` . - Save and reload your Gradle project. - If you don't know how to reload your Gradle project, it is done automatically by Android Studio, so you don't need to do anything but save there. Otherwise, in IDEA: diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 94113f20..e2847c82 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/resources/generator/gradle/wrapper/gradle-wrapper.properties b/src/main/resources/generator/gradle/wrapper/gradle-wrapper.properties index 94113f20..e2847c82 100644 --- a/src/main/resources/generator/gradle/wrapper/gradle-wrapper.properties +++ b/src/main/resources/generator/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME