Merge pull request #52 from balmasich/RN-0.40.0

Update React Native version to 0.40.0
2017-01-05 13:43:04 +01:00 · 2017-01-05 13:43:04 +01:00 · a6ae286347
parent f6563f1457 448d3be134
commit a6ae286347
4 changed files with 157 additions and 9 deletions
--- a/RNI18n.podspec
+++ b/RNI18n.podspec
@ -8,7 +8,7 @@ Pod::Spec.new do |s|
  s.summary         = "React Native + i18n.js"
  s.license         = "MIT"
  s.author          = { "Alexander Zaytsev" => "alexander@say26.com" }
-  s.platform        = :ios, "7.0"
+  s.platform        = :ios, "8.0"
  s.source          = { git: "https://github.com/AlexanderZaytsev/react-native-i18n.git", tag: s.version.to_s }
  s.source_files    = 'RNI18n/*.{h,m}'
  s.preserve_paths  = "**/*.js"
--- a/RNI18n.xcodeproj/project.pbxproj
+++ b/RNI18n.xcodeproj/project.pbxproj
@ -13,6 +13,62 @@
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
+		1A54B20B1E1E5E84000AD278 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 1A54B2001E1E5E84000AD278 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192;
+			remoteInfo = React;
+		};
+		1A54B20D1E1E5E84000AD278 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 1A54B2001E1E5E84000AD278 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 2D2A28131D9B038B00D4039D;
+			remoteInfo = "React-tvOS";
+		};
+		1A54B20F1E1E5E84000AD278 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 1A54B2001E1E5E84000AD278 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 3D3C059A1DE3340900C268FA;
+			remoteInfo = yoga;
+		};
+		1A54B2111E1E5E84000AD278 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 1A54B2001E1E5E84000AD278 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 3D3C06751DE3340C00C268FA;
+			remoteInfo = "yoga-tvOS";
+		};
+		1A54B2131E1E5E84000AD278 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 1A54B2001E1E5E84000AD278 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 3D3CD9251DE5FBEC00167DC4;
+			remoteInfo = cxxreact;
+		};
+		1A54B2151E1E5E84000AD278 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 1A54B2001E1E5E84000AD278 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 3D3CD9321DE5FBEE00167DC4;
+			remoteInfo = "cxxreact-tvOS";
+		};
+		1A54B2171E1E5E84000AD278 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 1A54B2001E1E5E84000AD278 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 3D3CD90B1DE5FBD600167DC4;
+			remoteInfo = jschelpers;
+		};
+		1A54B2191E1E5E84000AD278 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 1A54B2001E1E5E84000AD278 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 3D3CD9181DE5FBD800167DC4;
+			remoteInfo = "jschelpers-tvOS";
+		};
 		CDD7BF851B2D5126006FDA75 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = CDD7BF701B2D5125006FDA75 /* Project object */;
@ -36,6 +92,7 @@
 /* End PBXCopyFilesBuildPhase section */

 /* Begin PBXFileReference section */
+		1A54B2001E1E5E84000AD278 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; };
 		CDD7BF781B2D5125006FDA75 /* libRNI18n.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNI18n.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		CDD7BF7B1B2D5125006FDA75 /* RNI18n.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNI18n.h; sourceTree = "<group>"; };
 		CDD7BF7D1B2D5125006FDA75 /* RNI18n.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNI18n.m; sourceTree = "<group>"; };
@ -61,11 +118,35 @@
 /* End PBXFrameworksBuildPhase section */

 /* Begin PBXGroup section */
+		1A54B1E41E1E5BED000AD278 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				1A54B2001E1E5E84000AD278 /* React.xcodeproj */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		1A54B2011E1E5E84000AD278 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				1A54B20C1E1E5E84000AD278 /* libReact.a */,
+				1A54B20E1E1E5E84000AD278 /* libReact.a */,
+				1A54B2101E1E5E84000AD278 /* libyoga.a */,
+				1A54B2121E1E5E84000AD278 /* libyoga.a */,
+				1A54B2141E1E5E84000AD278 /* libcxxreact.a */,
+				1A54B2161E1E5E84000AD278 /* libcxxreact.a */,
+				1A54B2181E1E5E84000AD278 /* libjschelpers.a */,
+				1A54B21A1E1E5E84000AD278 /* libjschelpers.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		CDD7BF6F1B2D5125006FDA75 = {
 			isa = PBXGroup;
 			children = (
 				CDD7BF7A1B2D5125006FDA75 /* RNI18n */,
 				CDD7BF791B2D5125006FDA75 /* Products */,
