Skip to content

Commit a4b102e

Browse files
committed
Bump react native version for the demo app
1 parent b9f674a commit a4b102e

File tree

14 files changed

+133
-171
lines changed

14 files changed

+133
-171
lines changed

Example/.flowconfig

Lines changed: 24 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,28 @@
11
[ignore]
22

33
# We fork some components by platform.
4-
.*/*.web.js
5-
.*/*.android.js
4+
.*/*[.]android.js
65

7-
# Some modules have their own node_modules with overlap
8-
.*/node_modules/node-haste/.*
9-
10-
# Ugh
11-
.*/node_modules/babel.*
12-
.*/node_modules/babylon.*
13-
.*/node_modules/invariant.*
14-
15-
# Ignore react and fbjs where there are overlaps, but don't ignore
16-
# anything that react-native relies on
17-
.*/node_modules/fbjs/lib/Map.js
18-
.*/node_modules/fbjs/lib/fetch.js
19-
.*/node_modules/fbjs/lib/ExecutionEnvironment.js
20-
.*/node_modules/fbjs/lib/ErrorUtils.js
21-
22-
# Flow has a built-in definition for the 'react' module which we prefer to use
23-
# over the currently-untyped source
24-
.*/node_modules/react/react.js
25-
.*/node_modules/react/lib/React.js
26-
.*/node_modules/react/lib/ReactDOM.js
27-
28-
.*/__mocks__/.*
29-
.*/__tests__/.*
30-
31-
.*/commoner/test/source/widget/share.js
32-
33-
# Ignore commoner tests
34-
.*/node_modules/commoner/test/.*
35-
36-
# See https://github.com/facebook/flow/issues/442
37-
.*/react-tools/node_modules/commoner/lib/reader.js
6+
# Ignore templates with `@flow` in header
7+
.*/local-cli/generator.*
388

39-
# Ignore jest
40-
.*/node_modules/jest-cli/.*
9+
# Ignore malformed json
10+
.*/node_modules/y18n/test/.*\.json
4111

42-
# Ignore Website
43-
.*/website/.*
12+
# Ignore the website subdir
13+
<PROJECT_ROOT>/website/.*
4414

45-
# Ignore generators
46-
.*/local-cli/generator.*
15+
# Ignore BUCK generated dirs
16+
<PROJECT_ROOT>/\.buckd/
4717

48-
# Ignore BUCK generated folders
49-
.*\.buckd/
50-
51-
.*/node_modules/is-my-json-valid/test/.*\.json
52-
.*/node_modules/iconv-lite/encodings/tables/.*\.json
53-
.*/node_modules/y18n/test/.*\.json
54-
.*/node_modules/spdx-license-ids/spdx-license-ids.json
55-
.*/node_modules/spdx-exceptions/index.json
56-
.*/node_modules/resolve/test/subdirs/node_modules/a/b/c/x.json
57-
.*/node_modules/resolve/lib/core.json
58-
.*/node_modules/jsonparse/samplejson/.*\.json
59-
.*/node_modules/json5/test/.*\.json
60-
.*/node_modules/ua-parser-js/test/.*\.json
61-
.*/node_modules/builtin-modules/builtin-modules.json
62-
.*/node_modules/binary-extensions/binary-extensions.json
63-
.*/node_modules/url-regex/tlds.json
64-
.*/node_modules/joi/.*\.json
65-
.*/node_modules/isemail/.*\.json
66-
.*/node_modules/tr46/.*\.json
18+
# Ignore unexpected extra @providesModule
19+
.*/node_modules/commoner/test/source/widget/share.js
6720

21+
# Ignore duplicate module providers
22+
# For RN Apps installed via npm, "Libraries" folder is inside node_modules/react-native but in the source repo it is in the root
23+
.*/Libraries/react-native/React.js
24+
.*/Libraries/react-native/ReactNative.js
25+
.*/node_modules/jest-runtime/build/__tests__/.*
6826

6927
[include]
7028

@@ -79,18 +37,22 @@ module.system=haste
7937
esproposal.class_static_fields=enable
8038
esproposal.class_instance_fields=enable
8139

40+
experimental.strict_type_args=true
41+
8242
munge_underscores=true
8343

8444
module.name_mapper='^image![a-zA-Z0-9$_-]+$' -> 'GlobalImageStub'
85-
module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\)$' -> 'RelativeImageStub'
45+
module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
8646

8747
suppress_type=$FlowIssue
8848
suppress_type=$FlowFixMe
8949
suppress_type=$FixMe
9050

91-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(2[0-2]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
92-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(2[0-2]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
51+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-2]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
52+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-2]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
9353
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
9454

55+
unsafe.enable_getters_and_setters=true
56+
9557
[version]
96-
^0.22.0
58+
^0.32.0

Example/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ project.xcworkspace
2424

2525
# Android/IJ
2626
#
27+
*.iml
2728
.idea
2829
.gradle
2930
local.properties

