Skip to content
This repository was archived by the owner on Mar 25, 2025. It is now read-only.

Commit 5279b42

Browse files
bartonhammondbartonhammond
committed
upgrade to newest releases
1 parent bade73f commit 5279b42

9 files changed

Lines changed: 131 additions & 152 deletions

File tree

‎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-
# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US`
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
#

‎android/app/build.gradle‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -126,19 +126,12 @@ android {
126126
}
127127

128128
dependencies {
129-
129+
compile project(':react-native-vector-icons')
130+
compile project(':react-native-simpledialog-android')
131+
compile project(':react-native-i18n')
130132
compile fileTree(dir: "libs", include: ["*.jar"])
131133
compile "com.android.support:appcompat-v7:23.0.1"
132134
compile "com.facebook.react:react-native:+" // From node_modules
133-
134-
// Added this line:
135-
compile project(':react-native-vector-icons')
136-
137-
// Added this line:
138-
compile project(':RNSimpleAlertDialogModule')
139-
140-
// Added this line:
141-
compile project(':react-native-i18n')
142135
}
143136

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

‎android/app/src/main/java/com/snowflake/MainApplication.java‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
import android.util.Log;
55

66
import com.facebook.react.ReactApplication;
7+
import com.oblador.vectoricons.VectorIconsPackage;
8+
import com.burnweb.rnsimplealertdialog.RNSimpleAlertDialogPackage;
9+
import com.i18n.reactnativei18n.ReactNativeI18n;
710
import com.facebook.react.ReactInstanceManager;
811
import com.facebook.react.ReactNativeHost;
912
import com.facebook.react.ReactPackage;
@@ -12,13 +15,6 @@
1215
import java.util.Arrays;
1316
import java.util.List;
1417

15-
// Add this line:
16-
import com.oblador.vectoricons.VectorIconsPackage;
17-
// Add this line:
18-
import com.burnweb.rnsimplealertdialog.RNSimpleAlertDialogPackage;
19-
// Add this line:
20-
import com.i18n.reactnativei18n.ReactNativeI18n;
21-
2218
public class MainApplication extends Application implements ReactApplication {
2319

2420
private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
@@ -30,12 +26,11 @@ protected boolean getUseDeveloperSupport() {
3026
@Override
3127
protected List<ReactPackage> getPackages() {
3228
return Arrays.<ReactPackage>asList(
33-
new MainReactPackage(),
34-
//Added two lines
35-
new RNSimpleAlertDialogPackage(),
36-
new VectorIconsPackage(),
37-
new ReactNativeI18n()
38-
);
29+
new MainReactPackage(),
30+
new VectorIconsPackage(),
31+
new RNSimpleAlertDialogPackage(),
32+
new ReactNativeI18n()
33+
);
3934
}
4035
};
4136

‎android/app/src/main/res/values/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,8 @@
22

33

44

5+
6+
7+
58
<string name="app_name">snowflake</string>
69
</resources>

‎android/settings.gradle‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
rootProject.name = 'snowflake'
22

33
include ':app'
4-
include ':react-native-i18n'
5-
project(':react-native-i18n').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-i18n/android')
6-
7-
8-
//Added the following two lines
9-
include ':RNSimpleAlertDialogModule', ':app'
10-
project(':RNSimpleAlertDialogModule').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-simpledialog-android/android')
11-
12-
//Added the following two lines:
134
include ':react-native-vector-icons'
145
project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
15-
6+
include ':react-native-simpledialog-android'
7+
project(':react-native-simpledialog-android').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-simpledialog-android/android')
8+
include ':react-native-i18n'
9+
project(':react-native-i18n').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-i18n/android')

‎ios/snowflake.xcodeproj/project.pbxproj‎

Lines changed: 81 additions & 85 deletions
Large diffs are not rendered by default.

