Merge pull request #64 from ryancoughlin/rc-update-headers

Update iOS headers for RN 0.40.0

ActivityView.h

@@ -1,4 +1,4 @@
-#import "RCTBridgeModule.h"
+#import <React/RCTBridgeModule.h>
 
 @import UIKit;
 

ActivityView.m

@@ -1,8 +1,8 @@
 #import "ActivityView.h"
-#import "RCTLog.h"
-#import "RCTBridge.h"
-#import "RCTUIManager.h"
-#import "RCTImageLoader.h"
+#import <React/RCTLog.h>
+#import <React/RCTBridge.h>
+#import <React/RCTUIManager.h>
+#import <React/RCTImageLoader.h>
 
 @implementation ActivityView
 
@@ -74,24 +74,18 @@ - (NSArray*)excludedActivitiesForKeys:(NSArray*)passedKeys {
  return [self showWithOptions:args image:shareImage];
  }
 
- RCTImageLoader *loader = (RCTImageLoader*)[self.bridge moduleForClass:[RCTImageLoader class]];
 
  __weak ActivityView *weakSelf = self;
 
- [loader loadImageWithURLRequest:imageUrl callback:^(NSError *error, id imageOrData) {
+ [self.bridge.imageLoader loadImageWithURLRequest: [RCTConvert NSURLRequest: imageUrl]
+ callback:^(NSError *error, UIImage *image) {
  if (!error) {
- if ([imageOrData isKindOfClass:[NSData class]]) {
- shareImage = [UIImage imageWithData:imageOrData];
- } else {
- shareImage = imageOrData;
- }
+ dispatch_async([weakSelf methodQueue], ^{
+ [weakSelf showWithOptions:args image:image];
+ });
  } else {
  RCTLogWarn(@"[ActivityView] Could not fetch image.");
  }
-
- dispatch_async([weakSelf methodQueue], ^{
- [weakSelf showWithOptions:args image:shareImage];
- });
  }];
 }
 

examples/ActivityViewExample/index.ios.js

@@ -1,7 +1,7 @@
 'use strict';
-import React, {
+import React, { Component } from 'react';
+import {
  AppRegistry,
- Component,
  StyleSheet,
  Text,
  TouchableHighlight,

examples/ActivityViewExample/ios/ActivityViewExample.xcodeproj/project.pbxproj

@@ -89,6 +89,97 @@
  remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192;
  remoteInfo = React;
  };
+ 5DAFC3D31E82D499007CA362 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 2D2A283A1D9B042B00D4039D;
+ remoteInfo = "RCTImage-tvOS";
+ };
+ 5DAFC3D71E82D499007CA362 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 2D2A28471D9B043800D4039D;
+ remoteInfo = "RCTLinking-tvOS";
+ };
+ 5DAFC3DB1E82D499007CA362 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 2D2A28541D9B044C00D4039D;
+ remoteInfo = "RCTNetwork-tvOS";
+ };
+ 5DAFC3DF1E82D499007CA362 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 2D2A28611D9B046600D4039D;
+ remoteInfo = "RCTSettings-tvOS";
+ };
+ 5DAFC3E31E82D499007CA362 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 2D2A287B1D9B048500D4039D;
+ remoteInfo = "RCTText-tvOS";
+ };
+ 5DAFC3E81E82D499007CA362 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 2D2A28881D9B049200D4039D;
+ remoteInfo = "RCTWebSocket-tvOS";
+ };
+ 5DAFC3F21E82D499007CA362 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 2D2A28131D9B038B00D4039D;
+ remoteInfo = "React-tvOS";
+ };
+ 5DAFC3F41E82D499007CA362 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 3D3C059A1DE3340900C268FA;
+ remoteInfo = yoga;
+ };
+ 5DAFC3F61E82D499007CA362 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 3D3C06751DE3340C00C268FA;
+ remoteInfo = "yoga-tvOS";
+ };
+ 5DAFC3F81E82D499007CA362 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 3D3CD9251DE5FBEC00167DC4;
+ remoteInfo = cxxreact;
+ };
+ 5DAFC3FA1E82D499007CA362 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 3D3CD9321DE5FBEE00167DC4;
+ remoteInfo = "cxxreact-tvOS";
+ };
+ 5DAFC3FC1E82D499007CA362 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 3D3CD90B1DE5FBD600167DC4;
+ remoteInfo = jschelpers;
+ };
+ 5DAFC3FE1E82D499007CA362 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+ proxyType = 2;
+ remoteGlobalIDString = 3D3CD9181DE5FBD800167DC4;
+ remoteInfo = "jschelpers-tvOS";
+ };
  78C398B81ACF4ADC00677621 /* PBXContainerItemProxy */ = {
  isa = PBXContainerItemProxy;
  containerPortal = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */;
@@ -186,6 +277,7 @@
  isa = PBXGroup;
  children = (
  00C302C01ABCB91800DB3ED1 /* libRCTImage.a */,
+ 5DAFC3D41E82D499007CA362 /* libRCTImage-tvOS.a */,
  );
  name = Products;
  sourceTree = "<group>";
@@ -194,6 +286,7 @@
  isa = PBXGroup;
  children = (
  00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */,
+ 5DAFC3DC1E82D499007CA362 /* libRCTNetwork-tvOS.a */,
  );
  name = Products;
  sourceTree = "<group>";
@@ -227,6 +320,7 @@
  isa = PBXGroup;
  children = (
  139105C11AF99BAD00B5F7CC /* libRCTSettings.a */,
+ 5DAFC3E01E82D499007CA362 /* libRCTSettings-tvOS.a */,
  );
  name = Products;
  sourceTree = "<group>";
@@ -235,6 +329,7 @@
  isa = PBXGroup;
  children = (
  139FDEF41B06529B00C62182 /* libRCTWebSocket.a */,
+ 5DAFC3E91E82D499007CA362 /* libRCTWebSocket-tvOS.a */,
  );
  name = Products;
  sourceTree = "<group>";
@@ -257,6 +352,13 @@
  isa = PBXGroup;
  children = (
  146834041AC3E56700842450 /* libReact.a */,
+ 5DAFC3F31E82D499007CA362 /* libReact.a */,
+ 5DAFC3F51E82D499007CA362 /* libyoga.a */,
+ 5DAFC3F71E82D499007CA362 /* libyoga.a */,
+ 5DAFC3F91E82D499007CA362 /* libcxxreact.a */,
+ 5DAFC3FB1E82D499007CA362 /* libcxxreact.a */,
+ 5DAFC3FD1E82D499007CA362 /* libjschelpers.a */,
+ 5DAFC3FF1E82D499007CA362 /* libjschelpers.a */,
  );
  name = Products;
  sourceTree = "<group>";
@@ -265,6 +367,7 @@
  isa = PBXGroup;
  children = (
  78C398B91ACF4ADC00677621 /* libRCTLinking.a */,
+ 5DAFC3D81E82D499007CA362 /* libRCTLinking-tvOS.a */,
  );
  name = Products;
  sourceTree = "<group>";
@@ -291,6 +394,7 @@
  isa = PBXGroup;
  children = (
  832341B51AAA6A8300B99B32 /* libRCTText.a */,
+ 5DAFC3E41E82D499007CA362 /* libRCTText-tvOS.a */,
  );
  name = Products;
  sourceTree = "<group>";
@@ -500,6 +604,97 @@
  remoteRef = 146834031AC3E56700842450 /* PBXContainerItemProxy */;
  sourceTree = BUILT_PRODUCTS_DIR;
  };
