Upgrade to react-native 0.24 + extras

This commit is contained in:
Jake Howard 2016-04-28 14:43:41 +01:00
parent 4fd52d591c
commit a8648c9a14
12 changed files with 122 additions and 130 deletions

6
.gitignore vendored
View file

@ -32,3 +32,9 @@ local.properties
#
node_modules/
npm-debug.log
# BUCK
buck-out/
\.buckd/
android/app/libs
android/keystores/debug.keystore

View file

@ -9,7 +9,7 @@ import com.android.build.OutputFile
* cycle. By default, bundleDebugJsAndAssets is skipped, as in debug/dev mode we prefer to load the
* bundle directly from the development server. Below you can see all the possible configurations
* and their defaults. If you decide to add a configuration block, make sure to add it before the
* `apply from: "react.gradle"` line.
* `apply from: "../../node_modules/react-native/react.gradle"` line.
*
* project.ext.react = [
* // the name of the generated asset file containing your JS bundle
@ -26,7 +26,9 @@ import com.android.build.OutputFile
*
* // whether to bundle JS and assets in another build variant (if configured).
* // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants
* // The configuration property is in the format 'bundleIn${productFlavor}${buildType}'
* // The configuration property can be in the following formats
* // 'bundleIn${productFlavor}${buildType}'
* // 'bundleIn${buildType}'
* // bundleInFreeDebug: true,
* // bundleInPaidRelease: true,
* // bundleInBeta: true,
@ -57,11 +59,10 @@ import com.android.build.OutputFile
* ]
*/
apply from: "react.gradle"
apply from: "../../node_modules/react-native/react.gradle"
/**
* Set this to true to create three separate APKs instead of one:
* - A universal APK that works on all devices
* Set this to true to create two separate APKs instead of one:
* - An APK that only works on ARM devices
* - An APK that only works on x86 devices
* The advantage is the size of the APK is reduced by about 4MB.
@ -91,9 +92,9 @@ android {
}
splits {
abi {
enable enableSeparateBuildPerCPUArchitecture
universalApk false
reset()
enable enableSeparateBuildPerCPUArchitecture
universalApk false // If true, also generate a universal APK
include "armeabi-v7a", "x86"
}
}
@ -119,7 +120,15 @@ android {
}
dependencies {
compile project(':react-native-vector-icons')
compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:appcompat-v7:23.0.1"
compile "com.facebook.react:react-native:0.20.+"
compile "com.facebook.react:react-native:+" // From node_modules
}
// Run this once to be able to run the application with BUCK
// puts all compile dependencies into folder libs for BUCK to use
task copyDownloadableDepsToLibs(type: Copy) {
from configurations.compile
into 'libs'
}

View file

@ -16,5 +16,9 @@ allprojects {
repositories {
mavenLocal()
jcenter()
maven {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
url "$projectDir/../../node_modules/react-native/android"
}
}
}

View file

@ -11,7 +11,7 @@
00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; };
00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; };
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
00E356F31AD99517003FC87E /* SphereTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* SphereTests.m */; };
00E356F31AD99517003FC87E /* sphereTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* sphereTests.m */; };
133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; };
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; };
@ -21,15 +21,9 @@
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
C200FE733CDD4A2FB3603718 /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 241F48DCAD554FBAA1FE99DE /* libRNVectorIcons.a */; };
E989F1D1122D47C0BD857E8D /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2D70717F7C164E6D907D6200 /* Entypo.ttf */; };
FA01A0D51D5B4A3BBE7E698A /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 17D44F59FD7144978682FF31 /* EvilIcons.ttf */; };
7838A63045AB4CDA8E19E4FB /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 90FC9AAE15B5475D990B70B1 /* FontAwesome.ttf */; };
38211C72F97B4B7A94279CFF /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3BF762A1D1394762BECF4FD7 /* Foundation.ttf */; };
F243A61034344F3284CBD1D0 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4631832BC49B4F5DB6B3FA81 /* Ionicons.ttf */; };
8F081F518B154728AE83C449 /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5AC570600CDC4C0AA5759C55 /* MaterialIcons.ttf */; };
5B68C27C8F36405E84BA3154 /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4DAEB1CB9F1348D797E1464C /* Octicons.ttf */; };
A49DEBBF93AB45AE96992041 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 148C00397709478690F62517 /* Zocial.ttf */; };
860316FB7AD2462C96E95300 /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DE88264F0EB0452CB4E4E02B /* libRNVectorIcons.a */; };
775D82F3513F4674BA6A7A51 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 401AFB573606442D85F3E27D /* FontAwesome.ttf */; };
692D0251A55F4FE6A9085813 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D5BA628B686341C39CDD90A0 /* Ionicons.ttf */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -73,7 +67,7 @@
containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 13B07F861A680F5B00A75B9A;
remoteInfo = Sphere;
remoteInfo = sphere;
};
139105C01AF99BAD00B5F7CC /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
@ -119,31 +113,25 @@
00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = ../node_modules/react-native/Libraries/Image/RCTImage.xcodeproj; sourceTree = "<group>"; };
00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = ../node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj; sourceTree = "<group>"; };
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = ../node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj; sourceTree = "<group>"; };
00E356EE1AD99517003FC87E /* SphereTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SphereTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
00E356EE1AD99517003FC87E /* sphereTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = sphereTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
00E356F21AD99517003FC87E /* SphereTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SphereTests.m; sourceTree = "<group>"; };
00E356F21AD99517003FC87E /* sphereTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = sphereTests.m; sourceTree = "<group>"; };
139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = ../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj; sourceTree = "<group>"; };
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = ../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj; sourceTree = "<group>"; };
13B07F961A680F5B00A75B9A /* Sphere.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Sphere.app; sourceTree = BUILT_PRODUCTS_DIR; };
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Sphere/AppDelegate.h; sourceTree = "<group>"; };
13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Sphere/AppDelegate.m; sourceTree = "<group>"; };
13B07F961A680F5B00A75B9A /* sphere.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = sphere.app; sourceTree = BUILT_PRODUCTS_DIR; };
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = sphere/AppDelegate.h; sourceTree = "<group>"; };
13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = sphere/AppDelegate.m; sourceTree = "<group>"; };
13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Sphere/Images.xcassets; sourceTree = "<group>"; };
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Sphere/Info.plist; sourceTree = "<group>"; };
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Sphere/main.m; sourceTree = "<group>"; };
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = sphere/Images.xcassets; sourceTree = "<group>"; };
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = sphere/Info.plist; sourceTree = "<group>"; };
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = sphere/main.m; sourceTree = "<group>"; };
146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = ../node_modules/react-native/React/React.xcodeproj; sourceTree = "<group>"; };
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = ../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj; sourceTree = "<group>"; };
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../node_modules/react-native/Libraries/Text/RCTText.xcodeproj; sourceTree = "<group>"; };
0DCE331EC7744165A5CD6B84 /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; name = "RNVectorIcons.xcodeproj"; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
241F48DCAD554FBAA1FE99DE /* libRNVectorIcons.a */ = {isa = PBXFileReference; name = "libRNVectorIcons.a"; path = "libRNVectorIcons.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
2D70717F7C164E6D907D6200 /* Entypo.ttf */ = {isa = PBXFileReference; name = "Entypo.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
17D44F59FD7144978682FF31 /* EvilIcons.ttf */ = {isa = PBXFileReference; name = "EvilIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
90FC9AAE15B5475D990B70B1 /* FontAwesome.ttf */ = {isa = PBXFileReference; name = "FontAwesome.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
3BF762A1D1394762BECF4FD7 /* Foundation.ttf */ = {isa = PBXFileReference; name = "Foundation.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
4631832BC49B4F5DB6B3FA81 /* Ionicons.ttf */ = {isa = PBXFileReference; name = "Ionicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
5AC570600CDC4C0AA5759C55 /* MaterialIcons.ttf */ = {isa = PBXFileReference; name = "MaterialIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
4DAEB1CB9F1348D797E1464C /* Octicons.ttf */ = {isa = PBXFileReference; name = "Octicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
148C00397709478690F62517 /* Zocial.ttf */ = {isa = PBXFileReference; name = "Zocial.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
566B65EF0BD04AF6902AABF0 /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; name = "RNVectorIcons.xcodeproj"; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
DE88264F0EB0452CB4E4E02B /* libRNVectorIcons.a */ = {isa = PBXFileReference; name = "libRNVectorIcons.a"; path = "libRNVectorIcons.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
401AFB573606442D85F3E27D /* FontAwesome.ttf */ = {isa = PBXFileReference; name = "FontAwesome.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
D5BA628B686341C39CDD90A0 /* Ionicons.ttf */ = {isa = PBXFileReference; name = "Ionicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -168,7 +156,7 @@
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
C200FE733CDD4A2FB3603718 /* libRNVectorIcons.a in Frameworks */,
860316FB7AD2462C96E95300 /* libRNVectorIcons.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -215,13 +203,13 @@
name = Products;
sourceTree = "<group>";
};
00E356EF1AD99517003FC87E /* SphereTests */ = {
00E356EF1AD99517003FC87E /* sphereTests */ = {
isa = PBXGroup;
children = (
00E356F21AD99517003FC87E /* SphereTests.m */,
00E356F21AD99517003FC87E /* sphereTests.m */,
00E356F01AD99517003FC87E /* Supporting Files */,
);
path = SphereTests;
path = sphereTests;
sourceTree = "<group>";
};
00E356F01AD99517003FC87E /* Supporting Files */ = {
@ -248,7 +236,7 @@
name = Products;
sourceTree = "<group>";
};
13B07FAE1A68108700A75B9A /* Sphere */ = {
13B07FAE1A68108700A75B9A /* sphere */ = {
isa = PBXGroup;
children = (
008F07F21AC5B25A0029DE68 /* main.jsbundle */,
@ -259,7 +247,7 @@
13B07FB11A68108700A75B9A /* LaunchScreen.xib */,
13B07FB71A68108700A75B9A /* main.m */,
);
name = Sphere;
name = sphere;
sourceTree = "<group>";
};
146834001AC3E56700842450 /* Products */ = {
@ -291,7 +279,7 @@
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
0DCE331EC7744165A5CD6B84 /* RNVectorIcons.xcodeproj */,
566B65EF0BD04AF6902AABF0 /* RNVectorIcons.xcodeproj */,
);
name = Libraries;
sourceTree = "<group>";
@ -307,11 +295,11 @@
83CBB9F61A601CBA00E9B192 = {
isa = PBXGroup;
children = (
13B07FAE1A68108700A75B9A /* Sphere */,
13B07FAE1A68108700A75B9A /* sphere */,
832341AE1AAA6A7D00B99B32 /* Libraries */,
00E356EF1AD99517003FC87E /* SphereTests */,
00E356EF1AD99517003FC87E /* sphereTests */,
83CBBA001A601CBA00E9B192 /* Products */,
DEE0D7AAFCE944A5B0019454 /* Resources */,
6B49DF069B534108BE78A377 /* Resources */,
);
indentWidth = 2;
sourceTree = "<group>";
@ -320,23 +308,17 @@
83CBBA001A601CBA00E9B192 /* Products */ = {
isa = PBXGroup;
children = (
13B07F961A680F5B00A75B9A /* Sphere.app */,
00E356EE1AD99517003FC87E /* SphereTests.xctest */,
13B07F961A680F5B00A75B9A /* sphere.app */,
00E356EE1AD99517003FC87E /* sphereTests.xctest */,
);
name = Products;
sourceTree = "<group>";
};
DEE0D7AAFCE944A5B0019454 /* Resources */ = {
6B49DF069B534108BE78A377 /* Resources */ = {
isa = PBXGroup;
children = (
2D70717F7C164E6D907D6200 /* Entypo.ttf */,
17D44F59FD7144978682FF31 /* EvilIcons.ttf */,
90FC9AAE15B5475D990B70B1 /* FontAwesome.ttf */,
3BF762A1D1394762BECF4FD7 /* Foundation.ttf */,
4631832BC49B4F5DB6B3FA81 /* Ionicons.ttf */,
5AC570600CDC4C0AA5759C55 /* MaterialIcons.ttf */,
4DAEB1CB9F1348D797E1464C /* Octicons.ttf */,
148C00397709478690F62517 /* Zocial.ttf */,
401AFB573606442D85F3E27D /* FontAwesome.ttf */,
D5BA628B686341C39CDD90A0 /* Ionicons.ttf */,
);
name = Resources;
path = "";
@ -345,9 +327,9 @@
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
00E356ED1AD99517003FC87E /* SphereTests */ = {
00E356ED1AD99517003FC87E /* sphereTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "SphereTests" */;
buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "sphereTests" */;
buildPhases = (
00E356EA1AD99517003FC87E /* Sources */,
00E356EB1AD99517003FC87E /* Frameworks */,
@ -358,14 +340,14 @@
dependencies = (
00E356F51AD99517003FC87E /* PBXTargetDependency */,
);
name = SphereTests;
productName = SphereTests;
productReference = 00E356EE1AD99517003FC87E /* SphereTests.xctest */;
name = sphereTests;
productName = sphereTests;
productReference = 00E356EE1AD99517003FC87E /* sphereTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
13B07F861A680F5B00A75B9A /* Sphere */ = {
13B07F861A680F5B00A75B9A /* sphere */ = {
isa = PBXNativeTarget;
buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "Sphere" */;
buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "sphere" */;
buildPhases = (
13B07F871A680F5B00A75B9A /* Sources */,
13B07F8C1A680F5B00A75B9A /* Frameworks */,
@ -376,9 +358,9 @@
);
dependencies = (
);
name = Sphere;
name = sphere;
productName = "Hello World";
productReference = 13B07F961A680F5B00A75B9A /* Sphere.app */;
productReference = 13B07F961A680F5B00A75B9A /* sphere.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
@ -396,7 +378,7 @@
};
};
};
buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "Sphere" */;
buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "sphere" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
@ -451,8 +433,8 @@
);
projectRoot = "";
targets = (
13B07F861A680F5B00A75B9A /* Sphere */,
00E356ED1AD99517003FC87E /* SphereTests */,
13B07F861A680F5B00A75B9A /* sphere */,
00E356ED1AD99517003FC87E /* sphereTests */,
);
};
/* End PBXProject section */
@ -544,14 +526,8 @@
files = (
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
E989F1D1122D47C0BD857E8D /* Entypo.ttf in Resources */,
FA01A0D51D5B4A3BBE7E698A /* EvilIcons.ttf in Resources */,
7838A63045AB4CDA8E19E4FB /* FontAwesome.ttf in Resources */,
38211C72F97B4B7A94279CFF /* Foundation.ttf in Resources */,
F243A61034344F3284CBD1D0 /* Ionicons.ttf in Resources */,
8F081F518B154728AE83C449 /* MaterialIcons.ttf in Resources */,
5B68C27C8F36405E84BA3154 /* Octicons.ttf in Resources */,
A49DEBBF93AB45AE96992041 /* Zocial.ttf in Resources */,
775D82F3513F4674BA6A7A51 /* FontAwesome.ttf in Resources */,
692D0251A55F4FE6A9085813 /* Ionicons.ttf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -580,7 +556,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
00E356F31AD99517003FC87E /* SphereTests.m in Sources */,
00E356F31AD99517003FC87E /* sphereTests.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -598,7 +574,7 @@
/* Begin PBXTargetDependency section */
00E356F51AD99517003FC87E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 13B07F861A680F5B00A75B9A /* Sphere */;
target = 13B07F861A680F5B00A75B9A /* sphere */;
targetProxy = 00E356F41AD99517003FC87E /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
@ -610,7 +586,7 @@
13B07FB21A68108700A75B9A /* Base */,
);
name = LaunchScreen.xib;
path = Sphere;
path = sphere;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */
@ -628,11 +604,11 @@
"DEBUG=1",
"$(inherited)",
);
INFOPLIST_FILE = SphereTests/Info.plist;
INFOPLIST_FILE = sphereTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Sphere.app/Sphere";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/sphere.app/sphere";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
@ -649,11 +625,11 @@
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
INFOPLIST_FILE = SphereTests/Info.plist;
INFOPLIST_FILE = sphereTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Sphere.app/Sphere";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/sphere.app/sphere";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
@ -672,10 +648,10 @@
"$(SRCROOT)/../node_modules/react-native/React/**",
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
);
INFOPLIST_FILE = "Sphere/Info.plist";
INFOPLIST_FILE = "sphere/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = Sphere;
PRODUCT_NAME = sphere;
};
name = Debug;
};
@ -689,10 +665,10 @@
"$(SRCROOT)/../node_modules/react-native/React/**",
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
);
INFOPLIST_FILE = "Sphere/Info.plist";
INFOPLIST_FILE = "sphere/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = Sphere;
PRODUCT_NAME = sphere;
};
name = Release;
};
@ -787,7 +763,7 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "SphereTests" */ = {
00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "sphereTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
00E356F61AD99517003FC87E /* Debug */,
@ -796,7 +772,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "Sphere" */ = {
13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "sphere" */ = {
isa = XCConfigurationList;
buildConfigurations = (
13B07F941A680F5B00A75B9A /* Debug */,
@ -805,7 +781,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "Sphere" */ = {
83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "sphere" */ = {
isa = XCConfigurationList;
buildConfigurations = (
83CBBA201A601CBA00E9B192 /* Debug */,

View file

@ -15,9 +15,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "Sphere.app"
BlueprintName = "Sphere"
ReferencedContainer = "container:Sphere.xcodeproj">
BuildableName = "sphere.app"
BlueprintName = "sphere"
ReferencedContainer = "container:sphere.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
@ -29,9 +29,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "00E356ED1AD99517003FC87E"
BuildableName = "SphereTests.xctest"
BlueprintName = "SphereTests"
ReferencedContainer = "container:Sphere.xcodeproj">
BuildableName = "sphereTests.xctest"
BlueprintName = "sphereTests"
ReferencedContainer = "container:sphere.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
@ -47,9 +47,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "00E356ED1AD99517003FC87E"
BuildableName = "SphereTests.xctest"
BlueprintName = "SphereTests"
ReferencedContainer = "container:Sphere.xcodeproj">
BuildableName = "sphereTests.xctest"
BlueprintName = "sphereTests"
ReferencedContainer = "container:sphere.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
@ -57,9 +57,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "Sphere.app"
BlueprintName = "Sphere"
ReferencedContainer = "container:Sphere.xcodeproj">
BuildableName = "sphere.app"
BlueprintName = "sphere"
ReferencedContainer = "container:sphere.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
@ -77,9 +77,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "Sphere.app"
BlueprintName = "Sphere"
ReferencedContainer = "container:Sphere.xcodeproj">
BuildableName = "sphere.app"
BlueprintName = "sphere"
ReferencedContainer = "container:sphere.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
@ -96,9 +96,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "Sphere.app"
BlueprintName = "Sphere"
ReferencedContainer = "container:Sphere.xcodeproj">
BuildableName = "sphere.app"
BlueprintName = "sphere"
ReferencedContainer = "container:sphere.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>

View file

@ -36,13 +36,15 @@
/**
* OPTION 2
* Load from pre-bundled file on disk. The static bundle is automatically
* generated by "Bundle React Native code and images" build step.
* generated by the "Bundle React Native code and images" build step when
* running the project on an actual device or running the project on the
* simulator in the "Release" build configuration.
*/
// jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation
moduleName:@"Sphere"
moduleName:@"sphere"
initialProperties:nil
launchOptions:launchOptions];

View file

@ -18,7 +18,7 @@
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sphere" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="sphere" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
<rect key="frame" x="20" y="140" width="441" height="43"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>

View file

@ -45,14 +45,8 @@
</dict>
<key>UIAppFonts</key>
<array>
<string>Entypo.ttf</string>
<string>EvilIcons.ttf</string>
<string>FontAwesome.ttf</string>
<string>Foundation.ttf</string>
<string>Ionicons.ttf</string>
<string>MaterialIcons.ttf</string>
<string>Octicons.ttf</string>
<string>Zocial.ttf</string>
</array>
</dict>
</plist>

View file

@ -1,5 +1,5 @@
{
"name": "Sphere",
"name": "sphere",
"version": "0.0.0",
"private": true,
"scripts": {
@ -9,15 +9,16 @@
"link": "rnpm link"
},
"dependencies": {
"immutable": "=3.7.6",
"moment": "=2.11.2",
"immutable": "=3.8.1",
"moment": "=2.13.0",
"moment-duration-format": "=1.3.0",
"react-native": "=0.20.0",
"react-native-busy-indicator": "=1.0.6",
"react-native-gifted-listview": "0.0.12",
"react-native-modalbox": "=1.3.1",
"react-native-side-menu": "=0.18.0",
"react-native-vector-icons": "=1.2.1",
"react": "=0.14.8",
"react-native": "=0.24.1",
"react-native-busy-indicator": "git://github.com/RealOrangeOne/react-native-busy-indicator#99e8521dd980f902e187c89c35bfb318463c31fb",
"react-native-gifted-listview": "0.0.14",
"react-native-modalbox": "=1.3.2",
"react-native-side-menu": "=0.18.1",
"react-native-vector-icons": "=1.3.4",
"underscore": "=1.8.3",
"url": "=0.11.0",
"url-assembler": "=1.2.4"
@ -28,6 +29,6 @@
"eslint-config": "git://github.com/oleous/eslint-config.git",
"eslint-plugin-react": "=3.14.0",
"eslint-plugin-react-native": "=1.0.0",
"rnpm": "=1.4.1"
"rnpm": "=1.6.2"
}
}