Skip to content

Commit ee1b7e0

Browse files
jayfunkjayfunk
committed
Alchemy 2016 Release
1 parent f957ba9 commit ee1b7e0

File tree

123 files changed

+16438
-30234
lines changed

Some content is hidden

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

123 files changed

+16438
-30234
lines changed

‎.buckconfig‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
[android]
3+
target = Google Inc.:Google APIs:23
4+
5+
[maven_repositories]
6+
central = https://repo1.maven.org/maven2

‎.flowconfig‎

Lines changed: 26 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,58 @@
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/.*
6+
# Ignore templates with `@flow` in header
7+
.*/local-cli/generator.*
98

10-
# Ugh
11-
.*/node_modules/babel.*
12-
.*/node_modules/babylon.*
13-
.*/node_modules/invariant.*
9+
# Ignore malformed json
10+
.*/node_modules/y18n/test/.*\.json
1411

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
12+
# Ignore the website subdir
13+
<PROJECT_ROOT>/website/.*
2114

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
15+
# Ignore BUCK generated dirs
16+
<PROJECT_ROOT>/\.buckd/
2717

28-
.*/__mocks__/.*
29-
.*/__tests__/.*
18+
# Ignore unexpected extra @providesModule
19+
.*/node_modules/commoner/test/source/widget/share.js
3020

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
38-
39-
# Ignore jest
40-
.*/node_modules/jest-cli/.*
41-
42-
# Ignore Website
43-
.*/website/.*
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__/.*
4426

4527
[include]
4628

4729
[libs]
4830
node_modules/react-native/Libraries/react-native/react-native-interface.js
31+
node_modules/react-native/flow
32+
flow/
4933

5034
[options]
5135
module.system=haste
5236

5337
esproposal.class_static_fields=enable
5438
esproposal.class_instance_fields=enable
5539

40+
experimental.strict_type_args=true
41+
5642
munge_underscores=true
5743

5844
module.name_mapper='^image![a-zA-Z0-9$_-]+$' -> 'GlobalImageStub'
59-
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'
6046

6147
suppress_type=$FlowIssue
6248
suppress_type=$FlowFixMe
6349
suppress_type=$FixMe
6450

