Skip to content

Commit eca91ec

Browse files
committed
RN 0.59 upgrade
1 parent f0d3b4d commit eca91ec

File tree

15 files changed

+161
-113
lines changed

15 files changed

+161
-113
lines changed

package.json

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,18 @@
3939
},
4040
"devDependencies": {
4141
"@types/react-native": ">= 0.52.2",
42-
"babel-jest": "23.6.0",
43-
"detox": "^9.0.0",
44-
"jest": "23.6.0",
45-
"metro-react-native-babel-preset": "0.47.1",
42+
"detox": "^12.0.0",
4643
"mocha": "^5.0.5",
47-
"react": "16.6.0-alpha.8af6728",
48-
"react-native": "0.57.4",
49-
"react-test-renderer": "16.5.0"
44+
"react": "16.8.3",
45+
"react-native": "0.59.3",
46+
"@babel/core": "^7.4.0",
47+
"@babel/runtime": "^7.4.2",
48+
"@react-native-community/eslint-config": "^0.0.3",
49+
"babel-jest": "^24.5.0",
50+
"eslint": "^5.16.0",
51+
"jest": "^24.5.0",
52+
"metro-react-native-babel-preset": "^0.53.1",
53+
"react-test-renderer": "16.8.3"
5054
},
5155
"typings": "typings/react-native-interactable.d.ts",
5256
"babel": {
File renamed without changes.

playground/.flowconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
[libs]
2525
node_modules/react-native/Libraries/react-native/react-native-interface.js
2626
node_modules/react-native/flow/
27-
node_modules/react-native/flow-github/
2827

2928
[options]
3029
emoji=true
@@ -68,4 +67,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
6867
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
6968

7069
[version]
71-
^0.78.0
70+
^0.92.0

playground/android/app/BUCK

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,13 @@
88
# - `buck install -r android/app` - compile, install and run application
99
#
1010

11+
load(":build_defs.bzl", "create_aar_targets", "create_jar_targets")
12+
1113
lib_deps = []
1214

13-
for jarfile in glob(['libs/*.jar']):
14-
name = 'jars__' + jarfile[jarfile.rindex('/') + 1: jarfile.rindex('.jar')]
15-
lib_deps.append(':' + name)
16-
prebuilt_jar(
17-
name = name,
18-
binary_jar = jarfile,
19-
)
15+
create_aar_targets(glob(["libs/*.aar"]))
2016

21-
for aarfile in glob(['libs/*.aar']):
22-
name = 'aars__' + aarfile[aarfile.rindex('/') + 1: aarfile.rindex('.aar')]
23-
lib_deps.append(':' + name)
24-
android_prebuilt_aar(
25-
name = name,
26-
aar = aarfile,
27-
)
17+
create_jar_targets(glob(["libs/*.jar"]))
2818

2919
android_library(
3020
name = "all-libs",

playground/android/app/build.gradle

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,18 @@ def enableProguardInReleaseBuilds = false
9696

9797
android {
9898
compileSdkVersion rootProject.ext.compileSdkVersion
99-
buildToolsVersion rootProject.ext.buildToolsVersion
99+
100+
compileOptions {
101+
sourceCompatibility JavaVersion.VERSION_1_8
102+
targetCompatibility JavaVersion.VERSION_1_8
103+
}
100104

101105
defaultConfig {
102106
applicationId "com.playground"
103107
minSdkVersion rootProject.ext.minSdkVersion
104108
targetSdkVersion rootProject.ext.targetSdkVersion
105109
versionCode 1
106110
versionName "1.0"
107-
ndk {
108-
abiFilters "armeabi-v7a", "x86"
109-
}
110111
testBuildType System.getProperty('testBuildType', 'debug')
111112

112113
missingDimensionStrategy "minReactNative", "minReactNative46" //read note
@@ -125,7 +126,7 @@ android {
125126
reset()
126127
enable enableSeparateBuildPerCPUArchitecture
127128
universalApk false // If true, also generate a universal APK
128-
include "armeabi-v7a", "x86"
129+
include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
129130
}
130131
}
131132
buildTypes {
@@ -140,7 +141,7 @@ android {
140141
variant.outputs.each { output ->
141142
// For each separate APK per architecture, set a unique version code as described here:
142143
// http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
143-
def versionCodes = ["armeabi-v7a":1, "x86":2]
144+
def versionCodes = ["armeabi-v7a":1, "x86":2, "arm64-v8a": 3, "x86_64": 4]
144145
def abi = output.getFilter(OutputFile.ABI)
145146
if (abi != null) { // null for the universal-debug, universal-release variants
146147
output.versionCodeOverride =

playground/android/app/build_defs.bzl

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
"""Helper definitions to glob .aar and .jar targets"""
2+
3+
def create_aar_targets(aarfiles):
4+
for aarfile in aarfiles:
5+
name = "aars__" + aarfile[aarfile.rindex("/") + 1:aarfile.rindex(".aar")]
6+
lib_deps.append(":" + name)
7+
android_prebuilt_aar(
8+
name = name,
9+
aar = aarfile,
10+
)
11+
12+
def create_jar_targets(jarfiles):
13+
for jarfile in jarfiles:
14+
name = "jars__" + jarfile[jarfile.rindex("/") + 1:jarfile.rindex(".jar")]
15+
lib_deps.append(":" + name)
16+
prebuilt_jar(
17+
name = name,
18+
binary_jar = jarfile,
19+
)
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools">
4+
5+
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
6+
7+
<application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
8+
</manifest>

playground/android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.playground">
2+
package="com.playground">
33

44
<uses-permission android:name="android.permission.INTERNET" />
5-
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
65

76
<application
87
android:name=".MainApplication"

playground/android/build.gradle

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
buildscript {
44
repositories {
5-
jcenter()
65
google()
6+
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.1.4'
9+
classpath 'com.android.tools.build:gradle:3.3.1'
10+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0"
1011

1112
// NOTE: Do not place your application dependencies here; they belong
1213
// in the individual module build.gradle files
@@ -16,24 +17,20 @@ buildscript {
1617
allprojects {
1718
repositories {
1819
mavenLocal()
20+
google()
1921
jcenter()
2022
maven {
2123
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
2224
url "$rootDir/../../node_modules/react-native/android"
2325
}
24-
google()
2526
}
2627
}
2728

2829
ext {
29-
buildToolsVersion = "27.0.3"
30+
buildToolsVersion = "28.0.3"
3031
minSdkVersion = 18
31-
compileSdkVersion = 27
32-
targetSdkVersion = 26
33-
supportLibVersion = "27.1.1"
34-
}
35-
36-
task wrapper(type: Wrapper) {
37-
gradleVersion = '4.4'
38-
distributionUrl = distributionUrl.replace("bin", "all")
32+
compileSdkVersion = 28
33+
targetSdkVersion = 28
34+
supportLibVersion = "28.0.0"
35+
kotlinVersion = '1.3.0'
3936
}

playground/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https://services.gradle.org/distributions/gradle-4.4-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

0 commit comments

Comments
 (0)