Skip to content

Commit 78321ff

Browse files
author
williamdeng
committed
065c5b6|Facebook Github Bot|use android build-tools 26.0.2 and set compileSdk to 26 (facebook#19662)
1 parent 218d243 commit 78321ff

File tree

12 files changed

+116
-34
lines changed

12 files changed

+116
-34
lines changed

‎.buckconfig‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11

22
[android]
3-
target = Google Inc.:Google APIs:23
3+
target = android-26
44

55
[download]
66
max_number_of_retries = 3
77

88
[maven_repositories]
99
central = https://repo1.maven.org/maven2
10+
google = https://maven.google.com
1011

1112
[alias]
1213
rntester = //RNTester/android/app:app

‎RNTester/android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def enableProguardInReleaseBuilds = false
8484

8585
android {
8686
compileSdkVersion 26
87-
buildToolsVersion "26.0.3"
87+
buildToolsVersion "26.0.2"
8888

8989
defaultConfig {
9090
applicationId "com.facebook.react.uiapp"
@@ -136,7 +136,7 @@ android {
136136

137137
dependencies {
138138
compile fileTree(dir: 'libs', include: ['*.jar'])
139-
compile 'com.android.support:appcompat-v7:26.0.2'
139+
compile 'com.android.support:appcompat-v7:26.1.0'
140140

141141
// Build React Native from source
142142
compile project(':ReactAndroid')

‎ReactAndroid/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ task packageReactNdkLibsForBuck(dependsOn: packageReactNdkLibs, type: Copy) {
232232

233233
android {
234234
compileSdkVersion 26
235-
buildToolsVersion "26.0.3"
235+
buildToolsVersion "26.0.2"
236236

237237
defaultConfig {
238238
minSdkVersion 16
@@ -279,7 +279,7 @@ android {
279279
dependencies {
280280
compile fileTree(dir: 'src/main/third-party/java/infer-annotations/', include: ['*.jar'])
281281
compile 'javax.inject:javax.inject:1'
282-
compile 'com.android.support:appcompat-v7:26.0.2'
282+
compile 'com.android.support:appcompat-v7:26.1.0'
283283
compile 'com.facebook.fbui.textlayoutbuilder:textlayoutbuilder:1.0.0'
284284
compile 'com.facebook.fresco:fresco:1.3.0'
285285
compile 'com.facebook.fresco:imagepipeline-okhttp3:1.3.0'

‎ReactAndroid/libs/BUCK‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android_prebuilt_aar(
88

99
remote_file(
1010
name = "appcompat-binary-aar",
11-
sha1 = "7d659f671541394a8bc2b9f909950aa2a5ec87ff",
12-
url = "mvn:com.android.support:appcompat-v7:aar:23.0.1",
11+
sha1 = "da5771a9ac6e8f3a461360eed3c6f921dc7580fd",
12+
url = "mvn:com.android.support:appcompat-v7:aar:26.1.0",
1313
)
1414

1515
android_prebuilt_aar(

‎ReactAndroid/src/main/third-party/android/support-annotations/BUCK‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ prebuilt_jar(
88

99
remote_file(
1010
name = "support-annotations-binary-aar",
11-
sha1 = "1fce89a6428c51467090d7f424e4c9c3dbd55f7e",
12-
url = "mvn:com.android.support:support-annotations:jar:23.0.1",
11+
sha1 = "0814258103cf26a15fcc26ecce35f5b7d24b73f8",
12+
url = "mvn:com.android.support:support-annotations:jar:26.1.0",
1313
)

‎ReactAndroid/src/main/third-party/android/support/v4/BUCK‎

Lines changed: 96 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,102 @@
1-
include_defs("//ReactAndroid/DEFS")
2-
3-
android_prebuilt_aar(
1+
android_library(
42
name = "lib-support-v4",
5-
aar = ":lib-support-v4-binary-aar",
3+
exported_deps = [
4+
":lib-support-v4-support-compat",
5+
":lib-support-v4-support-core-utils",
6+
":lib-support-v4-support-core-ui",
7+
":lib-support-v4-support-media-compat",
8+
":lib-support-v4-support-fragment",
9+
":android-lifecycle-runtime",
10+
":android-lifecycle-common.jar",
11+
":android-lifecycle-core.jar"
12+
],
613
visibility = ["PUBLIC"],
714
)
815

16+
prebuilt_jar(
17+
name = "android-lifecycle-common.jar",
18+
binary_jar = ":android-lifecycle-common-jar"
19+
)
20+
21+
prebuilt_jar(
22+
name = "android-lifecycle-core.jar",
23+
binary_jar = ":android-lifecycle-core-jar"
24+
)
25+
26+
android_prebuilt_aar(
27+
name = "android-lifecycle-runtime",
28+
aar = ":android-lifecycle-runtime-aar",
29+
)
30+
31+
android_prebuilt_aar(
32+
name = "lib-support-v4-support-compat",
33+
aar = ":lib-support-v4-support-compat-aar",
34+
)
35+
36+
android_prebuilt_aar(
37+
name = "lib-support-v4-support-core-utils",
38+
aar = ":lib-support-v4-support-core-utils-aar",
39+
)
40+
41+
android_prebuilt_aar(
42+
name = "lib-support-v4-support-core-ui",
43+
aar = ":lib-support-v4-support-core-ui-aar",
44+
)
45+
46+
android_prebuilt_aar(
47+
name = "lib-support-v4-support-media-compat",
48+
aar = ":lib-support-v4-support-media-compat-aar",
49+
)
50+
51+
android_prebuilt_aar(
52+
name = "lib-support-v4-support-fragment",
53+
aar = ":lib-support-v4-support-fragment-aar",
54+
)
55+
56+
remote_file(
57+
name = "android-lifecycle-runtime-aar",
58+
sha1 = "30c60a8a357ee1321ffd0c9f08ef54b24045cd10",
59+
url = "mvn:android.arch.lifecycle:runtime:aar:1.0.0"
60+
)
61+
62+
remote_file(
63+
name = "android-lifecycle-common-jar",
64+
sha1 = "e414a4cb28434e25c4f6aa71426eb20cf4874ae9",
65+
url = "mvn:android.arch.lifecycle:common:jar:1.0.0"
66+
)
67+
68+
remote_file(
69+
name = "android-lifecycle-core-jar",
70+
sha1 = "a2d487452376193fc8c103dd2b9bd5f2b1b44563",
71+
url = "mvn:android.arch.core:common:jar:1.0.0"
72+
)
73+
74+
remote_file(
75+
name = "lib-support-v4-support-compat-aar",
76+
sha1 = "1e1c8ffc01d277d8f01dfd11d5d2ce3a2af4b98c",
77+
url = "mvn:com.android.support:support-compat:aar:26.1.0",
78+
)
79+
80+
remote_file(
81+
name = "lib-support-v4-support-core-utils-aar",
82+
sha1 = "1bfaae21c4d5c5532c5e732071e9ce234cd58cff",
83+
url = "mvn:com.android.support:support-core-utils:aar:26.1.0",
84+
)
85+
86+
remote_file(
87+
name = "lib-support-v4-support-core-ui-aar",
88+
sha1 = "e306308d54052a1ded7bf9c2f5c2fdf5152a1f22",
89+
url = "mvn:com.android.support:support-core-ui:aar:26.1.0",
90+
)
91+
92+
remote_file(
93+
name = "lib-support-v4-support-media-compat-aar",
94+
sha1 = "09fb587f27cde19aa8f2e50c5c9ee645d9aec44d",
95+
url = "mvn:com.android.support:support-media-compat:aar:26.1.0",
96+
)
97+
998
remote_file(
10-
name = "lib-support-v4-binary-aar",
11-
sha1 = "9e8da0e4ecf9f63258c7fbd273889252cba2d0c3",
12-
url = "mvn:com.android.support:support-v4:aar:23.0.1",
99+
name = "lib-support-v4-support-fragment-aar",
100+
sha1 = "ddacf369bb98dd6558606558de8ddcd53895cf91",
101+
url = "mvn:com.android.support:support-fragment:aar:26.1.0",
13102
)

‎ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ python_binary(
5656

5757
remote_file(
5858
name = "appcompat-binary-aar",
59-
sha1 = "7d659f671541394a8bc2b9f909950aa2a5ec87ff",
60-
url = "mvn:com.android.support:appcompat-v7:aar:23.0.1",
59+
sha1 = "da5771a9ac6e8f3a461360eed3c6f921dc7580fd",
60+
url = "mvn:com.android.support:appcompat-v7:aar:26.1.0",
6161
)

‎local-cli/link/__fixtures__/android/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
22
compile fileTree(dir: "libs", include: ["*.jar"])
3-
compile "com.android.support:appcompat-v7:23.0.1"
4-
compile "com.facebook.react:react-native:0.18.+"
3+
compile "com.android.support:appcompat-v7:26.1.0"
4+
compile "com.facebook.react:react-native:+"
55
}

‎local-cli/link/__fixtures__/android/patchedBuild.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ dependencies {
44
exclude(group: 'org.unwanted', module: 'test10')
55
}
66
compile fileTree(dir: "libs", include: ["*.jar"])
7-
compile "com.android.support:appcompat-v7:23.0.1"
8-
compile "com.facebook.react:react-native:0.18.+"
7+
compile "com.android.support:appcompat-v7:26.1.0"
8+
compile "com.facebook.react:react-native:+"
99
}

‎local-cli/templates/HelloWorld/android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def enableProguardInReleaseBuilds = false
9595

9696
android {
9797
compileSdkVersion 26
98-
buildToolsVersion "26.0.3"
98+
buildToolsVersion "26.0.2"
9999

100100
defaultConfig {
101101
applicationId "com.helloworld"
@@ -138,7 +138,7 @@ android {
138138

139139
dependencies {
140140
compile fileTree(dir: "libs", include: ["*.jar"])
141-
compile "com.android.support:appcompat-v7:26.0.2"
141+
compile "com.android.support:appcompat-v7:26.1.0"
142142
compile "com.facebook.react:react-native:+" // From node_modules
143143
}
144144

0 commit comments

Comments
 (0)