+				1A54B1E41E1E5BED000AD278 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@ -152,6 +233,12 @@
 			mainGroup = CDD7BF6F1B2D5125006FDA75;
 			productRefGroup = CDD7BF791B2D5125006FDA75 /* Products */;
 			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = 1A54B2011E1E5E84000AD278 /* Products */;
+					ProjectRef = 1A54B2001E1E5E84000AD278 /* React.xcodeproj */;
+				},
+			);
 			projectRoot = "";
 			targets = (
 				CDD7BF771B2D5125006FDA75 /* RNI18n */,
@ -160,6 +247,65 @@
 		};
 /* End PBXProject section */

+/* Begin PBXReferenceProxy section */
+		1A54B20C1E1E5E84000AD278 /* libReact.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libReact.a;
+			remoteRef = 1A54B20B1E1E5E84000AD278 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		1A54B20E1E1E5E84000AD278 /* libReact.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libReact.a;
+			remoteRef = 1A54B20D1E1E5E84000AD278 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		1A54B2101E1E5E84000AD278 /* libyoga.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libyoga.a;
+			remoteRef = 1A54B20F1E1E5E84000AD278 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		1A54B2121E1E5E84000AD278 /* libyoga.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libyoga.a;
+			remoteRef = 1A54B2111E1E5E84000AD278 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		1A54B2141E1E5E84000AD278 /* libcxxreact.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libcxxreact.a;
+			remoteRef = 1A54B2131E1E5E84000AD278 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		1A54B2161E1E5E84000AD278 /* libcxxreact.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libcxxreact.a;
+			remoteRef = 1A54B2151E1E5E84000AD278 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		1A54B2181E1E5E84000AD278 /* libjschelpers.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libjschelpers.a;
+			remoteRef = 1A54B2171E1E5E84000AD278 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		1A54B21A1E1E5E84000AD278 /* libjschelpers.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libjschelpers.a;
+			remoteRef = 1A54B2191E1E5E84000AD278 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
 /* Begin PBXResourcesBuildPhase section */
 		CDD7BF811B2D5126006FDA75 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
@ -232,6 +378,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@ -268,6 +415,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
@ -280,9 +428,9 @@
 			buildSettings = {
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
+					"$(BUILT_PRODUCTS_DIR)/include/*.*",
+					"$(BUILT_PRODUCTS_DIR)/usr/local/include/**",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/node_modules/react-native/React/**",
-					"$(SRCROOT)/../react-native/React/**",
 				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@ -295,9 +443,9 @@
 			buildSettings = {
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
+					"$(BUILT_PRODUCTS_DIR)/include/*.*",
+					"$(BUILT_PRODUCTS_DIR)/usr/local/include/**",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/node_modules/react-native/React/**",
-					"$(SRCROOT)/../react-native/React/**",
 				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
--- a/RNI18n/RNI18n.h
+++ b/RNI18n/RNI18n.h
@ -7,8 +7,8 @@
 //

 #import <Foundation/Foundation.h>
-#import "RCTBridgeModule.h"
-#import "RCTLog.h"
+#import <React/RCTBridgeModule.h>
+#import <React/RCTLog.h>

@interface RNI18n : NSObject <RCTBridgeModule>
@end
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "react-native-i18n",
-  "version": "0.1.1",
+  "version": "1.0.0",
  "description": "React Native and I18n.js integration",
  "main": "index.js",
  "repository": {
@ -16,6 +16,6 @@
  "author": "Alexander Zaytsev",
  "license": "MIT",
  "devDependencies": {
-    "react-native": "^0.5.0"
+    "react-native": "^0.40.0"
  }
 }