Upgrade gradle + robovm + android plugin

Author: bladecoder

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Java CI
+name: Run Gradle build on push
 
 on: [push]
 
@@ -12,5 +12,20 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
+      - name: Cache Gradle packages
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-          
       - name: Build with Gradle
-        run: ./gradlew build
+        run: ./gradlew build
+      - name: Cleanup Gradle Cache
+        # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
+        # Restoring these files from a GitHub Actions cache might cause problems for future builds.
+        run: |
+          rm -f ~/.gradle/caches/modules-2/modules-2.lock
+          rm -f ~/.gradle/caches/modules-2/gc.properties        

.github/workflows/gradle-build-push.yml

@@ -90,7 +90,7 @@ task setVersion(type: WriteProperties) {
     }
 }
 
-processResources.finalizedBy(setVersion)
+processResources.dependsOn 'setVersion'
 
 // Run `gradle pack` task to generate editor atlases
 import com.badlogic.gdx.tools.texturepacker.TexturePacker

adventure-editor/build.gradle

@@ -135,6 +135,8 @@ tasks.matching { it.name.contains("merge") && it.name.contains("JniLibFolders")
     packageTask.dependsOn 'copyAndroidNatives'
 }
 
+build.dependsOn ':core:setVersion'
+
 task run(type: Exec) {
     def path = getSdkFolder()
 

adventure-editor/src/main/resources/projectTmpl/android/build.gradle

@@ -2,42 +2,40 @@ apply plugin: 'java'
 apply plugin: 'java-library'
 
 sourceCompatibility = 1.8
-targetCompatibility=1.8
+targetCompatibility = 1.8
 
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
 dependencies {
-        api "com.badlogicgames.gdx:gdx:$gdxVersion"
-        api "com.bladecoder.engine:blade-engine:$bladeEngineVersion"
-        implementation "com.bladecoder.ink:blade-ink:$bladeInkVersion"
-        implementation "org.minimalcode:minimalcode-beans:0.5.1"
-        implementation "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
-        implementation "com.badlogicgames.gdx-controllers:gdx-controllers-core:$gdxControllersVersion"
-        
-        
-        if(project.hasProperty("spinePlugin") && project.spinePlugin.equals("true")) {
-        	println "Using Spine Plugin..."
-        	implementation "com.bladecoder.engine:blade-engine-spine-plugin:$bladeEngineVersion"
-        }
+    api "com.badlogicgames.gdx:gdx:$gdxVersion"
+    api "com.bladecoder.engine:blade-engine:$bladeEngineVersion"
+    implementation "com.bladecoder.ink:blade-ink:$bladeInkVersion"
+    implementation "org.minimalcode:minimalcode-beans:0.5.1"
+    implementation "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
+    implementation "com.badlogicgames.gdx-controllers:gdx-controllers-core:$gdxControllersVersion"
+
+
+    if (project.hasProperty("spinePlugin") && project.spinePlugin.equals("true")) {
+        println "Using Spine Plugin..."
+        implementation "com.bladecoder.engine:blade-engine-spine-plugin:$bladeEngineVersion"
+    }
 }
 
 
 task setVersion(type: WriteProperties) {
-	def props = new Properties()
-	def propFile = project.file("../assets/BladeEngine.properties");
-	props.load(new FileReader(propFile))
+    def props = new Properties()
+    def propFile = project.file("../assets/BladeEngine.properties");
+    props.load(new FileReader(propFile))
 
     props."version" = version
-	props."bladeEngineVersion" = bladeEngineVersion
-	props."gdxVersion" = gdxVersion
-	props."roboVMVersion" = roboVMVersion
-
-	setProperties(props);
-	setOutputFile(propFile);
-	
-	doLast {
-		println "Set version info in versions.properties"
-	}
-}
+    props."bladeEngineVersion" = bladeEngineVersion
+    props."gdxVersion" = gdxVersion
+    props."roboVMVersion" = roboVMVersion
+
+    setProperties(props);
+    setOutputFile(propFile);
 
-processResources.finalizedBy(setVersion)
+    doLast {
+        println "Set version info in versions.properties"
+    }
+}

adventure-editor/src/main/resources/projectTmpl/core/build.gradle

@@ -47,3 +47,4 @@ task dist(type: Jar) {
 
 dist.dependsOn classes
 dist.dependsOn ':core:jar'
+processResources.dependsOn ':core:setVersion'

adventure-editor/src/main/resources/projectTmpl/desktop/build.gradle

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

adventure-editor/src/main/resources/projectTmpl/gradle/wrapper/gradle-wrapper.properties

@@ -22,6 +22,7 @@ launchIPhoneSimulator.dependsOn build
 launchIPadSimulator.dependsOn build
 launchIOSDevice.dependsOn build
 createIPA.dependsOn build
+processResources.dependsOn ':core:setVersion'
 
 robovm {
     archs = "arm64"

adventure-editor/src/main/resources/projectTmpl/ios/build.gradle

@@ -1,6 +1,6 @@
 androidAPILevel=33
-androidGradlePluginVersion=7.2.2
+androidGradlePluginVersion=8.1.0
 bladeInkVersion=1.1.2
 libgdxVersion=1.12.0
-roboVMVersion=2.3.19
-version=4.2.0
+roboVMVersion=2.3.20
+version=4.2.1-SNAPSHOT

adventure-editor/src/main/resources/versions.properties

@@ -1,7 +1,7 @@
-version=4.2.0
+version=4.2.1-SNAPSHOT
 libgdxVersion=1.12.0
-roboVMVersion=2.3.19
+roboVMVersion=2.3.20
 androidAPILevel=33
-androidGradlePluginVersion=7.3.1
+androidGradlePluginVersion=8.1.0
 bladeInkVersion=1.1.2
 gdxControllersVersion=2.2.3

gradle.properties

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