From b2a504879697ea5b0f6181277bc31917d63679bb Mon Sep 17 00:00:00 2001
From: Dulmandakh <dulmandakh@gmail.com>
Date: Wed, 10 Oct 2018 14:03:47 +0800
Subject: [PATCH] bump Android SDK to 28, build tools to 28.0.3

---
 .buckconfig                                         | 2 +-
 .circleci/config.yml                                | 6 +++---
 ContainerShip/Dockerfile.android-base               | 4 ++--
 RNTester/android/app/build.gradle                   | 4 ++--
 ReactAndroid/build.gradle                           | 4 ++--
 appveyor.yml                                        | 4 ++--
 local-cli/templates/HelloWorld/android/build.gradle | 4 ++--
 scripts/.tests.env                                  | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.buckconfig b/.buckconfig
index 963190d2b61a10..de7e1f2e3895c1 100644
--- a/.buckconfig
+++ b/.buckconfig
@@ -1,6 +1,6 @@
 
 [android]
-  target = android-27
+  target = android-28
 
 [download]
   max_number_of_retries = 3
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 682a6732414fe8..d2fde38e7bc51e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,11 +28,11 @@ aliases:
 
   - &restore-cache-android-packages
     keys:
-      - v1-android-sdkmanager-packages-api-27-alpha-{{ checksum "scripts/.tests.env" }}
+      - v1-android-sdkmanager-packages-api-28-alpha-{{ checksum "scripts/.tests.env" }}
   - &save-cache-android-packages
     paths:
       - /opt/android/sdk
-    key: v1-android-sdkmanager-packages-api-27-alpha-{{ checksum "scripts/.tests.env" }}
+    key: v1-android-sdkmanager-packages-api-28-alpha-{{ checksum "scripts/.tests.env" }}
 
   - &restore-cache-gradle
     keys:
@@ -337,7 +337,7 @@ js_defaults: &js_defaults
 android_defaults: &android_defaults
   <<: *defaults
   docker:
-    - image: circleci/android:api-27-node8-alpha
+    - image: circleci/android:api-28-node8-alpha
   resource_class: "large"
   environment:
     - TERM: "dumb"
diff --git a/ContainerShip/Dockerfile.android-base b/ContainerShip/Dockerfile.android-base
index 6cbc6438c75bdf..bbfd3dfd928344 100644
--- a/ContainerShip/Dockerfile.android-base
+++ b/ContainerShip/Dockerfile.android-base
@@ -18,8 +18,8 @@ LABEL maintainer="Héctor Ramos <hector@fb.com>"
 
 # set default build arguments
 ARG SDK_VERSION=sdk-tools-linux-3859397.zip
-ARG ANDROID_BUILD_VERSION=27
-ARG ANDROID_TOOLS_VERSION=27.0.3
+ARG ANDROID_BUILD_VERSION=28
+ARG ANDROID_TOOLS_VERSION=28.0.3
 ARG BUCK_VERSION=v2018.07.23.01
 ARG NDK_VERSION=17b
 ARG NODE_VERSION=8.10.0
diff --git a/RNTester/android/app/build.gradle b/RNTester/android/app/build.gradle
index 6656f6a40fedc4..01999b92378fcc 100644
--- a/RNTester/android/app/build.gradle
+++ b/RNTester/android/app/build.gradle
@@ -84,8 +84,8 @@ def enableSeparateBuildPerCPUArchitecture = true
 def enableProguardInReleaseBuilds = true
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         applicationId "com.facebook.react.uiapp"
diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
index 0fa92ba743b856..614da201040462 100644
--- a/ReactAndroid/build.gradle
+++ b/ReactAndroid/build.gradle
@@ -246,8 +246,8 @@ task packageReactNdkLibsForBuck(dependsOn: packageReactNdkLibs, type: Copy) {
 }
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         minSdkVersion 16
diff --git a/appveyor.yml b/appveyor.yml
index 61fe51b3069ac6..f3b72f74c11b37 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,8 +1,8 @@
 environment:
     ANDROID_HOME: "C:\\android-sdk-windows"
     ANDROID_NDK: "C:\\android-sdk-windows\\android-ndk-r17b"
-    ANDROID_BUILD_VERSION: 27
-    ANDROID_TOOLS_VERSION: 27.0.3
+    ANDROID_BUILD_VERSION: 28
+    ANDROID_TOOLS_VERSION: 28.0.3
 
     GRADLE_OPTS: -Dorg.gradle.daemon=false
 
diff --git a/local-cli/templates/HelloWorld/android/build.gradle b/local-cli/templates/HelloWorld/android/build.gradle
index f939d78227a997..7ff55f069923f8 100644
--- a/local-cli/templates/HelloWorld/android/build.gradle
+++ b/local-cli/templates/HelloWorld/android/build.gradle
@@ -2,9 +2,9 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "27.0.3"
+        buildToolsVersion = "28.0.3"
         minSdkVersion = 16
-        compileSdkVersion = 27
+        compileSdkVersion = 28
         targetSdkVersion = 27
         supportLibVersion = "27.1.1"
     }
diff --git a/scripts/.tests.env b/scripts/.tests.env
index 062c6ceabb6577..0b38c2ac7701c6 100644
--- a/scripts/.tests.env
+++ b/scripts/.tests.env
@@ -4,9 +4,9 @@
 
 ## ANDROID ##
 # Android SDK Build Tools revision
-export ANDROID_SDK_BUILD_TOOLS_REVISION=27.0.3
+export ANDROID_SDK_BUILD_TOOLS_REVISION=28.0.3
 # Android API Level we build with
-export ANDROID_SDK_BUILD_API_LEVEL="27"
+export ANDROID_SDK_BUILD_API_LEVEL="28"
 # Google APIs for Android level
 export ANDROID_GOOGLE_API_LEVEL="23"
 # Minimum Android API Level we target