From 874cca1ac258ec224bade999722d7a34c307def0 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Mon, 20 Aug 2018 17:56:43 -0700 Subject: [PATCH] Bump Android Support Library to 27.1.1 (#20586) Summary: This PR bumps Android Support Library version to 27.1.1. FYI, originally was a part of https://github.com/facebook/react-native/pull/20026. Pull Request resolved: https://github.com/facebook/react-native/pull/20586 Differential Revision: D9414901 Pulled By: hramos fbshipit-source-id: 580338e62a924c214accc5d944f17c81ad9e3f9f --- RNTester/android/app/build.gradle | 2 +- ReactAndroid/build.gradle | 2 +- ReactAndroid/libs/BUCK | 4 +- .../android/support-annotations/BUCK | 4 +- .../main/third-party/android/support/v4/BUCK | 44 ++++++++++++------- .../android/support/v7/appcompat-orig/BUCK | 4 +- .../link/__fixtures__/android/build.gradle | 2 +- .../__fixtures__/android/patchedBuild.gradle | 2 +- .../templates/HelloWorld/android/build.gradle | 2 +- 9 files changed, 39 insertions(+), 27 deletions(-) diff --git a/RNTester/android/app/build.gradle b/RNTester/android/app/build.gradle index 229e4c995..f69c094c1 100644 --- a/RNTester/android/app/build.gradle +++ b/RNTester/android/app/build.gradle @@ -141,7 +141,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:26.1.0' + compile 'com.android.support:appcompat-v7:27.1.1' // Build React Native from source compile project(':ReactAndroid') diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index c98c5fb63..81c74385c 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -295,7 +295,7 @@ android { dependencies { compile fileTree(dir: 'src/main/third-party/java/infer-annotations/', include: ['*.jar']) compile 'javax.inject:javax.inject:1' - compile 'com.android.support:appcompat-v7:26.1.0' + compile 'com.android.support:appcompat-v7:27.1.1' compile 'com.facebook.fbui.textlayoutbuilder:textlayoutbuilder:1.0.0' compile "com.facebook.fresco:fresco:${FRESCO_VERSION}" compile "com.facebook.fresco:imagepipeline-okhttp3:${FRESCO_VERSION}" diff --git a/ReactAndroid/libs/BUCK b/ReactAndroid/libs/BUCK index 018a73b2d..9d1886564 100644 --- a/ReactAndroid/libs/BUCK +++ b/ReactAndroid/libs/BUCK @@ -6,8 +6,8 @@ android_prebuilt_aar( remote_file( name = "appcompat-binary-aar", - sha1 = "da5771a9ac6e8f3a461360eed3c6f921dc7580fd", - url = "mvn:com.android.support:appcompat-v7:aar:26.1.0", + sha1 = "22b1ef4ff9ef1a3513c18eb132d597eac6ef1a86", + url = "mvn:com.android.support:appcompat-v7:aar:27.1.1", ) android_prebuilt_aar( diff --git a/ReactAndroid/src/main/third-party/android/support-annotations/BUCK b/ReactAndroid/src/main/third-party/android/support-annotations/BUCK index cad12896c..80a5ef65b 100644 --- a/ReactAndroid/src/main/third-party/android/support-annotations/BUCK +++ b/ReactAndroid/src/main/third-party/android/support-annotations/BUCK @@ -6,6 +6,6 @@ prebuilt_jar( remote_file( name = "support-annotations-binary.jar", - sha1 = "0814258103cf26a15fcc26ecce35f5b7d24b73f8", - url = "mvn:com.android.support:support-annotations:jar:26.1.0", + sha1 = "39ded76b5e1ce1c5b2688e1d25cdc20ecee32007", + url = "mvn:com.android.support:support-annotations:jar:27.1.1", ) diff --git a/ReactAndroid/src/main/third-party/android/support/v4/BUCK b/ReactAndroid/src/main/third-party/android/support/v4/BUCK index e816510b9..27aec407f 100644 --- a/ReactAndroid/src/main/third-party/android/support/v4/BUCK +++ b/ReactAndroid/src/main/third-party/android/support/v4/BUCK @@ -5,6 +5,7 @@ android_library( ":android-lifecycle-common", ":android-lifecycle-core", ":android-lifecycle-runtime", + ":android-lifecycle-viewmodel", ":lib-support-v4-support-compat", ":lib-support-v4-support-core-ui", ":lib-support-v4-support-core-utils", @@ -28,6 +29,11 @@ android_prebuilt_aar( aar = ":android-lifecycle-runtime-aar", ) +android_prebuilt_aar( + name = "android-lifecycle-viewmodel", + aar = ":android-lifecycle-viewmodel-aar", +) + android_prebuilt_aar( name = "lib-support-v4-support-compat", aar = ":lib-support-v4-support-compat-aar", @@ -55,48 +61,54 @@ android_prebuilt_aar( remote_file( name = "android-lifecycle-runtime-aar", - sha1 = "30c60a8a357ee1321ffd0c9f08ef54b24045cd10", - url = "mvn:android.arch.lifecycle:runtime:aar:1.0.0", + sha1 = "95428e5f6bf6875a6a1125d2157c3836a1a837f5", + url = "mvn:android.arch.lifecycle:runtime:aar:1.1.0", ) remote_file( name = "android-lifecycle-common.jar", - sha1 = "e414a4cb28434e25c4f6aa71426eb20cf4874ae9", - url = "mvn:android.arch.lifecycle:common:jar:1.0.0", + sha1 = "0edf3f7bfb84a7521d0599efa3b0113a0ee90f85", + url = "mvn:android.arch.lifecycle:common:jar:1.1.0", ) remote_file( name = "android-lifecycle-core.jar", - sha1 = "a2d487452376193fc8c103dd2b9bd5f2b1b44563", - url = "mvn:android.arch.core:common:jar:1.0.0", + sha1 = "8007981f7d7540d89cd18471b8e5dcd2b4f99167", + url = "mvn:android.arch.core:common:jar:1.1.0", +) + +remote_file( + name = "android-lifecycle-viewmodel-aar", + sha1 = "74ee369b874da61b5b81bebd7b8df0c2577309c8", + url = "mvn:android.arch.lifecycle:viewmodel:aar:1.1.0", ) remote_file( name = "lib-support-v4-support-compat-aar", - sha1 = "1e1c8ffc01d277d8f01dfd11d5d2ce3a2af4b98c", - url = "mvn:com.android.support:support-compat:aar:26.1.0", + sha1 = "a55ad550d0b84c7fec7ecca012690636062c0e64", + url = "mvn:com.android.support:support-compat:aar:27.1.1", ) remote_file( name = "lib-support-v4-support-core-utils-aar", - sha1 = "1bfaae21c4d5c5532c5e732071e9ce234cd58cff", - url = "mvn:com.android.support:support-core-utils:aar:26.1.0", + sha1 = "b3a7a4040fda0c5138dbc8c477103b6723b9dbe6", + url = "mvn:com.android.support:support-core-utils:aar:27.1.1", ) remote_file( name = "lib-support-v4-support-core-ui-aar", - sha1 = "e306308d54052a1ded7bf9c2f5c2fdf5152a1f22", - url = "mvn:com.android.support:support-core-ui:aar:26.1.0", + sha1 = "f9acdb8a4c3a9fe883fd7fa5efd3f0426bb9dcda", + url = "mvn:com.android.support:support-core-ui:aar:27.1.1", ) remote_file( name = "lib-support-v4-support-media-compat-aar", - sha1 = "09fb587f27cde19aa8f2e50c5c9ee645d9aec44d", - url = "mvn:com.android.support:support-media-compat:aar:26.1.0", + sha1 = "10e309e2cc22ff4cab30bd5f573e4bb30be707ad", + url = "mvn:com.android.support:support-media-compat:aar:27.1.1", ) remote_file( name = "lib-support-v4-support-fragment-aar", - sha1 = "ddacf369bb98dd6558606558de8ddcd53895cf91", - url = "mvn:com.android.support:support-fragment:aar:26.1.0", + sha1 = "eb8053ebf038b7561c29e5e8964664fac05f375e", + url = "mvn:com.android.support:support-fragment:aar:27.1.1", ) diff --git a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK b/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK index 386e71b13..2239c5692 100644 --- a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK +++ b/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK @@ -57,6 +57,6 @@ python_binary( remote_file( name = "appcompat-binary-aar", - sha1 = "da5771a9ac6e8f3a461360eed3c6f921dc7580fd", - url = "mvn:com.android.support:appcompat-v7:aar:26.1.0", + sha1 = "22b1ef4ff9ef1a3513c18eb132d597eac6ef1a86", + url = "mvn:com.android.support:appcompat-v7:aar:27.1.1", ) diff --git a/local-cli/link/__fixtures__/android/build.gradle b/local-cli/link/__fixtures__/android/build.gradle index 9eb0a44ae..70785a4fa 100644 --- a/local-cli/link/__fixtures__/android/build.gradle +++ b/local-cli/link/__fixtures__/android/build.gradle @@ -1,5 +1,5 @@ dependencies { compile fileTree(dir: "libs", include: ["*.jar"]) - compile "com.android.support:appcompat-v7:26.1.0" + compile "com.android.support:appcompat-v7:27.1.1" compile "com.facebook.react:react-native:+" } diff --git a/local-cli/link/__fixtures__/android/patchedBuild.gradle b/local-cli/link/__fixtures__/android/patchedBuild.gradle index f6b9a2205..8cade796a 100644 --- a/local-cli/link/__fixtures__/android/patchedBuild.gradle +++ b/local-cli/link/__fixtures__/android/patchedBuild.gradle @@ -4,6 +4,6 @@ dependencies { exclude(group: 'org.unwanted', module: 'test10') } compile fileTree(dir: "libs", include: ["*.jar"]) - compile "com.android.support:appcompat-v7:26.1.0" + compile "com.android.support:appcompat-v7:27.1.1" compile "com.facebook.react:react-native:+" } diff --git a/local-cli/templates/HelloWorld/android/build.gradle b/local-cli/templates/HelloWorld/android/build.gradle index 3ad24c190..116463797 100644 --- a/local-cli/templates/HelloWorld/android/build.gradle +++ b/local-cli/templates/HelloWorld/android/build.gradle @@ -36,7 +36,7 @@ ext { minSdkVersion = 16 compileSdkVersion = 26 targetSdkVersion = 26 - supportLibVersion = "26.1.0" + supportLibVersion = "27.1.1" } task wrapper(type: Wrapper) {