‎ios/snowflake/AppDelegate.m‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
1818
{
1919
NSURL *jsCodeLocation;
2020

21-
[[RCTBundleURLProvider sharedSettings] setDefaults];
2221
jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index.ios" fallbackResource:nil];
2322

2423
RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation

‎ios/snowflake/Info.plist‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,6 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5-
<key>UIAppFonts</key>
6-
<array>
7-
<string>FontAwesome.ttf</string>
8-
<string>Entypo.ttf</string>
9-
<string>EvilIcons.ttf</string>
10-
<string>FontAwesome.ttf</string>
11-
<string>Foundation.ttf</string>
12-
<string>Ionicons.ttf</string>
13-
<string>MaterialIcons.ttf</string>
14-
<string>Octicons.ttf</string>
15-
<string>Zocial.ttf</string>
16-
</array>
175
<key>CFBundleDevelopmentRegion</key>
186
<string>en</string>
197
<key>CFBundleExecutable</key>
@@ -53,7 +41,7 @@
5341
<key>NSAppTransportSecurity</key>
5442
<dict>
5543
<key>NSAllowsArbitraryLoads</key>
56-
<true/>
44+
<true/>
5745
<key>NSExceptionDomains</key>
5846
<dict>
5947
<key>localhost</key>
@@ -63,5 +51,16 @@
6351
</dict>
6452
</dict>
6553
</dict>
54+
<key>UIAppFonts</key>
55+
<array>
56+
<string>Entypo.ttf</string>
57+
<string>EvilIcons.ttf</string>
58+
<string>FontAwesome.ttf</string>
59+
<string>Foundation.ttf</string>
60+
<string>Ionicons.ttf</string>
61+
<string>MaterialIcons.ttf</string>
62+
<string>Octicons.ttf</string>
63+
<string>Zocial.ttf</string>
64+
</array>
6665
</dict>
67-
</plist>
66+
</plist>

‎package.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "snowflake",
3-
"version": "0.1.8",
3+
"version": "0.1.9",
44
"private": true,
55
"jest": {
66
"preset": "jest-react-native",
@@ -14,15 +14,15 @@
1414
"verbose": true
1515
},
1616
"standard": {
17-
"globals": [
18-
"jest",
19-
"expect",
20-
"it",
21-
"describe",
22-
"fetch",
23-
"beforeEach"
24-
],
25-
"parser": "babel-eslint"
17+
"globals": [
18+
"jest",
19+
"expect",
20+
"it",
21+
"describe",
22+
"fetch",
23+
"beforeEach"
24+
],
25+
"parser": "babel-eslint"
2626
},
2727
"scripts": {
2828
"format": "standard --fix",
@@ -36,17 +36,17 @@
3636
"apsl-react-native-button": "3.0.0",
3737
"immutable": "3.8.1",
3838
"key-mirror": "1.0.1",
39-
"react": "15.2.1",
40-
"react-mixin": "^2.0.2",
41-
"react-native": "0.30.0",
39+
"react": "15.3.0",
40+
"react-mixin": "2.0.2",
41+
"react-native": "0.32.0",
4242
"react-native-i18n": "0.0.8",
4343
"react-native-navbar": "1.5.0",
4444
"react-native-router-flux": "3.31.1",
4545
"react-native-simple-store": "1.0.1",
4646
"react-native-simpledialog-android": "1.0.7",
4747
"react-native-vector-icons": "2.0.3",
4848
"react-redux": "4.4.5",
49-
"react-timer-mixin": "^0.13.3",
49+
"react-timer-mixin": "0.13.3",
5050
"redux": "3.5.2",
5151
"redux-thunk": "2.1.0",
5252
"regenerator": "0.8.46",
@@ -57,16 +57,16 @@
5757
},
5858
"devDependencies": {
5959
"babel-core": "6.9.0",
60-
"babel-eslint": "^6.1.2",
60+
"babel-eslint": "6.1.2",
6161
"babel-jest": "14.0.0",
6262
"babel-preset-react-native": "1.8.0",
6363
"docker": "1.0.0",
6464
"istanbul": "0.4.3",
65-
"jest": "14.0.0",
66-
"jest-react-native": "14.0.0",
65+
"jest": "14.1.0",
66+
"jest-react-native": "14.1.3",
6767
"react-addons-test-utils": "15.0.2",
6868
"redux-mock-store": "1.1.2",
6969
"rnpm-plugin-upgrade": "0.26.0",
70-
"standard": "^8.0.0"
70+
"standard": "8.0.0"
7171
}
7272
}

0 commit comments

Comments
 (0)