From c9f9279ac1711bcfbccc01c0c8f642d14257e51a Mon Sep 17 00:00:00 2001 From: Will Anderson Date: Wed, 12 Aug 2015 13:49:10 -0700 Subject: [PATCH 1/2] Upgrade react-native to 0.8.0 --- Examples/HybridMobileDeployCompanion/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/HybridMobileDeployCompanion/package.json b/Examples/HybridMobileDeployCompanion/package.json index d224cac..793c3eb 100644 --- a/Examples/HybridMobileDeployCompanion/package.json +++ b/Examples/HybridMobileDeployCompanion/package.json @@ -6,7 +6,7 @@ "start": "node_modules/react-native/packager/packager.sh --root ../../" }, "dependencies": { - "react-native": "^0.8.0-rc", + "react-native": "^0.8.0", "react-native-button": "^1.2.0", "react-native-hybrid-mobile-deploy": "file:../../" } diff --git a/package.json b/package.json index 11c7304..37ad02b 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,6 @@ "semver": "^4.3.6" }, "devDependencies": { - "react-native": "^0.8.0-rc" + "react-native": "^0.8.0" } } From b5b2788dfb5a4e1ec4f9cf93b2287a549e318437 Mon Sep 17 00:00:00 2001 From: Will Anderson Date: Wed, 12 Aug 2015 14:24:47 -0700 Subject: [PATCH 2/2] Simplify reload bundle function --- HybridMobileDeploy.m | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/HybridMobileDeploy.m b/HybridMobileDeploy.m index 52c9e83..d111eb7 100644 --- a/HybridMobileDeploy.m +++ b/HybridMobileDeploy.m @@ -1,5 +1,6 @@ #import "HybridMobileDeploy.h" +#import "RCTBridgeModule.h" #import "RCTRootView.h" #import "RCTUtils.h" @@ -7,6 +8,10 @@ RCT_EXPORT_MODULE() +RCTBridge * _bridge; + +@synthesize bridge = _bridge; + + (NSString *) getBundleFolderPath { NSString* home = NSHomeDirectory(); @@ -38,16 +43,11 @@ RCT_EXPORT_MODULE() } } -+ (void) loadBundle:(NSString*)rootComponent +- (void) reloadBundle { dispatch_async(dispatch_get_main_queue(), ^{ - RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:[self getBundleUrl] - moduleName:rootComponent - launchOptions:nil]; - - UIViewController *rootViewController = [[UIViewController alloc] init]; - rootViewController.view = rootView; - [UIApplication sharedApplication].delegate.window.rootViewController = rootViewController; + self.bridge.bundleURL = [HybridMobileDeploy getBundleUrl]; + [self.bridge reload]; }); } @@ -85,7 +85,7 @@ RCT_EXPORT_METHOD(installUpdateFromUrl:(NSString*)updateUrl // TODO send file path callback(@[RCTMakeError(@"Error saving file", err, [[NSDictionary alloc] initWithObjectsAndKeys:[HybridMobileDeploy getBundlePath],@"bundlePath", nil])]); } else { - [HybridMobileDeploy loadBundle:[HybridMobileDeployConfig getRootComponent]]; + [self reloadBundle]; callback(@[[NSNull null]]); } });