status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

use android build-tools 26.0.2 and set compileSdk to 26 (#19662) 

Summary:
Android Target API Level 26 will be required starting from August 2018, it's so soon 😄.Read https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html

This PR uses android build tools 26.0.2, support library 26.1.0 (with android lifecycle) and setting compileSdkVersion to 26, but leaving minSdkVersion and targetSdkVersion intact, which will make targeting 26 easy.

Circle CI: https://circleci.com/gh/dulmandakh/react-native/209

Everything will build and work just fine.

[ANDROID] [ENHANCEMENT] [TOOLS] - Use android build-tools 26.0.2 and set compileSdk to 26, and use support library version 26.1.0.
Closes https://github.com/facebook/react-native/pull/19662

Differential Revision: D8398855

Pulled By: hramos

fbshipit-source-id: a4066eb04cb5f947efe1f3202b638c1092b79aae
This commit is contained in:
Dulmandakh 2018-06-13 10:25:54 -07:00 committed by Facebook Github Bot
parent 4f0b9e2554
commit 065c5b6590
11 changed files with 120 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.buckconfig
View File

@ -1,12 +1,13 @@
[android] [android]
target = Google Inc.:Google APIs:23 target = android-26
[download] [download]
max_number_of_retries = 3 max_number_of_retries = 3
[maven_repositories] [maven_repositories]
central = https://repo1.maven.org/maven2 central = https://repo1.maven.org/maven2
google = https://maven.google.com
[alias] [alias]
rntester = //RNTester/android/app:app rntester = //RNTester/android/app:app

6
RNTester/android/app/build.gradle
View File

@ -84,8 +84,8 @@ def enableSeparateBuildPerCPUArchitecture = false
def enableProguardInReleaseBuilds = false def enableProguardInReleaseBuilds = false
android { android {
compileSdkVersion 23 compileSdkVersion 26
buildToolsVersion "23.0.1" buildToolsVersion "26.0.2"
defaultConfig { defaultConfig {
applicationId "com.facebook.react.uiapp" applicationId "com.facebook.react.uiapp"
@ -137,7 +137,7 @@ android {
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.0.1' compile 'com.android.support:appcompat-v7:26.1.0'
// Build React Native from source // Build React Native from source
compile project(':ReactAndroid') compile project(':ReactAndroid')

6
ReactAndroid/build.gradle
View File

@ -245,8 +245,8 @@ task packageReactNdkLibsForBuck(dependsOn: packageReactNdkLibs, type: Copy) {
} }
android { android {
compileSdkVersion 23 compileSdkVersion 26
buildToolsVersion "23.0.1" buildToolsVersion "26.0.2"
defaultConfig { defaultConfig {
minSdkVersion 16 minSdkVersion 16
@ -295,7 +295,7 @@ android {
dependencies { dependencies {
compile fileTree(dir: 'src/main/third-party/java/infer-annotations/', include: ['*.jar']) compile fileTree(dir: 'src/main/third-party/java/infer-annotations/', include: ['*.jar'])
compile 'javax.inject:javax.inject:1' compile 'javax.inject:javax.inject:1'
compile 'com.android.support:appcompat-v7:23.0.1' compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.facebook.fbui.textlayoutbuilder:textlayoutbuilder:1.0.0' compile 'com.facebook.fbui.textlayoutbuilder:textlayoutbuilder:1.0.0'
compile 'com.facebook.fresco:fresco:1.9.0' compile 'com.facebook.fresco:fresco:1.9.0'
compile 'com.facebook.fresco:imagepipeline-okhttp3:1.9.0' compile 'com.facebook.fresco:imagepipeline-okhttp3:1.9.0'

4
ReactAndroid/libs/BUCK
View File

@ -6,8 +6,8 @@ android_prebuilt_aar(
remote_file( remote_file(
name = "appcompat-binary-aar", name = "appcompat-binary-aar",
sha1 = "7d659f671541394a8bc2b9f909950aa2a5ec87ff", sha1 = "da5771a9ac6e8f3a461360eed3c6f921dc7580fd",
url = "mvn:com.android.support:appcompat-v7:aar:23.0.1", url = "mvn:com.android.support:appcompat-v7:aar:26.1.0",
) )
android_prebuilt_aar( android_prebuilt_aar(

4
ReactAndroid/src/main/third-party/android/support-annotations/BUCK vendored
View File

@ -6,6 +6,6 @@ prebuilt_jar(
remote_file( remote_file(
name = "support-annotations-binary-aar", name = "support-annotations-binary-aar",
sha1 = "1fce89a6428c51467090d7f424e4c9c3dbd55f7e", sha1 = "0814258103cf26a15fcc26ecce35f5b7d24b73f8",
url = "mvn:com.android.support:support-annotations:jar:23.0.1", url = "mvn:com.android.support:support-annotations:jar:26.1.0",
) )

103
ReactAndroid/src/main/third-party/android/support/v4/BUCK vendored
View File

@ -1,11 +1,102 @@
android_prebuilt_aar( android_library(
name = "lib-support-v4", name = "lib-support-v4",
aar = ":lib-support-v4-binary-aar", exported_deps = [
":lib-support-v4-support-compat",
":lib-support-v4-support-core-utils",
":lib-support-v4-support-core-ui",
":lib-support-v4-support-media-compat",
":lib-support-v4-support-fragment",
":android-lifecycle-runtime",
":android-lifecycle-common.jar",
":android-lifecycle-core.jar"
],
visibility = ["PUBLIC"], visibility = ["PUBLIC"],
) )
remote_file( prebuilt_jar(
name = "lib-support-v4-binary-aar", name = "android-lifecycle-common.jar",
sha1 = "9e8da0e4ecf9f63258c7fbd273889252cba2d0c3", binary_jar = ":android-lifecycle-common-jar"
url = "mvn:com.android.support:support-v4:aar:23.0.1",
) )
prebuilt_jar(
name = "android-lifecycle-core.jar",
binary_jar = ":android-lifecycle-core-jar"
)
android_prebuilt_aar(
name = "android-lifecycle-runtime",
aar = ":android-lifecycle-runtime-aar",
)
android_prebuilt_aar(
name = "lib-support-v4-support-compat",
aar = ":lib-support-v4-support-compat-aar",
)
android_prebuilt_aar(
name = "lib-support-v4-support-core-utils",
aar = ":lib-support-v4-support-core-utils-aar",
)
android_prebuilt_aar(
name = "lib-support-v4-support-core-ui",
aar = ":lib-support-v4-support-core-ui-aar",
)
android_prebuilt_aar(
name = "lib-support-v4-support-media-compat",
aar = ":lib-support-v4-support-media-compat-aar",
)
android_prebuilt_aar(
name = "lib-support-v4-support-fragment",
aar = ":lib-support-v4-support-fragment-aar",
)
remote_file(
name = "android-lifecycle-runtime-aar",
sha1 = "30c60a8a357ee1321ffd0c9f08ef54b24045cd10",
url = "mvn:android.arch.lifecycle:runtime:aar:1.0.0"
)
remote_file(
name = "android-lifecycle-common-jar",
sha1 = "e414a4cb28434e25c4f6aa71426eb20cf4874ae9",
url = "mvn:android.arch.lifecycle:common:jar:1.0.0"
)
remote_file(
name = "android-lifecycle-core-jar",
sha1 = "a2d487452376193fc8c103dd2b9bd5f2b1b44563",
url = "mvn:android.arch.core:common:jar:1.0.0"
)
remote_file(
name = "lib-support-v4-support-compat-aar",
sha1 = "1e1c8ffc01d277d8f01dfd11d5d2ce3a2af4b98c",
url = "mvn:com.android.support:support-compat:aar:26.1.0",
)
remote_file(
name = "lib-support-v4-support-core-utils-aar",
sha1 = "1bfaae21c4d5c5532c5e732071e9ce234cd58cff",
url = "mvn:com.android.support:support-core-utils:aar:26.1.0",
)
remote_file(
name = "lib-support-v4-support-core-ui-aar",
sha1 = "e306308d54052a1ded7bf9c2f5c2fdf5152a1f22",
url = "mvn:com.android.support:support-core-ui:aar:26.1.0",
)
remote_file(
name = "lib-support-v4-support-media-compat-aar",
sha1 = "09fb587f27cde19aa8f2e50c5c9ee645d9aec44d",
url = "mvn:com.android.support:support-media-compat:aar:26.1.0",
)
remote_file(
name = "lib-support-v4-support-fragment-aar",
sha1 = "ddacf369bb98dd6558606558de8ddcd53895cf91",
url = "mvn:com.android.support:support-fragment:aar:26.1.0",
)

4
ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK vendored
View File

@ -56,6 +56,6 @@ python_binary(
remote_file( remote_file(
name = "appcompat-binary-aar", name = "appcompat-binary-aar",
sha1 = "7d659f671541394a8bc2b9f909950aa2a5ec87ff", sha1 = "da5771a9ac6e8f3a461360eed3c6f921dc7580fd",
url = "mvn:com.android.support:appcompat-v7:aar:23.0.1", url = "mvn:com.android.support:appcompat-v7:aar:26.1.0",
) )

4
local-cli/link/__fixtures__/android/build.gradle
View File

@ -1,5 +1,5 @@
dependencies { dependencies {
compile fileTree(dir: "libs", include: ["*.jar"]) compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:appcompat-v7:23.0.1" compile "com.android.support:appcompat-v7:26.1.0"
compile "com.facebook.react:react-native:0.18.+" compile "com.facebook.react:react-native:+"
} }

4
local-cli/link/__fixtures__/android/patchedBuild.gradle
View File

@ -4,6 +4,6 @@ dependencies {
exclude(group: 'org.unwanted', module: 'test10') exclude(group: 'org.unwanted', module: 'test10')
} }
compile fileTree(dir: "libs", include: ["*.jar"]) compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:appcompat-v7:23.0.1" compile "com.android.support:appcompat-v7:26.1.0"
compile "com.facebook.react:react-native:0.18.+" compile "com.facebook.react:react-native:+"
} }

6
local-cli/templates/HelloWorld/android/app/build.gradle
View File

@ -94,8 +94,8 @@ def enableSeparateBuildPerCPUArchitecture = false
def enableProguardInReleaseBuilds = false def enableProguardInReleaseBuilds = false
android { android {
compileSdkVersion 23 compileSdkVersion 26
buildToolsVersion "23.0.1" buildToolsVersion "26.0.2"
defaultConfig { defaultConfig {
applicationId "com.helloworld" applicationId "com.helloworld"
@ -138,7 +138,7 @@ android {
dependencies { dependencies {
compile fileTree(dir: "libs", include: ["*.jar"]) compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:appcompat-v7:23.0.1" compile "com.android.support:appcompat-v7:26.1.0"
compile "com.facebook.react:react-native:+" // From node_modules compile "com.facebook.react:react-native:+" // From node_modules
} }

4
scripts/.tests.env
View File

@ -4,9 +4,9 @@
## ANDROID ## ## ANDROID ##
# Android SDK Build Tools revision # Android SDK Build Tools revision
export ANDROID_SDK_BUILD_TOOLS_REVISION=23.0.1 export ANDROID_SDK_BUILD_TOOLS_REVISION=26.0.2
# Android API Level we build with # Android API Level we build with
export ANDROID_SDK_BUILD_API_LEVEL="23" export ANDROID_SDK_BUILD_API_LEVEL="26"
# Google APIs for Android level # Google APIs for Android level
export ANDROID_GOOGLE_API_LEVEL="23" export ANDROID_GOOGLE_API_LEVEL="23"
# Minimum Android API Level we target # Minimum Android API Level we target