From 973f9eef89ac8cf0309dda6c8382fc4b3a1f8bc0 Mon Sep 17 00:00:00 2001 From: Martin Felis Date: Sun, 18 Nov 2018 12:29:55 +0100 Subject: [PATCH] Updated buildToolsVersion to 28.0.3 and Android Gradle Plugin to 3.2.1 --- app/build.gradle | 14 +++++++++----- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- love/build.gradle | 12 ++++++++---- .../jni/SDL2-2.0.7/android-project/build.gradle | 3 ++- 5 files changed, 22 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f8a8e39e..334fecb3 100644 --- a/app/build.gradle +++ b/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() +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index a015c70d..386ed8cc 100644 --- a/build.gradle +++ b/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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0e24ff08..badad31d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/love/build.gradle b/love/build.gradle index ee596291..911728b4 100644 --- a/love/build.gradle +++ b/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() } diff --git a/love/src/jni/SDL2-2.0.7/android-project/build.gradle b/love/src/jni/SDL2-2.0.7/android-project/build.gradle index c2eea8e2..2cb309cb 100644 --- a/love/src/jni/SDL2-2.0.7/android-project/build.gradle +++ b/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