Example/android/app/BUCK

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import re
55
# - install Buck
66
# - `npm start` - to start the packager
77
# - `cd android`
8-
# - `cp ~/.android/debug.keystore keystores/debug.keystore`
8+
# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"`
99
# - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck
1010
# - `buck install -r android/app` - compile, install and run application
1111
#

Example/android/app/build.gradle

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,13 @@ import com.android.build.OutputFile
5555
* // date; if you have any other folders that you want to ignore for performance reasons (gradle
5656
* // indexes the entire tree), add them here. Alternatively, if you have JS files in android/
5757
* // for example, you might want to remove it from here.
58-
* inputExcludes: ["android/**", "ios/**"]
58+
* inputExcludes: ["android/**", "ios/**"],
59+
*
60+
* // override which node gets called and with what additional arguments
61+
* nodeExecutableAndArgs: ["node"]
62+
*
63+
* // supply additional arguments to the packager
64+
* extraPackagerArgs: []
5965
* ]
6066
*/
6167

Example/android/app/proguard-rules.pro

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,14 @@
2626
# See http://sourceforge.net/p/proguard/bugs/466/
2727
-keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStrip
2828
-keep,allowobfuscation @interface com.facebook.proguard.annotations.KeepGettersAndSetters
29+
-keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip
2930

3031
# Do not strip any method/class that is annotated with @DoNotStrip
3132
-keep @com.facebook.proguard.annotations.DoNotStrip class *
33+
-keep @com.facebook.common.internal.DoNotStrip class *
3234
-keepclassmembers class * {
3335
@com.facebook.proguard.annotations.DoNotStrip *;
36+
@com.facebook.common.internal.DoNotStrip *;
3437
}
3538

3639
-keepclassmembers @com.facebook.proguard.annotations.KeepGettersAndSetters class * {
@@ -51,17 +54,13 @@
5154

5255
-keepattributes Signature
5356
-keepattributes *Annotation*
54-
-keep class com.squareup.okhttp.** { *; }
55-
-keep interface com.squareup.okhttp.** { *; }
56-
-dontwarn com.squareup.okhttp.**
57+
-keep class okhttp3.** { *; }
58+
-keep interface okhttp3.** { *; }
59+
-dontwarn okhttp3.**
5760

5861
# okio
5962

6063
-keep class sun.misc.Unsafe { *; }
6164
-dontwarn java.nio.file.*
6265
-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
6366
-dontwarn okio.**
64-
65-
# stetho
66-
67-
-dontwarn com.facebook.stetho.**

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
android:targetSdkVersion="22" />
1212

1313
<application
14+
android:name=".MainApplication"
1415
android:allowBackup="true"
1516
android:label="@string/app_name"
1617
android:icon="@mipmap/ic_launcher"
Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
package com.example;
22

33
import com.facebook.react.ReactActivity;
4-
import com.facebook.react.ReactPackage;
5-
import com.facebook.react.shell.MainReactPackage;
6-
7-
import java.util.Arrays;
8-
import java.util.List;
94

105
public class MainActivity extends ReactActivity {
116

@@ -17,24 +12,4 @@ public class MainActivity extends ReactActivity {
1712
protected String getMainComponentName() {
1813
return "Example";
1914
}
20-
21-
/**
22-
* Returns whether dev mode should be enabled.
23-
* This enables e.g. the dev menu.
24-
*/
25-
@Override
26-
protected boolean getUseDeveloperSupport() {
27-
return BuildConfig.DEBUG;
28-
}
29-
30-
/**
31-
* A list of packages used by the app. If the app uses additional views
32-
* or modules besides the default ones, add more packages here.
33-
*/
34-
@Override
35-
protected List<ReactPackage> getPackages() {
36-
return Arrays.<ReactPackage>asList(
37-
new MainReactPackage()
38-
);
39-
}
4015
}
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package com.example;
2+
3+
import android.app.Application;
4+
import android.util.Log;
5+
6+
import com.facebook.react.ReactApplication;
7+
import com.facebook.react.ReactInstanceManager;
8+
import com.facebook.react.ReactNativeHost;
9+
import com.facebook.react.ReactPackage;
10+
import com.facebook.react.shell.MainReactPackage;
11+
12+
import java.util.Arrays;
13+
import java.util.List;
14+
15+
public class MainApplication extends Application implements ReactApplication {
16+
17+
private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
18+
@Override
19+
protected boolean getUseDeveloperSupport() {
20+
return BuildConfig.DEBUG;
21+
}
22+
23+
@Override
24+
protected List<ReactPackage> getPackages() {
25+
return Arrays.<ReactPackage>asList(
26+
new MainReactPackage()
27+
);
28+
}
29+
};
30+
31+
@Override
32+
public ReactNativeHost getReactNativeHost() {
33+
return mReactNativeHost;
34+
}
35+
}

Example/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ allprojects {
1818
jcenter()
1919
maven {
2020
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
21-
url "$projectDir/../../node_modules/react-native/android"
21+
url "$rootDir/../node_modules/react-native/android"
2222
}
2323
}
2424
}

0 commit comments

Comments
 (0)