65-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(2[0-1]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
66-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(2[0-1]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
51+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(30\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
52+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(30\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
6753
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
6854

55+
unsafe.enable_getters_and_setters=true
56+
6957
[version]
70-
0.21.0
58+
^0.30.0

‎.gitignore‎

Lines changed: 6 additions & 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
@@ -35,3 +36,8 @@ node_modules/
3536
npm-debug.log
3637

3738
*.sublime*
39+
# BUCK
40+
buck-out/
41+
\.buckd/
42+
android/app/libs
43+
android/keystores/debug.keystore

‎android/app/BUCK‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
import re
2+
3+
# To learn about Buck see [Docs](https://buckbuild.com/).
4+
# To run your application with Buck:
5+
# - install Buck
6+
# - `npm start` - to start the packager
7+
# - `cd android`
8+
# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"`
9+
# - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck
10+
# - `buck install -r android/app` - compile, install and run application
11+
#
12+
13+
lib_deps = []
14+
for jarfile in glob(['libs/*.jar']):
15+
name = 'jars__' + re.sub(r'^.*/([^/]+)\.jar$', r'\1', jarfile)
16+
lib_deps.append(':' + name)
17+
prebuilt_jar(
18+
name = name,
19+
binary_jar = jarfile,
20+
)
21+
22+
for aarfile in glob(['libs/*.aar']):
23+
name = 'aars__' + re.sub(r'^.*/([^/]+)\.aar$', r'\1', aarfile)
24+
lib_deps.append(':' + name)
25+
android_prebuilt_aar(
26+
name = name,
27+
aar = aarfile,
28+
)
29+
30+
android_library(
31+
name = 'all-libs',
32+
exported_deps = lib_deps
33+
)
34+
35+
android_library(
36+
name = 'app-code',
37+
srcs = glob([
38+
'src/main/java/**/*.java',
39+
]),
40+
deps = [
41+
':all-libs',
42+
':build_config',
43+
':res',
44+
],
45+
)
46+
47+
android_build_config(
48+
name = 'build_config',
49+
package = 'com.pocketguide',
50+
)
51+
52+
android_resource(
53+
name = 'res',
54+
res = 'src/main/res',
55+
package = 'com.pocketguide',
56+
)
57+
58+
android_binary(
59+
name = 'app',
60+
package_type = 'debug',
61+
manifest = 'src/main/AndroidManifest.xml',
62+
keystore = '//android/keystores:debug',
63+
deps = [
64+
':app-code',
65+
],
66+
)

‎android/app/app.iml‎

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,19 @@
7171
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7272
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
7373
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.1/jars" />
76-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/drawee/0.8.1/jars" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fbcore/0.8.1/jars" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fresco/0.8.1/jars" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-okhttp/0.8.1/jars" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline/0.8.1/jars" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.react/react-native/0.22.2/jars" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.4.0/jars" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/jars" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.4.0/jars" />
77+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/jars" />
78+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.4.0/jars" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/drawee/0.11.0/jars" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fbcore/0.11.0/jars" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fresco/0.11.0/jars" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-base/0.11.0/jars" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-okhttp3/0.11.0/jars" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline/0.11.0/jars" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.react/react-native/0.32.0/jars" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.soloader/soloader/0.1.0/jars" />
8387
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.webkit/android-jsc/r174650/jars" />
8488
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
8589
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
@@ -98,29 +102,30 @@
98102
</content>
99103
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
100104
<orderEntry type="sourceFolder" forTests="false" />
101-
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
102-
<orderEntry type="library" exported="" name="fresco-0.8.1" level="project" />
103-
<orderEntry type="library" exported="" name="imagepipeline-okhttp-0.8.1" level="project" />
104-
<orderEntry type="library" exported="" name="imagepipeline-0.8.1" level="project" />
105-
<orderEntry type="library" exported="" name="lost-1.0.1" level="project" />
105+
<orderEntry type="library" exported="" name="fresco-0.11.0" level="project" />
106+
<orderEntry type="library" exported="" name="appcompat-v7-23.4.0" level="project" />
107+
<orderEntry type="library" exported="" name="okhttp-ws-3.4.1" level="project" />
108+
<orderEntry type="library" exported="" name="imagepipeline-okhttp3-0.11.0" level="project" />
109+
<orderEntry type="library" exported="" name="react-native-0.32.0" level="project" />
110+
<orderEntry type="library" exported="" name="support-vector-drawable-23.4.0" level="project" />
111+
<orderEntry type="library" exported="" name="okio-1.9.0" level="project" />
112+
<orderEntry type="library" exported="" name="recyclerview-v7-23.4.0" level="project" />
113+
<orderEntry type="library" exported="" name="fbcore-0.11.0" level="project" />
106114
<orderEntry type="library" exported="" name="jsr305-3.0.0" level="project" />
107-
<orderEntry type="library" exported="" name="stetho-1.2.0" level="project" />
115+
<orderEntry type="library" exported="" name="guava-18.0" level="project" />
108116
<orderEntry type="library" exported="" name="jackson-core-2.2.3" level="project" />
109-
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
110-
<orderEntry type="library" exported="" name="react-native-0.22.2" level="project" />
111-
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
112-
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
113-
<orderEntry type="library" exported="" name="okhttp-2.5.0" level="project" />
114-
<orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
115-
<orderEntry type="library" exported="" name="okhttp-ws-2.5.0" level="project" />
116-
<orderEntry type="library" exported="" name="fbcore-0.8.1" level="project" />
117+
<orderEntry type="library" exported="" name="okhttp-3.4.1" level="project" />
118+
<orderEntry type="library" exported="" name="bolts-tasks-1.4.0" level="project" />
119+
<orderEntry type="library" exported="" name="drawee-0.11.0" level="project" />
120+
<orderEntry type="library" exported="" name="soloader-0.1.0" level="project" />
121+
<orderEntry type="library" exported="" name="support-annotations-23.4.0" level="project" />
122+
<orderEntry type="library" exported="" name="animated-vector-drawable-23.4.0" level="project" />
117123
<orderEntry type="library" exported="" name="android-jsc-r174650" level="project" />
118-
<orderEntry type="library" exported="" name="drawee-0.8.1" level="project" />
119-
<orderEntry type="library" exported="" name="stetho-okhttp-1.2.0" level="project" />
120-
<orderEntry type="library" exported="" name="bolts-android-1.1.4" level="project" />
124+
<orderEntry type="library" exported="" name="support-v4-23.4.0" level="project" />
125+
<orderEntry type="library" exported="" name="imagepipeline-0.11.0" level="project" />
126+
<orderEntry type="library" exported="" name="okhttp-urlconnection-3.4.1" level="project" />
121127
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
122-
<orderEntry type="library" exported="" name="commons-cli-1.2" level="project" />
123-
<orderEntry type="library" exported="" name="okhttp-3.0.1" level="project" />
124-
<orderEntry type="module" module-name="reactnativemapboxgl" exported="" />
128+
<orderEntry type="library" exported="" name="imagepipeline-base-0.11.0" level="project" />
129+
<orderEntry type="module" module-name="react-native-mapbox-gl" exported="" />
125130
</component>
126131
</module>

‎android/app/build.gradle‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import com.android.build.OutputFile
99
* cycle. By default, bundleDebugJsAndAssets is skipped, as in debug/dev mode we prefer to load the
1010
* bundle directly from the development server. Below you can see all the possible configurations
1111
* and their defaults. If you decide to add a configuration block, make sure to add it before the
12-
* `apply from: "react.gradle"` line.
12+
* `apply from: "../../node_modules/react-native/react.gradle"` line.
1313
*
1414
* project.ext.react = [
1515
* // the name of the generated asset file containing your JS bundle
@@ -55,11 +55,17 @@ 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

62-
apply from: "react.gradle"
68+
apply from: "../../node_modules/react-native/react.gradle"
6369

6470
/**
6571
* Set this to true to create two separate APKs instead of one:
@@ -84,8 +90,8 @@ android {
8490
applicationId "com.pocketguide"
8591
minSdkVersion 16
8692
targetSdkVersion 22
87-
versionCode 3
88-
versionName "1.2"
93+
versionCode 6
94+
versionName "1.5"
8995
ndk {
9096
abiFilters "armeabi-v7a", "x86"
9197
}
@@ -129,8 +135,15 @@ android {
129135
}
130136

131137
dependencies {
138+
compile project(':react-native-mapbox-gl')
132139
compile fileTree(dir: "libs", include: ["*.jar"])
133140
compile "com.android.support:appcompat-v7:23.0.1"
134-
compile project(':reactnativemapboxgl')
135141
compile "com.facebook.react:react-native:+" // From node_modules
136142
}
143+
144+
// Run this once to be able to run the application with BUCK
145+
// puts all compile dependencies into folder libs for BUCK to use
146+
task copyDownloadableDepsToLibs(type: Copy) {
147+
from configurations.compile
148+
into 'libs'
149+
}

‎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.**

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,16 @@
33

44
<uses-permission android:name="android.permission.INTERNET" />
55
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
6+
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
7+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
68

79
<application
10+
android:name=".MainApplication"
811
android:allowBackup="true"
912
android:label="@string/app_name"
1013
android:icon="@mipmap/euphoria_icon"
1114
android:theme="@style/AppTheme">
15+
<service android:name="com.mapbox.mapboxsdk.telemetry.TelemetryService"/>
1216
<activity
1317
android:name=".MainActivity"
1418
android:label="@string/app_name">

0 commit comments

Comments
 (0)