Update build.gradle (#1918)

* Use rootProject if in use, or default to specific versions
* Updating Android Gradle plugin
' Using the root RN project specific Gradle configuration or fallback to default
This commit is contained in:
Kræn Hansen 2018-07-12 09:26:49 +02:00 committed by Kenneth Geisshirt
parent 7537c3a226
commit 2aa06425cb
3 changed files with 9 additions and 9 deletions

View File

@ -13,7 +13,8 @@ X.Y.Z Release notes
* [Sync] Improved performance of changeset parsing.
### Bug fixes
* [Sync] Fixed a bug in the build system which prevented OpenSSL to be linked (#1864).
* [Sync] Fixed a bug in the build system which prevented OpenSSL to be linked (#1864)
* Fixed a bug in RN Android which prevented apps to specify `minSdkVersion`, etc. (#1914).
### Internals
* Upgraded to Realm Core v5.7.1.

View File

@ -259,12 +259,11 @@ task packageReactNdkLibs(dependsOn: buildReactNdkLib, type: Copy) {
}
android {
compileSdkVersion 23
buildToolsVersion "26.0.2"
compileSdkVersion 26
defaultConfig {
minSdkVersion 16
targetSdkVersion 23
targetSdkVersion 26
}
sourceSets.main {

View File

@ -3,7 +3,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.3.1'
classpath 'com.android.tools.build:gradle:2.3.3'
}
}
@ -40,12 +40,12 @@ task forwardDebugPort(type: Exec) {
}
android {
compileSdkVersion 23
buildToolsVersion "26.0.2"
compileSdkVersion rootProject.hasProperty("compileSdkVersion") ? rootProject.compileSdkVersion : 26
buildToolsVersion rootProject.hasProperty("buildToolsVersion") ? rootProject.buildToolsVersion : "26.0.2"
defaultConfig {
minSdkVersion 16
targetSdkVersion 22
minSdkVersion rootProject.hasProperty("minSdkVersion") ? rootProject.minSdkVersion : 16
targetSdkVersion rootProject.hasProperty("targetSdkVersion") ? rootProject.targetSdkVersion : 26
}
tasks.withType(JavaCompile) {