Skip to content

Commit

Permalink
Update to React Native 0.39. This required updating React and linking…
Browse files Browse the repository at this point in the history 
… RCTAnimation (see facebook/react-native#11094 (comment))
  • Loading branch information
@ianfisk
ianfisk committed Jan 2, 2017
1 parent afceb7c commit db92c9e
Show file tree
Hide file tree
Showing 2 changed files with 152 additions and 2 deletions.
150 changes: 150 additions & 0 deletions ios/iCharts.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
2110AD2B1DC98FF2004193C6 /* IChartsMapManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2110AD2A1DC98FF2004193C6 /* IChartsMapManager.m */; };
2110AD6A1DC9ADC3004193C6 /* IChartsMap.m in Sources */ = {isa = PBXBuildFile; fileRef = 2110AD691DC9ADC3004193C6 /* IChartsMap.m */; };
2110B73E1DD06E82004193C6 /* IChartsTileOverlay.m in Sources */ = {isa = PBXBuildFile; fileRef = 2110B73D1DD06E82004193C6 /* IChartsTileOverlay.m */; };
21A3B2C41E1B0A87002CB252 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 21A3B29F1E1B0A2F002CB252 /* libRCTAnimation.a */; };
21D8A8F71DB30A0B0026CB03 /* libBVLinearGradient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 21D8A8F61DB309F00026CB03 /* libBVLinearGradient.a */; };
29E9CFB9787743C89C941070 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BE418D7F803047248B4C6312 /* Zocial.ttf */; };
2D898ADDFAFD4A28BFCEDAF0 /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8F98503D09ED4FAAAAE8C619 /* Foundation.ttf */; };
Expand Down Expand Up @@ -114,6 +115,69 @@
remoteGlobalIDString = F60690131CA2766F0003FB26;
remoteInfo = RealmReact;
};
21A3B29E1E1B0A2F002CB252 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 21A3B2971E1B0A2F002CB252 /* RCTAnimation.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 134814201AA4EA6300B7C361;
remoteInfo = RCTAnimation;
};
21A3B2A01E1B0A2F002CB252 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 21A3B2971E1B0A2F002CB252 /* RCTAnimation.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 2D2A28201D9B03D100D4039D;
remoteInfo = "RCTAnimation-tvOS";
};
21A3B2A51E1B0A2F002CB252 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 2D2A283A1D9B042B00D4039D;
remoteInfo = "RCTImage-tvOS";
};
21A3B2A91E1B0A2F002CB252 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 2D2A28471D9B043800D4039D;
remoteInfo = "RCTLinking-tvOS";
};
21A3B2AD1E1B0A2F002CB252 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 2D2A28541D9B044C00D4039D;
remoteInfo = "RCTNetwork-tvOS";
};
21A3B2B11E1B0A2F002CB252 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 2D2A28611D9B046600D4039D;
remoteInfo = "RCTSettings-tvOS";
};
21A3B2B51E1B0A2F002CB252 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 2D2A287B1D9B048500D4039D;
remoteInfo = "RCTText-tvOS";
};
21A3B2BA1E1B0A2F002CB252 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 2D2A28881D9B049200D4039D;
remoteInfo = "RCTWebSocket-tvOS";
};
21A3B2BE1E1B0A2F002CB252 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 2D2A28131D9B038B00D4039D;
remoteInfo = "React-tvOS";
};
21D8A8F51DB309F00026CB03 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 21D8A8F11DB309F00026CB03 /* BVLinearGradient.xcodeproj */;
Expand Down Expand Up @@ -187,6 +251,7 @@
2110AD691DC9ADC3004193C6 /* IChartsMap.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IChartsMap.m; sourceTree = "<group>"; };
2110B73C1DD06E82004193C6 /* IChartsTileOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IChartsTileOverlay.h; sourceTree = "<group>"; };
2110B73D1DD06E82004193C6 /* IChartsTileOverlay.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IChartsTileOverlay.m; sourceTree = "<group>"; };
21A3B2971E1B0A2F002CB252 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
21D8A8F11DB309F00026CB03 /* BVLinearGradient.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = BVLinearGradient.xcodeproj; path = "../node_modules/react-native-linear-gradient/BVLinearGradient.xcodeproj"; sourceTree = "<group>"; };
2A429082DEB64B568F4B42D5 /* MaterialIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = "<group>"; };
2CE0ADD1651342F0824D5409 /* libRealmReact.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRealmReact.a; sourceTree = "<group>"; };
Expand Down Expand Up @@ -228,6 +293,7 @@
133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */,
00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */,
139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */,
21A3B2C41E1B0A87002CB252 /* libRCTAnimation.a in Frameworks */,
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
Expand Down Expand Up @@ -263,6 +329,7 @@
isa = PBXGroup;
children = (
00C302C01ABCB91800DB3ED1 /* libRCTImage.a */,
21A3B2A61E1B0A2F002CB252 /* libRCTImage-tvOS.a */,
);
name = Products;
sourceTree = "<group>";
Expand All @@ -271,6 +338,7 @@
isa = PBXGroup;
children = (
00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */,
21A3B2AE1E1B0A2F002CB252 /* libRCTNetwork-tvOS.a */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -304,6 +372,7 @@
isa = PBXGroup;
children = (
139105C11AF99BAD00B5F7CC /* libRCTSettings.a */,
21A3B2B21E1B0A2F002CB252 /* libRCTSettings-tvOS.a */,
);
name = Products;
sourceTree = "<group>";
Expand All @@ -312,6 +381,7 @@
isa = PBXGroup;
children = (
139FDEF41B06529B00C62182 /* libRCTWebSocket.a */,
21A3B2BB1E1B0A2F002CB252 /* libRCTWebSocket-tvOS.a */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -340,6 +410,7 @@
isa = PBXGroup;
children = (
146834041AC3E56700842450 /* libReact.a */,
21A3B2BF1E1B0A2F002CB252 /* libReact-tvOS.a */,
);
name = Products;
sourceTree = "<group>";
Expand All @@ -352,6 +423,15 @@
name = Products;
sourceTree = "<group>";
};
21A3B2981E1B0A2F002CB252 /* Products */ = {
isa = PBXGroup;
children = (
21A3B29F1E1B0A2F002CB252 /* libRCTAnimation.a */,
21A3B2A11E1B0A2F002CB252 /* libRCTAnimation-tvOS.a */,
);
name = Products;
sourceTree = "<group>";
};
21D8A8F21DB309F00026CB03 /* Products */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -388,13 +468,15 @@
isa = PBXGroup;
children = (
78C398B91ACF4ADC00677621 /* libRCTLinking.a */,
21A3B2AA1E1B0A2F002CB252 /* libRCTLinking-tvOS.a */,
);
name = Products;
sourceTree = "<group>";
};
832341AE1AAA6A7D00B99B32 /* Libraries */ = {
isa = PBXGroup;
children = (
21A3B2971E1B0A2F002CB252 /* RCTAnimation.xcodeproj */,
21D8A8F11DB309F00026CB03 /* BVLinearGradient.xcodeproj */,
146833FF1AC3E56700842450 /* React.xcodeproj */,
00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */,
Expand All @@ -418,6 +500,7 @@
isa = PBXGroup;
children = (
832341B51AAA6A8300B99B32 /* libRCTText.a */,
21A3B2B61E1B0A2F002CB252 /* libRCTText-tvOS.a */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -547,6 +630,10 @@
ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */;
ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */;
},
{
ProductGroup = 21A3B2981E1B0A2F002CB252 /* Products */;
ProjectRef = 21A3B2971E1B0A2F002CB252 /* RCTAnimation.xcodeproj */;
},
{
ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */;
ProjectRef = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */;
Expand Down Expand Up @@ -672,6 +759,69 @@
remoteRef = 214A71F91DDD8741006B3227 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
21A3B29F1E1B0A2F002CB252 /* libRCTAnimation.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libRCTAnimation.a;
remoteRef = 21A3B29E1E1B0A2F002CB252 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
21A3B2A11E1B0A2F002CB252 /* libRCTAnimation-tvOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libRCTAnimation-tvOS.a";
remoteRef = 21A3B2A01E1B0A2F002CB252 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
21A3B2A61E1B0A2F002CB252 /* libRCTImage-tvOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libRCTImage-tvOS.a";
remoteRef = 21A3B2A51E1B0A2F002CB252 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
21A3B2AA1E1B0A2F002CB252 /* libRCTLinking-tvOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libRCTLinking-tvOS.a";
remoteRef = 21A3B2A91E1B0A2F002CB252 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
21A3B2AE1E1B0A2F002CB252 /* libRCTNetwork-tvOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libRCTNetwork-tvOS.a";
remoteRef = 21A3B2AD1E1B0A2F002CB252 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
21A3B2B21E1B0A2F002CB252 /* libRCTSettings-tvOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libRCTSettings-tvOS.a";
remoteRef = 21A3B2B11E1B0A2F002CB252 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
21A3B2B61E1B0A2F002CB252 /* libRCTText-tvOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libRCTText-tvOS.a";
remoteRef = 21A3B2B51E1B0A2F002CB252 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
21A3B2BB1E1B0A2F002CB252 /* libRCTWebSocket-tvOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libRCTWebSocket-tvOS.a";
remoteRef = 21A3B2BA1E1B0A2F002CB252 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
21A3B2BF1E1B0A2F002CB252 /* libReact-tvOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libReact-tvOS.a";
remoteRef = 21A3B2BE1E1B0A2F002CB252 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
21D8A8F61DB309F00026CB03 /* libBVLinearGradient.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"start": "node node_modules/react-native/local-cli/cli.js start"
},
"dependencies": {
"react": "15.3.1",
"react-native": "^0.35.0",
"react": "^15.4.1",
"react-native": "^0.39.2",
"react-native-fetch-blob": "^0.10.0",
"react-native-linear-gradient": "^1.5.13",
"react-native-vector-icons": "^2.1.0",
Expand Down

0 comments on commit db92c9e

Please sign in to comment.