瀏覽代碼

Updated buildToolsVersion to 28.0.3 and Android Gradle Plugin to 3.2.1

Martin Felis 7 年之前
父節點
當前提交
973f9eef89

+ 9 - 5
app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 22
-    buildToolsVersion "26.0.2"
+    buildToolsVersion "28.0.3"
     defaultConfig {
         applicationId "org.love2d.android"
         versionCode 26
@@ -22,8 +22,12 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:multidex:1.0.1'
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:22.2.0'
-    compile project(':love')
+    api 'com.android.support:multidex:1.0.1'
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    api 'com.android.support:appcompat-v7:22.2.0'
+    api project(':love')
 }
+
+repositories {
+    google()
+}

+ 1 - 1
build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

+ 2 - 2
gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Dec 26 11:41:12 CET 2017
+#Sun Nov 18 11:20:03 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

+ 8 - 4
love/build.gradle

@@ -7,11 +7,11 @@ android {
     // and http://stackoverflow.com/questions/27277433/why-does-gradle-build-my-module-in-release-mode-when-the-app-is-in-debug
     // defaultPublishConfig "debug"
     compileSdkVersion 22
-    buildToolsVersion "26.0.2"
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         compileSdkVersion 22
-        buildToolsVersion "26.0.2"
+        buildToolsVersion "28.0.3"
         minSdkVersion 14
         externalNativeBuild {
             ndkBuild {
@@ -48,6 +48,10 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:22.2.0'
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    api 'com.android.support:appcompat-v7:22.2.0'
+}
+
+repositories {
+    google()
 }

+ 2 - 1
love/src/jni/SDL2-2.0.7/android-project/build.gradle

@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files