Merge remote-tracking branch 'rghorbani/master'

This commit is contained in:
Mikael Sand
2018-07-26 23:52:23 +03:00
+16 -6
View File
@@ -1,6 +1,14 @@
def safeExtGet(prop, fallback) {
rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
}
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
} }
dependencies { dependencies {
@@ -12,16 +20,14 @@ buildscript {
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android { android {
compileSdkVersion 23 compileSdkVersion safeExtGet('compileSdkVersion', 26)
//noinspection GradleDependency //noinspection GradleDependency
buildToolsVersion "23.0.1" buildToolsVersion safeExtGet('buildToolsVersion', '26.0.3')
defaultConfig { defaultConfig {
minSdkVersion 16 minSdkVersion safeExtGet('minSdkVersion', 16)
//noinspection OldTargetApi //noinspection OldTargetApi
targetSdkVersion 22 targetSdkVersion safeExtGet('targetSdkVersion', 26)
versionCode 1
versionName "1.0"
} }
lintOptions { lintOptions {
abortOnError false abortOnError false
@@ -35,6 +41,10 @@ repositories {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
url "$projectDir/../../../node_modules/react-native/android" url "$projectDir/../../../node_modules/react-native/android"
} }
maven {
url 'https://maven.google.com/'
name 'Google'
}
} }
dependencies { dependencies {