+ 5DAFC3D41E82D499007CA362 /* libRCTImage-tvOS.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = "libRCTImage-tvOS.a";
+ remoteRef = 5DAFC3D31E82D499007CA362 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ 5DAFC3D81E82D499007CA362 /* libRCTLinking-tvOS.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = "libRCTLinking-tvOS.a";
+ remoteRef = 5DAFC3D71E82D499007CA362 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ 5DAFC3DC1E82D499007CA362 /* libRCTNetwork-tvOS.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = "libRCTNetwork-tvOS.a";
+ remoteRef = 5DAFC3DB1E82D499007CA362 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ 5DAFC3E01E82D499007CA362 /* libRCTSettings-tvOS.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = "libRCTSettings-tvOS.a";
+ remoteRef = 5DAFC3DF1E82D499007CA362 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ 5DAFC3E41E82D499007CA362 /* libRCTText-tvOS.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = "libRCTText-tvOS.a";
+ remoteRef = 5DAFC3E31E82D499007CA362 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ 5DAFC3E91E82D499007CA362 /* libRCTWebSocket-tvOS.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = "libRCTWebSocket-tvOS.a";
+ remoteRef = 5DAFC3E81E82D499007CA362 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ 5DAFC3F31E82D499007CA362 /* libReact.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = libReact.a;
+ remoteRef = 5DAFC3F21E82D499007CA362 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ 5DAFC3F51E82D499007CA362 /* libyoga.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = libyoga.a;
+ remoteRef = 5DAFC3F41E82D499007CA362 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ 5DAFC3F71E82D499007CA362 /* libyoga.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = libyoga.a;
+ remoteRef = 5DAFC3F61E82D499007CA362 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ 5DAFC3F91E82D499007CA362 /* libcxxreact.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = libcxxreact.a;
+ remoteRef = 5DAFC3F81E82D499007CA362 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ 5DAFC3FB1E82D499007CA362 /* libcxxreact.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = libcxxreact.a;
+ remoteRef = 5DAFC3FA1E82D499007CA362 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ 5DAFC3FD1E82D499007CA362 /* libjschelpers.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = libjschelpers.a;
+ remoteRef = 5DAFC3FC1E82D499007CA362 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ 5DAFC3FF1E82D499007CA362 /* libjschelpers.a */ = {
+ isa = PBXReferenceProxy;
+ fileType = archive.ar;
+ path = libjschelpers.a;
+ remoteRef = 5DAFC3FE1E82D499007CA362 /* PBXContainerItemProxy */;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
  78C398B91ACF4ADC00677621 /* libRCTLinking.a */ = {
  isa = PBXReferenceProxy;
  fileType = archive.ar;
@@ -648,8 +843,12 @@
  "$(SRCROOT)/../node_modules/react-native/React/**",
  );
  INFOPLIST_FILE = ActivityViewExample/Info.plist;
+ IPHONEOS_DEPLOYMENT_TARGET = 10.0;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
- OTHER_LDFLAGS = "-ObjC";
+ OTHER_LDFLAGS = (
+ "-ObjC",
+ "-lc++",
+ );
  PRODUCT_NAME = ActivityViewExample;
  };
  name = Debug;
@@ -664,8 +863,12 @@
  "$(SRCROOT)/../node_modules/react-native/React/**",
  );
  INFOPLIST_FILE = ActivityViewExample/Info.plist;
+ IPHONEOS_DEPLOYMENT_TARGET = 10.0;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
- OTHER_LDFLAGS = "-ObjC";
+ OTHER_LDFLAGS = (
+ "-ObjC",
+ "-lc++",
+ );
  PRODUCT_NAME = ActivityViewExample;
  };
  name = Release;