Browse Source

Update target SDK to Android 12

We can't update NDK yet because it drops supports for Android Jelly Bean.
Miku AuahDark 4 years ago
parent
commit
fd966a7298
3 changed files with 10 additions and 11 deletions
  1. 2 2
      README.md
  2. 3 3
      app/build.gradle
  3. 5 6
      love/build.gradle

+ 2 - 2
README.md

@@ -41,8 +41,8 @@ Quick Start:
 Before you start, install JDK 11 or later. If you intend to build from Android Studio, skip this step as
 Android Studio bundles its own JDK 11.
 
-Install Android SDK with SDK API 30 and Android NDK 21.3.6528147, set the environment variables `ANDROID_SDK_ROOT` to your
-Android SDK location and run.
+Install Android SDK with SDK API 31 (31.0.0) and Android NDK 21.3.6528147, set the environment variables
+`ANDROID_SDK_ROOT` to your Android SDK location and run.
 
 ```
 $ ./gradlew assembleNormalRecord

+ 3 - 3
app/build.gradle

@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion '30.0.2'
+    compileSdkVersion 31
+    buildToolsVersion '31.0.0'
     ndkVersion '21.3.6528147'
     defaultConfig {
         applicationId 'org.love2d.android'
         versionCode 29
         versionName '11.3a'
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 31
     }
     buildTypes {
         release {

+ 5 - 6
love/build.gradle

@@ -6,15 +6,14 @@ android {
     // See https://code.google.com/p/android/issues/detail?id=52962
     // and http://stackoverflow.com/questions/27277433/why-does-gradle-build-my-module-in-release-mode-when-the-app-is-in-debug
     // defaultPublishConfig "debug"
-    compileSdkVersion 30
-    buildToolsVersion '30.0.2'
+    compileSdkVersion 31
+    buildToolsVersion '31.0.0'
     ndkVersion '21.3.6528147'
 
     defaultConfig {
-        compileSdkVersion 30
-        buildToolsVersion "30.0.2"
+        compileSdkVersion 31
+        buildToolsVersion '31.0.0'
         minSdkVersion 16
-        resValue 'bool', 'embed', 'false'
         externalNativeBuild {
             ndkBuild {
                 arguments "-j" + Runtime.runtime.availableProcessors()
@@ -26,7 +25,7 @@ android {
             abiFilters 'armeabi-v7a', 'arm64-v8a'
             debugSymbolLevel 'SYMBOL_TABLE'
         }
-        targetSdkVersion 30
+        targetSdkVersion 31
     }
 
     def retrieveAll3pModules = { ->