From ba9e1374d13b94af14cb13f66828dfdbef37a2f3 Mon Sep 17 00:00:00 2001 From: Sandro Machado Date: Thu, 25 Jan 2018 14:57:51 +0000 Subject: [PATCH 1/2] Replace `hasProperty` by `findProperty` to support the Gradle 4 --- ReactAndroid/release.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ReactAndroid/release.gradle b/ReactAndroid/release.gradle index 51e431a98e9a22..fdce9479374666 100644 --- a/ReactAndroid/release.gradle +++ b/ReactAndroid/release.gradle @@ -12,15 +12,15 @@ def isReleaseBuild() { } def getRepositoryUrl() { - return hasProperty('repositoryUrl') ? property('repositoryUrl') : 'https://oss.sonatype.org/service/local/staging/deploy/maven2/' + return findProperty('repositoryUrl') != null ? property('repositoryUrl') : 'https://oss.sonatype.org/service/local/staging/deploy/maven2/' } def getRepositoryUsername() { - return hasProperty('repositoryUsername') ? property('repositoryUsername') : '' + return findProperty('repositoryUsername') !=null ? property('repositoryUsername') : '' } def getRepositoryPassword() { - return hasProperty('repositoryPassword') ? property('repositoryPassword') : '' + return findProperty('repositoryPassword') != null ? property('repositoryPassword') : '' } def configureReactNativePom(def pom) { From cfd776f9d9ec82a48adbc6e9338b02e97c68b695 Mon Sep 17 00:00:00 2001 From: Sandro Machado Date: Thu, 25 Jan 2018 15:18:23 +0000 Subject: [PATCH 2/2] Bump all the android projects to target API 27 --- RNTester/android/app/build.gradle | 6 +++--- RNTester/android/app/src/main/AndroidManifest.xml | 2 +- ReactAndroid/build.gradle | 6 +++--- build.gradle | 3 ++- local-cli/templates/HelloWorld/android/app/build.gradle | 6 +++--- local-cli/templates/HelloWorld/android/build.gradle | 2 ++ 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/RNTester/android/app/build.gradle b/RNTester/android/app/build.gradle index 9e55d12326f023..760e3f366603f4 100644 --- a/RNTester/android/app/build.gradle +++ b/RNTester/android/app/build.gradle @@ -83,13 +83,13 @@ def enableSeparateBuildPerCPUArchitecture = false def enableProguardInReleaseBuilds = false android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 27 + buildToolsVersion "27.0.2" defaultConfig { applicationId "com.facebook.react.uiapp" minSdkVersion 16 - targetSdkVersion 23 + targetSdkVersion 27 versionCode 1 versionName "1.0" ndk { diff --git a/RNTester/android/app/src/main/AndroidManifest.xml b/RNTester/android/app/src/main/AndroidManifest.xml index 818cdd422d54e7..a8b69fdb488a12 100644 --- a/RNTester/android/app/src/main/AndroidManifest.xml +++ b/RNTester/android/app/src/main/AndroidManifest.xml @@ -18,7 +18,7 @@ + android:targetSdkVersion="27" />