mirror of
https://github.com/status-im/react-native.git
synced 2025-01-12 18:44:25 +00:00
Revert bump to API 26 and fix Android tests failures
Summary:
This reverts a3931e9531
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
This commit is contained in:
parent
8bfe78c723
commit
3e0ebc7663
@ -328,10 +328,8 @@ jobs:
|
||||
- run: *setup-artifacts
|
||||
|
||||
- restore-cache: *restore-yarn-cache
|
||||
- restore-cache: *restore-node-modules
|
||||
- run: *yarn
|
||||
- save-cache: *save-yarn-cache
|
||||
- save-cache: *save-node-modules
|
||||
|
||||
# Basic checks against the checkout, cache...
|
||||
- run: *run-sanity-checks
|
||||
@ -459,10 +457,8 @@ jobs:
|
||||
- save-cache: *save-cache-gradle-downloads
|
||||
|
||||
- restore-cache: *restore-yarn-cache
|
||||
- restore-cache: *restore-node-modules
|
||||
- run: *yarn
|
||||
- save-cache: *save-yarn-cache
|
||||
- save-cache: *save-node-modules
|
||||
|
||||
- run:
|
||||
name: Publish React Native Package
|
||||
|
@ -84,8 +84,8 @@ def enableSeparateBuildPerCPUArchitecture = false
|
||||
def enableProguardInReleaseBuilds = false
|
||||
|
||||
android {
|
||||
compileSdkVersion 26
|
||||
buildToolsVersion "26.0.3"
|
||||
compileSdkVersion 23
|
||||
buildToolsVersion "23.0.1"
|
||||
|
||||
defaultConfig {
|
||||
applicationId "com.facebook.react.uiapp"
|
||||
@ -137,7 +137,7 @@ android {
|
||||
|
||||
dependencies {
|
||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
||||
compile 'com.android.support:appcompat-v7:26.0.2'
|
||||
compile 'com.android.support:appcompat-v7:23.0.1'
|
||||
|
||||
// Build React Native from source
|
||||
compile project(':ReactAndroid')
|
||||
|
@ -242,8 +242,8 @@ task packageReactNdkLibsForBuck(dependsOn: packageReactNdkLibs, type: Copy) {
|
||||
}
|
||||
|
||||
android {
|
||||
compileSdkVersion 26
|
||||
buildToolsVersion "26.0.3"
|
||||
compileSdkVersion 23
|
||||
buildToolsVersion "23.0.1"
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion 16
|
||||
@ -292,7 +292,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.0.2'
|
||||
compile 'com.android.support:appcompat-v7:23.0.1'
|
||||
compile 'com.facebook.fbui.textlayoutbuilder:textlayoutbuilder:1.0.0'
|
||||
compile 'com.facebook.fresco:fresco:1.9.0'
|
||||
compile 'com.facebook.fresco:imagepipeline-okhttp3:1.9.0'
|
||||
|
@ -94,8 +94,8 @@ def enableSeparateBuildPerCPUArchitecture = false
|
||||
def enableProguardInReleaseBuilds = false
|
||||
|
||||
android {
|
||||
compileSdkVersion 26
|
||||
buildToolsVersion "26.0.3"
|
||||
compileSdkVersion 23
|
||||
buildToolsVersion "23.0.1"
|
||||
|
||||
defaultConfig {
|
||||
applicationId "com.helloworld"
|
||||
@ -138,7 +138,7 @@ android {
|
||||
|
||||
dependencies {
|
||||
compile fileTree(dir: "libs", include: ["*.jar"])
|
||||
compile "com.android.support:appcompat-v7:26.0.2"
|
||||
compile "com.android.support:appcompat-v7:23.0.1"
|
||||
compile "com.facebook.react:react-native:+" // From node_modules
|
||||
}
|
||||
|
||||
|
@ -3,10 +3,6 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
jcenter()
|
||||
maven {
|
||||
url 'https://maven.google.com/'
|
||||
name 'Google'
|
||||
}
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:2.2.3'
|
||||
@ -20,10 +16,6 @@ allprojects {
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
maven {
|
||||
url 'https://maven.google.com/'
|
||||
name 'Google'
|
||||
}
|
||||
maven {
|
||||
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
|
||||
url "$rootDir/../node_modules/react-native/android"
|
||||
|
@ -4,9 +4,9 @@
|
||||
|
||||
## ANDROID ##
|
||||
# Android SDK Build Tools revision
|
||||
export ANDROID_SDK_BUILD_TOOLS_REVISION=26.0.3
|
||||
export ANDROID_SDK_BUILD_TOOLS_REVISION=23.0.1
|
||||
# Android API Level we build with
|
||||
export ANDROID_SDK_BUILD_API_LEVEL="26"
|
||||
export ANDROID_SDK_BUILD_API_LEVEL="23"
|
||||
# Google APIs for Android level
|
||||
export ANDROID_GOOGLE_API_LEVEL="23"
|
||||
# Minimum Android API Level we target
|
||||
|
Loading…
x
Reference in New Issue
Block a user