Update Android API level to 33 (#316)

* Update Android API level to 33

* Move to non deprecated version of upload artifact Github action

* Move CI to java 11

* Fix name collision for CI

* Resolve jar name collision for CI

Author: joshuaskelly

.github/workflows/android.yml

@@ -17,10 +17,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Set up JDK 8
+    - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        java-version: '8'
+        java-version: '11'
         distribution: 'adopt'
 
     - name: Grant execute permission for gradlew
@@ -33,13 +33,13 @@ jobs:
       run: ./gradlew DungeoneerAndroid:assembleRelease
 
     - name: Bundle Debug Apk
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
-        name: apks
+        name: debug-apk
         path: DungeoneerAndroid/build/outputs/apk/debug/DungeoneerAndroid-debug.apk
 
     - name: Bundle Release Apk
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
-        name: apks
+        name: release-apk
         path: DungeoneerAndroid/build/outputs/apk/release/DungeoneerAndroid-release-unsigned.apk

.github/workflows/gradle.yml

@@ -6,7 +6,7 @@ name: Build Delver Engine
 on:
   push:
     branches: [ master ]
-    
+
   pull_request:
     branches: [ master ]
 
@@ -16,30 +16,30 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    
-    - name: Set up JDK 8
+
+    - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        java-version: '8'
+        java-version: '11'
         distribution: 'adopt'
-        
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
-      
+
     - name: Build DungeoneerDesktop
       run: ./gradlew DungeoneerDesktop:dist
-      
+
     - name: Build DelvEdit
       run: ./gradlew DelvEdit:dist
 
     - name: Bundle Game Jar
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
-        name: jars
+        name: game-jar
         path: DungeoneerDesktop/build/libs/game.jar
 
     - name: Bundle Editor Jar
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
-        name: jars
+        name: editor-jar
         path: DelvEdit/build/libs/editor.jar

DungeoneerAndroid/AndroidManifest.xml

@@ -13,6 +13,7 @@
             android:name="com.interrupt.dungeoneer.DungeoneerAndroidActivity"
             android:label="@string/app_name" 
             android:screenOrientation="landscape"
+            android:exported="true"
             android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenSize|screenLayout">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

DungeoneerAndroid/build.gradle

@@ -1,6 +1,6 @@
 android {
-    buildToolsVersion "31.0.0"
-    compileSdkVersion 31
+    buildToolsVersion "33.0.0"
+    compileSdkVersion 33
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
@@ -18,7 +18,7 @@ android {
     defaultConfig {
         applicationId "com.interrupt.dungeoneer"
         minSdkVersion 16
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 40
         versionName "1.05"
     }

build.gradle

@@ -4,7 +4,6 @@ buildscript {
         mavenCentral()
         maven { url "https://plugins.gradle.org/m2/" }
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
-        jcenter()
         google()
     }
     dependencies {
@@ -19,7 +18,7 @@ allprojects {
     version = '1.4.0'
     ext {
         appName = "delver"
-        gdxVersion = '1.11.1-SNAPSHOT'
+        gdxVersion = '1.12.1'
         gdxControllersVersion = '2.2.2'
         jamepadVersion = '2.0.14.2'
         roboVMVersion = '2.3.9'
@@ -73,7 +72,7 @@ project(":DungeoneerAndroid") {
     configurations { natives }
 
     dependencies {
-        implementation("com.badlogicgames.gdx:gdx-backend-android:1.11.0!!")
+        implementation("com.badlogicgames.gdx:gdx-backend-android:$gdxVersion")
 
         implementation project(":Dungeoneer")
         api "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"

gradle/wrapper/gradle-wrapper.properties

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