From 79fe255e98f544044ab2d0b1f29d19c59b1b97aa Mon Sep 17 00:00:00 2001 From: mo-solnet Date: Thu, 14 Sep 2017 10:31:06 +1200 Subject: [PATCH] Make Android build with sdkTools 25 --- android/build.gradle | 18 +++++++++++++----- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 1299c2d..080bef4 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,3 @@ -apply plugin: 'com.android.library' - buildscript { repositories { mavenCentral() @@ -9,11 +7,17 @@ buildscript { url "$rootDir/node_modules/react-native/android" } } + dependencies { + classpath 'com.android.tools.build:gradle:2.2.3' + } } +apply plugin: 'com.android.library' + + android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 25 + buildToolsVersion "25.0.2" defaultConfig { minSdkVersion 16 @@ -26,9 +30,13 @@ android { } } +repositories { + mavenCentral() +} + dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:appcompat-v7:23.0.1' + compile 'com.android.support:appcompat-v7:25.3.1' compile 'com.newrelic.agent.android:android-agent:5.11.+' compile 'com.facebook.react:react-native:+' //from node_modules } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 122a0dc..4defdbf 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Wed Sep 13 16:44:10 NZST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip