|
@@ -7,7 +7,7 @@ buildscript {
|
7
|
7
|
maven { url 'https://maven.google.com' }
|
8
|
8
|
}
|
9
|
9
|
dependencies {
|
10
|
|
- classpath 'com.android.tools.build:gradle:3.0.0-beta6'
|
|
10
|
+ classpath 'com.android.tools.build:gradle:3.0.0-beta7'
|
11
|
11
|
|
12
|
12
|
// NOTE: Do not place your application dependencies here; they belong
|
13
|
13
|
// in the individual module build.gradle files.
|
|
@@ -58,7 +58,9 @@ allprojects {
|
58
|
58
|
|
59
|
59
|
project.android {
|
60
|
60
|
compileSdkVersion rootProject.ext.compileSdkVersion
|
61
|
|
- buildToolsVersion rootProject.ext.buildToolsVersion
|
|
61
|
+ if (rootProject.ext.has('buildToolsVersion')) {
|
|
62
|
+ buildToolsVersion rootProject.ext.buildToolsVersion
|
|
63
|
+ }
|
62
|
64
|
defaultConfig {
|
63
|
65
|
minSdkVersion rootProject.ext.minSdkVersion
|
64
|
66
|
targetSdkVersion rootProject.ext.targetSdkVersion
|
|
@@ -129,7 +131,6 @@ allprojects {
|
129
|
131
|
|
130
|
132
|
ext {
|
131
|
133
|
compileSdkVersion = 25
|
132
|
|
- buildToolsVersion = "25.0.3"
|
133
|
134
|
minSdkVersion = 16
|
134
|
135
|
targetSdkVersion = 25
|
135
|
136
|
|
|
@@ -145,8 +146,9 @@ ext {
|
145
|
146
|
// modules that we utilize such as react-native-background-timer.
|
146
|
147
|
subprojects { subproject ->
|
147
|
148
|
afterEvaluate{
|
148
|
|
- if (subproject.plugins.hasPlugin('android')
|
149
|
|
- || subproject.plugins.hasPlugin('android-library')) {
|
|
149
|
+ if ((subproject.plugins.hasPlugin('android')
|
|
150
|
+ || subproject.plugins.hasPlugin('android-library'))
|
|
151
|
+ && rootProject.ext.has('buildToolsVersion')) {
|
150
|
152
|
android {
|
151
|
153
|
buildToolsVersion rootProject.ext.buildToolsVersion
|
152
|
154
|
}
|