Skip to content

Commit dca01d2

Browse files
committed
Merge branch 'feature/0.16' into develop
2 parents 03de0ae + fb3a47e commit dca01d2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+895
-253
lines changed

.babelrc

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

.flowconfig

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

.npmignore

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

Counter/.flowconfig

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
[ignore]
2+
3+
# We fork some components by platform.
4+
.*/*.web.js
5+
.*/*.android.js
6+
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-haste/.*/__tests__/.*
18+
.*/node_modules/fbjs-haste/__forks__/Map.js
19+
.*/node_modules/fbjs-haste/__forks__/Promise.js
20+
.*/node_modules/fbjs-haste/__forks__/fetch.js
21+
.*/node_modules/fbjs-haste/core/ExecutionEnvironment.js
22+
.*/node_modules/fbjs-haste/core/isEmpty.js
23+
.*/node_modules/fbjs-haste/crypto/crc32.js
24+
.*/node_modules/fbjs-haste/stubs/ErrorUtils.js
25+
.*/node_modules/react-haste/React.js
26+
.*/node_modules/react-haste/renderers/dom/ReactDOM.js
27+
.*/node_modules/react-haste/renderers/shared/event/eventPlugins/ResponderEventPlugin.js
28+
29+
# Ignore commoner tests
30+
.*/node_modules/commoner/test/.*
31+
32+
# See https://github.com/facebook/flow/issues/442
33+
.*/react-tools/node_modules/commoner/lib/reader.js
34+
35+
# Ignore jest
36+
.*/node_modules/jest-cli/.*
37+
38+
# Ignore Website
39+
.*/website/.*
40+
41+
[include]
42+
43+
[libs]
44+
node_modules/react-native/Libraries/react-native/react-native-interface.js
45+
46+
[options]
47+
module.system=haste
48+
49+
munge_underscores=true
50+
51+
module.name_mapper='^image![a-zA-Z0-9$_-]+$' -> 'GlobalImageStub'
52+
module.name_mapper='^[./a-zA-Z0-9$_-]+\.png$' -> 'RelativeImageStub'
53+
54+
suppress_type=$FlowIssue
55+
suppress_type=$FlowFixMe
56+
suppress_type=$FixMe
57+
58+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(1[0-8]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
59+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(1[0-8]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)? #[0-9]+
60+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
61+
62+
[version]
63+
0.18.1

.gitignore renamed to Counter/.gitignore

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ DerivedData
2222
*.xcuserstate
2323
project.xcworkspace
2424

25+
# Android/IJ
26+
#
27+
.idea
28+
.gradle
29+
local.properties
30+
2531
# node.js
2632
#
2733
node_modules/
2834
npm-debug.log
29-
30-
# atom
31-
#
32-
.tags
33-
.tags1

Counter/.watchmanconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

Counter/android/app/build.gradle

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
apply plugin: "com.android.application"
2+
3+
/**
4+
* The react.gradle file registers two tasks: bundleDebugJsAndAssets and bundleReleaseJsAndAssets.
5+
* These basically call `react-native bundle` with the correct arguments during the Android build
6+
* cycle. By default, bundleDebugJsAndAssets is skipped, as in debug/dev mode we prefer to load the
7+
* bundle directly from the development server. Below you can see all the possible configurations
8+
* and their defaults. If you decide to add a configuration block, make sure to add it before the
9+
* `apply from: "react.gradle"` line.
10+
*
11+
* project.ext.react = [
12+
* // the name of the generated asset file containing your JS bundle
13+
* bundleAssetName: "index.android.bundle",
14+
*
15+
* // the entry file for bundle generation
16+
* entryFile: "index.android.js",
17+
*
18+
* // whether to bundle JS and assets in debug mode
19+
* bundleInDebug: false,
20+
*
21+
* // whether to bundle JS and assets in release mode
22+
* bundleInRelease: true,
23+
*
24+
* // the root of your project, i.e. where "package.json" lives
25+
* root: "../../",
26+
*
27+
* // where to put the JS bundle asset in debug mode
28+
* jsBundleDirDebug: "$buildDir/intermediates/assets/debug",
29+
*
30+
* // where to put the JS bundle asset in release mode
31+
* jsBundleDirRelease: "$buildDir/intermediates/assets/release",
32+
*
33+
* // where to put drawable resources / React Native assets, e.g. the ones you use via
34+
* // require('./image.png')), in debug mode
35+
* resourcesDirDebug: "$buildDir/intermediates/res/merged/debug",
36+
*
37+
* // where to put drawable resources / React Native assets, e.g. the ones you use via
38+
* // require('./image.png')), in release mode
39+
* resourcesDirRelease: "$buildDir/intermediates/res/merged/release",
40+
*
41+
* // by default the gradle tasks are skipped if none of the JS files or assets change; this means
42+
* // that we don't look at files in android/ or ios/ to determine whether the tasks are up to
43+
* // date; if you have any other folders that you want to ignore for performance reasons (gradle
44+
* // indexes the entire tree), add them here. Alternatively, if you have JS files in android/
45+
* // for example, you might want to remove it from here.
46+
* inputExcludes: ["android/**", "ios/**"]
47+
* ]
48+
*/
49+
50+
apply from: "react.gradle"
51+
52+
android {
53+
compileSdkVersion 23
54+
buildToolsVersion "23.0.1"
55+
56+
defaultConfig {
57+
applicationId "com.counter"
58+
minSdkVersion 16
59+
targetSdkVersion 22
60+
versionCode 1
61+
versionName "1.0"
62+
ndk {
63+
abiFilters "armeabi-v7a", "x86"
64+
}
65+
}
66+
buildTypes {
67+
release {
68+
minifyEnabled false // Set this to true to enable Proguard
69+
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
70+
}
71+
}
72+
}
73+
74+
dependencies {
75+
compile fileTree(dir: "libs", include: ["*.jar"])
76+
compile "com.android.support:appcompat-v7:23.0.1"
77+
compile "com.facebook.react:react-native:0.16.+"
78+
}
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
# Add project specific ProGuard rules here.
2+
# By default, the flags in this file are appended to flags specified
3+
# in /usr/local/Cellar/android-sdk/24.3.3/tools/proguard/proguard-android.txt
4+
# You can edit the include path and order by changing the proguardFiles
5+
# directive in build.gradle.
6+
#
7+
# For more details, see
8+
# http://developer.android.com/guide/developing/tools/proguard.html
9+
10+
# Add any project specific keep options here:
11+
12+
# If your project uses WebView with JS, uncomment the following
13+
# and specify the fully qualified class name to the JavaScript interface
14+
# class:
15+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
16+
# public *;
17+
#}
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+
30+
# Do not strip any method/class that is annotated with @DoNotStrip
31+
-keep @com.facebook.proguard.annotations.DoNotStrip class *
32+
-keepclassmembers class * {
33+
@com.facebook.proguard.annotations.DoNotStrip *;
34+
}
35+
36+
-keepclassmembers @com.facebook.proguard.annotations.KeepGettersAndSetters class * {
37+
void set*(***);
38+
*** get*();
39+
}
40+
41+
-keep class * extends com.facebook.react.bridge.JavaScriptModule { *; }
42+
-keep class * extends com.facebook.react.bridge.NativeModule { *; }
43+
-keepclassmembers class * { @com.facebook.react.uimanager.UIProp <fields>; }
44+
-keepclassmembers class * { @com.facebook.react.uimanager.ReactProp <methods>; }
45+
-keepclassmembers class * { @com.facebook.react.uimanager.ReactPropGroup <methods>; }
46+
47+
# okhttp
48+
49+
-keepattributes Signature
50+
-keepattributes *Annotation*
51+
-keep class com.squareup.okhttp.** { *; }
52+
-keep interface com.squareup.okhttp.** { *; }
53+
-dontwarn com.squareup.okhttp.**
54+
55+
# okio
56+
57+
-keep class sun.misc.Unsafe { *; }
58+
-dontwarn java.nio.file.*
59+
-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
60+
-dontwarn okio.**

0 commit comments

Comments
 (0)