Skip to content

Commit 3e0ebc7

Browse files
hramosfacebook-github-bot
authored andcommitted
Revert bump to API 26 and fix Android tests failures
Summary: This reverts a3931e9 The open source `test_android` job is not configured to use Android 26 quite yet. I've spent a couple of days trying to get our Android tests back in working order, with no luck. I'm reverting the change that bumped React Native to use build tools 26 + Android SDK 26. I encourage contributors interested in making this change happen to work on getting our Android tests working with API 26. This will allow us to focus on getting `test_android` back to green, and _then_ we can work on bumping to API 26 while keeping tests green. Reviewed By: fkgozali Differential Revision: D8066226 fbshipit-source-id: 9bfd58a7f081c0971b78b331073e70545c21ca6d
1 parent 8bfe78c commit 3e0ebc7

File tree

6 files changed

+11
-23
lines changed

6 files changed

+11
-23
lines changed

.circleci/config.yml

-4
Original file line numberDiff line numberDiff line change
@@ -328,10 +328,8 @@ jobs:
328328
- run: *setup-artifacts
329329

330330
- restore-cache: *restore-yarn-cache
331-
- restore-cache: *restore-node-modules
332331
- run: *yarn
333332
- save-cache: *save-yarn-cache
334-
- save-cache: *save-node-modules
335333

336334
# Basic checks against the checkout, cache...
337335
- run: *run-sanity-checks
@@ -459,10 +457,8 @@ jobs:
459457
- save-cache: *save-cache-gradle-downloads
460458

461459
- restore-cache: *restore-yarn-cache
462-
- restore-cache: *restore-node-modules
463460
- run: *yarn
464461
- save-cache: *save-yarn-cache
465-
- save-cache: *save-node-modules
466462

467463
- run:
468464
name: Publish React Native Package

RNTester/android/app/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ def enableSeparateBuildPerCPUArchitecture = false
8484
def enableProguardInReleaseBuilds = false
8585

8686
android {
87-
compileSdkVersion 26
88-
buildToolsVersion "26.0.3"
87+
compileSdkVersion 23
88+
buildToolsVersion "23.0.1"
8989

9090
defaultConfig {
9191
applicationId "com.facebook.react.uiapp"
@@ -137,7 +137,7 @@ android {
137137

138138
dependencies {
139139
compile fileTree(dir: 'libs', include: ['*.jar'])
140-
compile 'com.android.support:appcompat-v7:26.0.2'
140+
compile 'com.android.support:appcompat-v7:23.0.1'
141141

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

ReactAndroid/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,8 @@ task packageReactNdkLibsForBuck(dependsOn: packageReactNdkLibs, type: Copy) {
242242
}
243243

244244
android {
245-
compileSdkVersion 26
246-
buildToolsVersion "26.0.3"
245+
compileSdkVersion 23
246+
buildToolsVersion "23.0.1"
247247

248248
defaultConfig {
249249
minSdkVersion 16
@@ -292,7 +292,7 @@ android {
292292
dependencies {
293293
compile fileTree(dir: 'src/main/third-party/java/infer-annotations/', include: ['*.jar'])
294294
compile 'javax.inject:javax.inject:1'
295-
compile 'com.android.support:appcompat-v7:26.0.2'
295+
compile 'com.android.support:appcompat-v7:23.0.1'
296296
compile 'com.facebook.fbui.textlayoutbuilder:textlayoutbuilder:1.0.0'
297297
compile 'com.facebook.fresco:fresco:1.9.0'
298298
compile 'com.facebook.fresco:imagepipeline-okhttp3:1.9.0'

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ def enableSeparateBuildPerCPUArchitecture = false
9494
def enableProguardInReleaseBuilds = false
9595

9696
android {
97-
compileSdkVersion 26
98-
buildToolsVersion "26.0.3"
97+
compileSdkVersion 23
98+
buildToolsVersion "23.0.1"
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:23.0.1"
142142
compile "com.facebook.react:react-native:+" // From node_modules
143143
}
144144

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

-8
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
buildscript {
44
repositories {
55
jcenter()
6-
maven {
7-
url 'https://maven.google.com/'
8-
name 'Google'
9-
}
106
}
117
dependencies {
128
classpath 'com.android.tools.build:gradle:2.2.3'
@@ -20,10 +16,6 @@ allprojects {
2016
repositories {
2117
mavenLocal()
2218
jcenter()
23-
maven {
24-
url 'https://maven.google.com/'
25-
name 'Google'
26-
}
2719
maven {
2820
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
2921
url "$rootDir/../node_modules/react-native/android"

scripts/.tests.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
## ANDROID ##
66
# Android SDK Build Tools revision
7-
export ANDROID_SDK_BUILD_TOOLS_REVISION=26.0.3
7+
export ANDROID_SDK_BUILD_TOOLS_REVISION=23.0.1
88
# Android API Level we build with
9-
export ANDROID_SDK_BUILD_API_LEVEL="26"
9+
export ANDROID_SDK_BUILD_API_LEVEL="23"
1010
# Google APIs for Android level
1111
export ANDROID_GOOGLE_API_LEVEL="23"
1212
# Minimum Android API Level we target

0 commit comments

Comments
 (0)