Pārlūkot izejas kodu

Updated build system to use compileSdkVersion 28.

Martin Felis 7 gadi atpakaļ
vecāks
revīzija
692ce8bb51

+ 4 - 4
app/build.gradle

@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 28
     buildToolsVersion "28.0.3"
     defaultConfig {
         applicationId "org.love2d.android"
         versionCode 26
         versionName "11.1"
         minSdkVersion 14
-        targetSdkVersion 26
+        targetSdkVersion 28
     }
     buildTypes {
         release {
@@ -22,9 +22,9 @@ android {
 }
 
 dependencies {
-    api 'com.android.support:multidex:1.0.1'
+    api 'androidx.multidex:multidex:2.0.0'
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'com.android.support:appcompat-v7:26.1.0'
+    api 'androidx.appcompat:appcompat:1.1.0-alpha01'
     api project(':love')
 }
 

+ 2 - 0
gradle.properties

@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true

+ 3 - 3
love/build.gradle

@@ -6,11 +6,11 @@ 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 26
+    compileSdkVersion 28
     buildToolsVersion '28.0.3'
 
     defaultConfig {
-        compileSdkVersion 26
+        compileSdkVersion 28
         buildToolsVersion "28.0.3"
         minSdkVersion 14
         externalNativeBuild {
@@ -49,7 +49,7 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api 'com.android.support:appcompat-v7:26.1.0'
+    api 'androidx.appcompat:appcompat:1.1.0-alpha01'
 }
 
 repositories {

+ 2 - 2
love/src/main/java/org/love2d/android/GameActivity.java

@@ -20,8 +20,8 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Vibrator;
-import android.support.annotation.Keep;
-import android.support.v4.app.ActivityCompat;
+import androidx.annotation.Keep;
+import androidx.core.app.ActivityCompat;
 import android.util.Log;
 import android.util.DisplayMetrics;
 import android.view.*;