Skip to content

Commit dbea288

Browse files
committed
Full upgrade to RN 0.59.2
1 parent 5902e6b commit dbea288

27 files changed

+2633
-2017
lines changed

.babelrc

Lines changed: 0 additions & 3 deletions
This file was deleted.

.gitattributes

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,43 @@
11
*.pbxproj -text
2+
* text=auto
3+
4+
# Force the following filetypes to have unix eols, so Windows does not break them
5+
**/*.* text eol=lf
6+
7+
# Windows forced line-endings
8+
/.idea/* text eol=crlf
9+
10+
#
11+
## These files are binary and should be left untouched
12+
#
13+
14+
# (binary is a macro for -text -diff)
15+
*.png binary
16+
*.jpg binary
17+
*.jpeg binary
18+
*.gif binary
19+
*.ico binary
20+
*.mov binary
21+
*.mp4 binary
22+
*.mp3 binary
23+
*.flv binary
24+
*.fla binary
25+
*.swf binary
26+
*.gz binary
27+
*.zip binary
28+
*.7z binary
29+
*.ttf binary
30+
*.eot binary
31+
*.woff binary
32+
*.woff2 binary
33+
*.pyc binary
34+
*.pdf binary
35+
*.ez binary
36+
*.bz2 binary
37+
*.swp binary
38+
*.swp binary
39+
*.ipa binary
40+
*.apk binary
41+
*.jar binary
42+
*gradlew binary
43+
*BUCK binary

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",

android/app/build.gradle

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -94,25 +94,26 @@ def enableSeparateBuildPerCPUArchitecture = false
9494
def enableProguardInReleaseBuilds = false
9595

9696
android {
97-
compileSdkVersion 26
98-
buildToolsVersion "26.0.1"
97+
compileSdkVersion rootProject.ext.compileSdkVersion
98+
99+
compileOptions {
100+
sourceCompatibility JavaVersion.VERSION_1_8
101+
targetCompatibility JavaVersion.VERSION_1_8
102+
}
99103

100104
defaultConfig {
101105
applicationId "com.boilerplate"
102-
minSdkVersion 16
103-
targetSdkVersion 22
106+
minSdkVersion rootProject.ext.minSdkVersion
107+
targetSdkVersion rootProject.ext.targetSdkVersion
104108
versionCode 1
105109
versionName "1.0"
106-
ndk {
107-
abiFilters "armeabi-v7a", "x86"
108-
}
109110
}
110111
splits {
111112
abi {
112113
reset()
113114
enable enableSeparateBuildPerCPUArchitecture
114115
universalApk false // If true, also generate a universal APK
115-
include "armeabi-v7a", "x86"
116+
include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
116117
}
117118
}
118119
buildTypes {
@@ -126,7 +127,7 @@ android {
126127
variant.outputs.each { output ->
127128
// For each separate APK per architecture, set a unique version code as described here:
128129
// http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
129-
def versionCodes = ["armeabi-v7a":1, "x86":2]
130+
def versionCodes = ["armeabi-v7a":1, "x86":2, "arm64-v8a": 3, "x86_64": 4]
130131
def abi = output.getFilter(OutputFile.ABI)
131132
if (abi != null) { // null for the universal-debug, universal-release variants
132133
output.versionCodeOverride =
@@ -137,10 +138,9 @@ android {
137138
}
138139

139140
dependencies {
140-
compile project(':react-native-gesture-handler')
141-
compile fileTree(dir: "libs", include: ["*.jar"])
142-
compile "com.android.support:appcompat-v7:26.0.1"
143-
compile "com.facebook.react:react-native:+" // From node_modules
141+
implementation fileTree(dir: "libs", include: ["*.jar"])
142+
implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
143+
implementation "com.facebook.react:react-native:+" // From node_modules
144144
}
145145

146146
// Run this once to be able to run the application with BUCK

android/app/proguard-rules.pro

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -15,56 +15,3 @@
1515
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
1616
# public *;
1717
#}
18-
19-
# Disabling obfuscation is useful if you collect stack traces from production crashes
20-
# (unless you are using a system that supports de-obfuscate the stack traces).
21-
-dontobfuscate
22-
23-
# React Native
24-
25-
# Keep our interfaces so they can be used by other ProGuard rules.
26-
# See http://sourceforge.net/p/proguard/bugs/466/
27-
-keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStrip
28-
-keep,allowobfuscation @interface com.facebook.proguard.annotations.KeepGettersAndSetters
29-
-keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip
30-
31-
# Do not strip any method/class that is annotated with @DoNotStrip
32-
-keep @com.facebook.proguard.annotations.DoNotStrip class *
33-
-keep @com.facebook.common.internal.DoNotStrip class *
34-
-keepclassmembers class * {
35-
@com.facebook.proguard.annotations.DoNotStrip *;
36-
@com.facebook.common.internal.DoNotStrip *;
37-
}
38-
39-
-keepclassmembers @com.facebook.proguard.annotations.KeepGettersAndSetters class * {
40-
void set*(***);
41-
*** get*();
42-
}
43-
44-
-keep class * extends com.facebook.react.bridge.JavaScriptModule { *; }
45-
-keep class * extends com.facebook.react.bridge.NativeModule { *; }
46-
-keepclassmembers,includedescriptorclasses class * { native <methods>; }
47-
-keepclassmembers class * { @com.facebook.react.uimanager.UIProp <fields>; }
48-
-keepclassmembers class * { @com.facebook.react.uimanager.annotations.ReactProp <methods>; }
49-
-keepclassmembers class * { @com.facebook.react.uimanager.annotations.ReactPropGroup <methods>; }
50-
51-
-dontwarn com.facebook.react.**
52-
53-
# TextLayoutBuilder uses a non-public Android constructor within StaticLayout.
54-
# See libs/proxy/src/main/java/com/facebook/fbui/textlayoutbuilder/proxy for details.
55-
-dontwarn android.text.StaticLayout
56-
57-
# okhttp
58-
59-
-keepattributes Signature
60-
-keepattributes *Annotation*
61-
-keep class okhttp3.** { *; }
62-
-keep interface okhttp3.** { *; }
63-
-dontwarn okhttp3.**
64-
65-
# okio
66-
67-
-keep class sun.misc.Unsafe { *; }
68-
-dontwarn java.nio.file.*
69-
-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
70-
-dontwarn okio.**

android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.boilerplate">
2+
package="com.boilerplate">
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"
98
android:label="@string/app_name"
109
android:icon="@mipmap/ic_launcher"
10+
android:roundIcon="@mipmap/ic_launcher_round"
1111
android:allowBackup="false"
1212
android:theme="@style/AppTheme">
1313
<activity

android/app/src/main/java/com/boilerplate/MainApplication.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import android.app.Application;
44

55
import com.facebook.react.ReactApplication;
6-
import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
76
import com.facebook.react.ReactNativeHost;
87
import com.facebook.react.ReactPackage;
98
import com.facebook.react.shell.MainReactPackage;
@@ -23,8 +22,7 @@ public boolean getUseDeveloperSupport() {
2322
@Override
2423
protected List<ReactPackage> getPackages() {
2524
return Arrays.<ReactPackage>asList(
26-
new MainReactPackage(),
27-
new RNGestureHandlerPackage()
25+
new MainReactPackage()
2826
);
2927
}
3028

android/build.gradle

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4+
ext {
5+
buildToolsVersion = "28.0.3"
6+
minSdkVersion = 16
7+
compileSdkVersion = 28
8+
targetSdkVersion = 28
9+
supportLibVersion = "28.0.0"
10+
}
411
repositories {
5-
jcenter()
612
google()
13+
jcenter()
714
}
815
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.1.0'
16+
classpath 'com.android.tools.build:gradle:3.3.1'
1017

1118
// NOTE: Do not place your application dependencies here; they belong
1219
// in the individual module build.gradle files
@@ -16,14 +23,11 @@ buildscript {
1623
allprojects {
1724
repositories {
1825
mavenLocal()
26+
google()
1927
jcenter()
20-
maven {
21-
url 'https://maven.google.com'
22-
}
2328
maven {
2429
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
2530
url "$rootDir/../node_modules/react-native/android"
2631
}
27-
google()
2832
}
2933
}

android/gradle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,3 @@
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
19-
20-
android.useDeprecatedNdk=true
2.01 KB
Binary file not shown.

0 commit comments

Comments
 (0)