From 352cc10f4586b9f4b5175c953ae24c1b26d84f7c Mon Sep 17 00:00:00 2001 From: sgrebnov Date: Mon, 26 Oct 2015 14:23:27 +0300 Subject: [PATCH 1/7] CB-9690 Can't submit iPad apps to the App Store for iOS 9 This closes #167 --- .../project/__PROJECT_NAME__/__PROJECT_NAME__-Info.plist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/templates/project/__PROJECT_NAME__/__PROJECT_NAME__-Info.plist b/bin/templates/project/__PROJECT_NAME__/__PROJECT_NAME__-Info.plist index c4059b7528..e78f6c629a 100644 --- a/bin/templates/project/__PROJECT_NAME__/__PROJECT_NAME__-Info.plist +++ b/bin/templates/project/__PROJECT_NAME__/__PROJECT_NAME__-Info.plist @@ -99,6 +99,8 @@ UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeRight + UIRequiresFullScreen + UILaunchImages From 6f771f96afa1bcfa3878550b0a5f94dd95a43866 Mon Sep 17 00:00:00 2001 From: sgrebnov Date: Mon, 26 Oct 2015 14:31:32 +0300 Subject: [PATCH 2/7] CB-9610 Fix warning in cordova-ios under Xcode 7 --- bin/templates/project/__PROJECT_NAME__/Classes/AppDelegate.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/templates/project/__PROJECT_NAME__/Classes/AppDelegate.m b/bin/templates/project/__PROJECT_NAME__/Classes/AppDelegate.m index 3cb319886b..77bef36adf 100644 --- a/bin/templates/project/__PROJECT_NAME__/Classes/AppDelegate.m +++ b/bin/templates/project/__PROJECT_NAME__/Classes/AppDelegate.m @@ -135,7 +135,11 @@ - (void) application:(UIApplication*)application } #endif +#if __IPHONE_OS_VERSION_MAX_ALLOWED < 90000 - (NSUInteger)application:(UIApplication*)application supportedInterfaceOrientationsForWindow:(UIWindow*)window +#else +- (UIInterfaceOrientationMask)application:(UIApplication*)application supportedInterfaceOrientationsForWindow:(UIWindow*)window +#endif { // iPhone doesn't support upside down by default, while the iPad does. Override to allow all orientations always, and let the root view controller decide what's allowed (the supported orientations mask gets intersected). NSUInteger supportedInterfaceOrientations = (1 << UIInterfaceOrientationPortrait) | (1 << UIInterfaceOrientationLandscapeLeft) | (1 << UIInterfaceOrientationLandscapeRight) | (1 << UIInterfaceOrientationPortraitUpsideDown); From 9cab8496c6e45047c0a9cb01a33bf29fa1adab3f Mon Sep 17 00:00:00 2001 From: sgrebnov Date: Mon, 26 Oct 2015 15:23:09 +0300 Subject: [PATCH 3/7] CB-9656 - Xcode can't find CDVViewController.h when archiving in Xcode 7.1 beta --- bin/templates/project/__CLI__.xcodeproj/project.pbxproj | 1 + bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj | 1 + 2 files changed, 2 insertions(+) diff --git a/bin/templates/project/__CLI__.xcodeproj/project.pbxproj b/bin/templates/project/__CLI__.xcodeproj/project.pbxproj index 56b22de023..2e5af18e0a 100755 --- a/bin/templates/project/__CLI__.xcodeproj/project.pbxproj +++ b/bin/templates/project/__CLI__.xcodeproj/project.pbxproj @@ -528,6 +528,7 @@ "\"$(TARGET_BUILD_DIR)/usr/local/lib/include\"", "\"$(OBJROOT)/UninstalledProducts/include\"", "\"$(BUILT_PRODUCTS_DIR)\"", + "\"$(OBJROOT)/UninstalledProducts/$(PLATFORM_NAME)/include\"", ); IPHONEOS_DEPLOYMENT_TARGET = 6.0; OTHER_LDFLAGS = ( diff --git a/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj b/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj index 70fe26d069..c5f11d6975 100755 --- a/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj +++ b/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj @@ -512,6 +512,7 @@ "\"$(TARGET_BUILD_DIR)/usr/local/lib/include\"", "\"$(OBJROOT)/UninstalledProducts/include\"", "\"$(BUILT_PRODUCTS_DIR)\"", + "\"$(OBJROOT)/UninstalledProducts/$(PLATFORM_NAME)/include\"", ); IPHONEOS_DEPLOYMENT_TARGET = 6.0; OTHER_LDFLAGS = ( From d13597d0b7271b121236612f7479af48e52bca97 Mon Sep 17 00:00:00 2001 From: sgrebnov Date: Mon, 26 Oct 2015 15:36:46 +0300 Subject: [PATCH 4/7] CB-9679 - Resource rules issue with iOS 9 --- bin/templates/scripts/cordova/build.xcconfig | 3 --- 1 file changed, 3 deletions(-) diff --git a/bin/templates/scripts/cordova/build.xcconfig b/bin/templates/scripts/cordova/build.xcconfig index 0b89ad0f74..92a845a5cd 100644 --- a/bin/templates/scripts/cordova/build.xcconfig +++ b/bin/templates/scripts/cordova/build.xcconfig @@ -27,6 +27,3 @@ // "iPhone Developer": Development builds (default, local only; iOS Development certificate) or "iPhone Distribution": Distribution builds (Adhoc/In-House/AppStore; iOS Distribution certificate) CODE_SIGN_IDENTITY = iPhone Developer CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer - -// (CB-7872) Solution for XCode 6.1 signing errors related to resource envelope format deprecation -CODE_SIGN_RESOURCE_RULES_PATH = $(SDKROOT)/ResourceRules.plist \ No newline at end of file From 8fe5e65390cfd031e351ea54cc0a1ff0d365e980 Mon Sep 17 00:00:00 2001 From: Vladimir Kotikov Date: Mon, 26 Oct 2015 18:26:18 +0300 Subject: [PATCH 5/7] Enable NSAllowsArbitraryLoads by default --- .../project/__PROJECT_NAME__/__PROJECT_NAME__-Info.plist | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/templates/project/__PROJECT_NAME__/__PROJECT_NAME__-Info.plist b/bin/templates/project/__PROJECT_NAME__/__PROJECT_NAME__-Info.plist index e78f6c629a..1ae551de1c 100644 --- a/bin/templates/project/__PROJECT_NAME__/__PROJECT_NAME__-Info.plist +++ b/bin/templates/project/__PROJECT_NAME__/__PROJECT_NAME__-Info.plist @@ -22,6 +22,11 @@ --> + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + CFBundleDevelopmentRegion English CFBundleDisplayName From 51bf20cea66813e188c57127c5fdc32f9a625cdd Mon Sep 17 00:00:00 2001 From: Simon MacDonald Date: Tue, 27 Oct 2015 11:51:26 +0300 Subject: [PATCH 6/7] CB-9721 Set ENABLE_BITCODE to NO in build.xcconfig --- bin/templates/scripts/cordova/build.xcconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/templates/scripts/cordova/build.xcconfig b/bin/templates/scripts/cordova/build.xcconfig index 92a845a5cd..54a5abd4d9 100644 --- a/bin/templates/scripts/cordova/build.xcconfig +++ b/bin/templates/scripts/cordova/build.xcconfig @@ -27,3 +27,6 @@ // "iPhone Developer": Development builds (default, local only; iOS Development certificate) or "iPhone Distribution": Distribution builds (Adhoc/In-House/AppStore; iOS Distribution certificate) CODE_SIGN_IDENTITY = iPhone Developer CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer + +// (CB-9721) Set ENABLE_BITCODE to NO in build.xcconfig +ENABLE_BITCODE = NO From 95f46ba32e29453af83c79a1d26be528e9ceeff0 Mon Sep 17 00:00:00 2001 From: Vladimir Kotikov Date: Tue, 27 Oct 2015 12:42:47 +0300 Subject: [PATCH 7/7] Adds deprecation warnings for upcoming 4.0.0 release --- CordovaLib/Classes/CDVPlugin.h | 2 +- CordovaLib/Classes/CDVViewController.h | 14 +++++++------- CordovaLib/Classes/NSData+Base64.h | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CordovaLib/Classes/CDVPlugin.h b/CordovaLib/Classes/CDVPlugin.h index 5e8b2830af..c9991e579c 100644 --- a/CordovaLib/Classes/CDVPlugin.h +++ b/CordovaLib/Classes/CDVPlugin.h @@ -38,7 +38,7 @@ extern NSString* const CDVRemoteNotificationError; @property (readonly, assign) BOOL hasPendingOperation; -- (CDVPlugin*)initWithWebView:(UIWebView*)theWebView; +- (CDVPlugin*)initWithWebView:(UIWebView*)theWebView CDV_DEPRECATED(3.9.2, "Use pluginInitialize method instead. This will be removed in 4.0.0"); - (void)pluginInitialize; - (void)handleOpenURL:(NSNotification*)notification; diff --git a/CordovaLib/Classes/CDVViewController.h b/CordovaLib/Classes/CDVViewController.h index 51863a5981..ed11404997 100644 --- a/CordovaLib/Classes/CDVViewController.h +++ b/CordovaLib/Classes/CDVViewController.h @@ -41,8 +41,8 @@ @property (nonatomic, readonly, strong) NSDictionary* pluginsMap; @property (nonatomic, readonly, strong) NSMutableDictionary* settings; @property (nonatomic, readonly, strong) NSXMLParser* configParser; -@property (nonatomic, readonly, strong) CDVWhitelist* whitelist; // readonly for public -@property (nonatomic, readonly, assign) BOOL loadFromString; +@property (nonatomic, readonly, strong) CDVWhitelist* whitelist CDV_DEPRECATED(3.9.2, "Use URLisAllowed to check specific URL. This will be removed in 4.0.0"); // readonly for public +@property (nonatomic, readonly, assign) BOOL loadFromString CDV_DEPRECATED(3.9.2, "This will be removed in 4.0.0"); @property (nonatomic, readwrite, copy) NSString* wwwFolderName; @property (nonatomic, readwrite, copy) NSString* startPage; @@ -61,14 +61,14 @@ */ @property (nonatomic, readwrite, copy) NSString* baseUserAgent; -+ (NSDictionary*)getBundlePlist:(NSString*)plistName; -+ (NSString*)applicationDocumentsDirectory; ++ (NSDictionary*)getBundlePlist:(NSString*)plistName CDV_DEPRECATED(3.9.2, "This will be removed in 4.0.0"); ++ (NSString*)applicationDocumentsDirectory CDV_DEPRECATED(3.9.2, "This will be removed in 4.0.0"); -- (void)printMultitaskingInfo; -- (void)createGapView; +- (void)printMultitaskingInfo CDV_DEPRECATED(3.9.2, "This will be removed in 4.0.0"); +- (void)createGapView CDV_DEPRECATED(3.9.2, "This will be removed in 4.0.0"); - (UIWebView*)newCordovaViewWithFrame:(CGRect)bounds; -- (void)javascriptAlert:(NSString*)text; +- (void)javascriptAlert:(NSString*)text CDV_DEPRECATED(3.9.2, "Use the CDVCommandDelegate evalJs: directly. This will be removed in 4.0.0"); - (NSString*)appURLScheme; - (NSArray*)parseInterfaceOrientations:(NSArray*)orientations; diff --git a/CordovaLib/Classes/NSData+Base64.h b/CordovaLib/Classes/NSData+Base64.h index c92d1f6a7d..1633a72b66 100644 --- a/CordovaLib/Classes/NSData+Base64.h +++ b/CordovaLib/Classes/NSData+Base64.h @@ -41,7 +41,7 @@ char *CDVNewBase64Encode( - (NSString*)base64EncodedString CDV_DEPRECATED(3.8 .0, "Use [NSData cdv_base64EncodedString]"); -+ (NSData*)cdv_dataFromBase64String:(NSString*)aString; -- (NSString*)cdv_base64EncodedString; ++ (NSData*)cdv_dataFromBase64String:(NSString*)aString CDV_DEPRECATED(3.9.2, "Use NSData initWithBase64EncodedString instead. This will be removed in 4.0.0"); +- (NSString*)cdv_base64EncodedString CDV_DEPRECATED(3.9.2, "Use NSData base64EncodedStringWithOptions instead. This will be removed in 4.0.0"); @end