Bump to Android 31 (#1175)

gluonhq · Sep 30, 2022 · 975ef76 · 975ef76
1 parent 6b447be
commit 975ef76
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/src/main/java/com/gluonhq/substrate/util/FileDeps.java b/src/main/java/com/gluonhq/substrate/util/FileDeps.java
@@ -80,7 +80,7 @@ public final class FileDeps {
 
     private static final String ANDROID_KEY = "24333f8a63b6825ea9c5514f83c2829b004d1fee";
     private static final String[] ANDROID_SDK_PACKAGES = {
-            "platforms;android-30", "build-tools;30.0.2", "platform-tools",
+            "platforms;android-31", "build-tools;31.0.0", "platform-tools",
             "extras;android;m2repository", "extras;google;m2repository", "ndk-bundle" };
 
     private static final String ARCH_SYSROOT_URL = "https://download2.gluonhq.com/substrate/sysroot/${arch}sysroot-${version}.zip";

diff --git a/src/main/resources/native/android/android_project/app/build.gradle b/src/main/resources/native/android/android_project/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     compileOptions {
         sourceCompatibility 1.8
@@ -10,7 +10,7 @@ android {
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
     }
 
     repositories {

diff --git a/src/main/resources/native/android/android_project/app/src/main/AndroidManifest.xml b/src/main/resources/native/android/android_project/app/src/main/AndroidManifest.xml
@@ -4,13 +4,16 @@
     <uses-permission android:name="android.permission.INTERNET"/>
     <!-- PERMISSIONS -->
     <application android:label='A HelloGraal' android:icon="@mipmap/ic_launcher">
-        <activity android:name='com.gluonhq.helloandroid.MainActivity' android:configChanges="orientation|keyboardHidden">
+        <activity android:name='com.gluonhq.helloandroid.MainActivity'
+                  android:exported="true"
+                  android:configChanges="orientation|keyboardHidden">
              <intent-filter>
                 <category android:name='android.intent.category.LAUNCHER'/>
                 <action android:name='android.intent.action.MAIN'/>
              </intent-filter>
         </activity>
-        <activity android:name='com.gluonhq.helloandroid.PermissionRequestActivity'/>
+        <activity android:name='com.gluonhq.helloandroid.PermissionRequestActivity'
+                  android:exported="true"/>
     </application>
 </manifest>
 
diff --git a/src/main/resources/native/android/android_project/build.gradle b/src/main/resources/native/android/android_project/build.gradle
@@ -3,10 +3,9 @@ buildscript {
         mavenCentral()
         mavenLocal()
         google()
-        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.3.0'
     }
 }
 
@@ -15,6 +14,5 @@ allprojects {
         google()
         mavenCentral()
         mavenLocal()
-        jcenter()
     }
 }
diff --git a/src/main/resources/native/android/android_project/gradle/wrapper/gradle-wrapper.properties b/src/main/resources/native/android/android_project/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip