From eaf12e904af45e941df497efb68e66cfd35ba1a0 Mon Sep 17 00:00:00 2001 From: Geoffrey Goh Date: Tue, 6 Oct 2015 20:21:59 -0700 Subject: [PATCH] fix update issues --- .DS_Store | Bin 0 -> 8196 bytes Examples/.DS_Store | Bin 0 -> 6148 bytes .../CodePushDemoApp.xcodeproj/project.pbxproj | 4 ---- .../CodePushDemoAppTests/ApplyUpdateTests.m | 15 ++++++++++++--- Examples/CodePushDemoApp/iOS/AppDelegate.m | 1 + scripts/.DS_Store | Bin 0 -> 6148 bytes 6 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 .DS_Store create mode 100644 Examples/.DS_Store create mode 100644 scripts/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..0f7ec1948eeb918bfbabf604893f73bd83c98448 GIT binary patch literal 8196 zcmeHM-A)rh6h0#$Eua?BNaD?2Vgdw0_`53wOt>IvsDT(Uwe7BSvFz4%OKS*8Z@lpd zxc2`!{JZi2^bL3fy~6LzPRVw+jR`>`ai*C$`*XfCGvCZPyJt&8B2_b|iAISihRQNA zh^9l~`&=XClDfiR0X$KLJaVZ*)>Gy|Fe&46Y=Gw?4kfM+(BSeNI%e^!GO1+Kml6t_e)b>~RHzg~_;B1e zSRFE{WYd>EoP-Z2p?Vf7LlLrf;0&owBI!%rY6dg|Q3g17kJBWrAa~CO^LMw9FS&W# zWrz9-hdMryMVjaZVux(<)=F)9cX4+tpf}LcgYFJFt#1Qu7}%yU)S;6TX`3+)m1(a# zMr?%o8KGs^Hp!wi)u>8E*vP?(iEj}u?3g&;rE2?V#kY`^feu!R?HJ-29tCE2tpmnJ zpVdx1GLLkG+IKqF=(zXVdz5nx_ISNRj}0oQ`IqI4cSAOKra>Ethz%ZxLyslrlN1^Q z&sxL+vmTD%)8M;6PtfjQ6`~e+2L&y}Xq6h!-or|lfC#S*R#=AgtBR?Je!gBUs~!3? zUoP2IZ))nhxYX0zcey_n9~k6cVtC+Trs&o)Ue2pkQ@P3md1jkdULB`%Ua@t2&vi?u z$GQBbZPl}h8_TZaUPGrw`H4NF`KxVu2}nkrgM(9X;aNIbUUzi&=W)~L^4-?O0vD4_~}|_4>`* zcke%b#0{LT^B$sCzJQP7RXk^A5)4stC!%wfGvC>n^Ubi|B=Z9RtUZXf09*iY&JM(#8&!gd_})EQHBw~ zO*p`Ljv$6E44{BM@?&_7b^DM(c9hJq4~dP=CKDnrV~4{cGh=@bvqTi-=H@q6Td7~W ze#2?3uF>P(T7B;K<4M8&u9HRw8wyjSWB**G1M@W6 z(kfsTm{(v$zq+*lKl=Usf1YIDtO8bne@X#X@A#cIev;W+7e0>mT8{n#os9A-jWY@c jYAeQE+KM;Om0>-n0MRp8X~Y^ddk|1E*upCCM-})1RVssg literal 0 HcmV?d00001 diff --git a/Examples/CodePushDemoApp/CodePushDemoApp.xcodeproj/project.pbxproj b/Examples/CodePushDemoApp/CodePushDemoApp.xcodeproj/project.pbxproj index 10fbdaa..0d3a903 100644 --- a/Examples/CodePushDemoApp/CodePushDemoApp.xcodeproj/project.pbxproj +++ b/Examples/CodePushDemoApp/CodePushDemoApp.xcodeproj/project.pbxproj @@ -25,7 +25,6 @@ 5451ACBA1B86A5B600E2A7DF /* QueryUpdateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5451ACB81B86A5B600E2A7DF /* QueryUpdateTests.m */; }; 5451ACEC1B86E40A00E2A7DF /* libRCTTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5451ACEB1B86E34300E2A7DF /* libRCTTest.a */; }; 54D774BA1B87DAF800F2ABF8 /* ApplyUpdateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 54D774B91B87DAF800F2ABF8 /* ApplyUpdateTests.m */; }; - 810D4E6F1BA0E99300B397E9 /* main.jsbundle in Resources */ = {isa = PBXBuildFile; fileRef = 810D4E6E1BA0E99300B397E9 /* main.jsbundle */; }; 81551E1B1B3B428000F5B9F1 /* libCodePush.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 81551E0F1B3B427200F5B9F1 /* libCodePush.a */; }; /* End PBXBuildFile section */ @@ -153,7 +152,6 @@ 5451ACE61B86E34300E2A7DF /* RCTTest.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTTest.xcodeproj; path = "node_modules/react-native/Libraries/RCTTest/RCTTest.xcodeproj"; sourceTree = ""; }; 54D774B91B87DAF800F2ABF8 /* ApplyUpdateTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ApplyUpdateTests.m; sourceTree = ""; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; - 810D4E6E1BA0E99300B397E9 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = main.jsbundle; path = iOS/main.jsbundle; sourceTree = ""; }; 81551E0A1B3B427200F5B9F1 /* CodePush.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CodePush.xcodeproj; path = ../../CodePush.xcodeproj; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -274,7 +272,6 @@ 13B07FAE1A68108700A75B9A /* CodePushDemoApp */ = { isa = PBXGroup; children = ( - 810D4E6E1BA0E99300B397E9 /* main.jsbundle */, 13B07FAF1A68108700A75B9A /* AppDelegate.h */, 13B07FB01A68108700A75B9A /* AppDelegate.m */, 13B07FB51A68108700A75B9A /* Images.xcassets */, @@ -598,7 +595,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 810D4E6F1BA0E99300B397E9 /* main.jsbundle in Resources */, 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */, ); diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/ApplyUpdateTests.m b/Examples/CodePushDemoApp/CodePushDemoAppTests/ApplyUpdateTests.m index acaeda8..5375dd5 100644 --- a/Examples/CodePushDemoApp/CodePushDemoAppTests/ApplyUpdateTests.m +++ b/Examples/CodePushDemoApp/CodePushDemoAppTests/ApplyUpdateTests.m @@ -8,6 +8,7 @@ #import "RCTRootView.h" #import "RCTRedBox.h" #import "RCTAssert.h" +#import "RCTLog.h" #define FB_REFERENCE_IMAGE_DIR "\"$(SOURCE_ROOT)/$(PROJECT_NAME)Tests/ReferenceImages\"" @@ -66,16 +67,24 @@ RCTBridge *bridge = [[RCTBridge alloc] initWithBundleURL:scriptURL moduleProvider:nil launchOptions:nil]; - RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge moduleName:@"DownloadAndApplyUpdateTest"]; + RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge + moduleName:@"DownloadAndApplyUpdateTest" + initialProperties:nil]; NSDate *date = [NSDate dateWithTimeIntervalSinceNow:TIMEOUT_SECONDS]; BOOL foundElement = NO; - NSString *redboxError = nil; + + __block NSString *redboxError = nil; + RCTSetLogFunction(^(RCTLogLevel level, NSString *fileName, NSNumber *lineNumber, NSString *message) { + if (level >= RCTLogLevelError) { + redboxError = message; + } + }); while ([date timeIntervalSinceNow] > 0 && !foundElement && !redboxError) { [[NSRunLoop mainRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]]; [[NSRunLoop mainRunLoop] runMode:NSRunLoopCommonModes beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]]; - redboxError = [[RCTRedBox sharedInstance] currentErrorMessage]; + UIViewController *vc = [UIApplication sharedApplication].delegate.window.rootViewController; foundElement = [self findSubviewInView:vc.view matching:^BOOL(UIView *view) { if ([NSStringFromClass([view class]) isEqualToString:@"RCTText"]){ diff --git a/Examples/CodePushDemoApp/iOS/AppDelegate.m b/Examples/CodePushDemoApp/iOS/AppDelegate.m index 0182a28..7db6178 100644 --- a/Examples/CodePushDemoApp/iOS/AppDelegate.m +++ b/Examples/CodePushDemoApp/iOS/AppDelegate.m @@ -49,6 +49,7 @@ RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation moduleName:@"CodePushDemoApp" + initialProperties:nil launchOptions:launchOptions]; self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; diff --git a/scripts/.DS_Store b/scripts/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..986b34cb7d0037a5adff5d9571af2d8e4388cfcf GIT binary patch literal 6148 zcmeHKu};H441Id?5b>@Amp}zzOck1(0nzZ_)KLjOCYsk+VuCqdA^aPnwV$HF2G3}H-P`rA z@ql-%aY6fZ({_ud?HWdls%z@`rwct*P~;pd+6mt1E$~A7$QrA`3LkqFDzDHn_n>^c z-OJZ1LV|%{AQ%V+f`LOA;F&EMpJWUh37K3-%c~L$RDn%&Asd49n>pPbID{*k{b?u+n^3dGoe;F@HPjCl80!8N&tx!N4v9 z>U}Ad&i^a^GJ{RNhlB|Rf`R|afQ@E%vnju>oUK2;Q)g|W-cu!t>*Y}B?_2`-pnc@b dC-Z!g&$zl^pHWpb?&-w12sj~Of`MOP;0tWIJtzPG literal 0 HcmV?d00001