Release 8.6 (#1286)

* Release 8.6 * Remove channel registration changes from changelog. * Update changelog. * When executing a Display Inbox action, if the message ID is the empty string, just open the inbox. * Update changelog. * Clear code-coverage flag from test scheme to enable app-store submission. * Update changelog. * Build on Jenkins with Xcode 9.
urbanairship · Sep 14, 2017 · 5779f12 · 5779f12
1 parent 46e0256
commit 5779f12
Show file tree

Hide file tree

Showing 10 changed files with 91 additions and 79 deletions.
diff --git a/AirshipKit/AirshipConfig.xcconfig b/AirshipKit/AirshipConfig.xcconfig
@@ -1,6 +1,6 @@
 // Copyright 2017 Urban Airship and Contributors
 
-CURRENT_PROJECT_VERSION = 8.5.3
+CURRENT_PROJECT_VERSION = 8.6.0
 
 // Uncomment to include the preview build warning
 // OTHER_CFLAGS = $(inherited) -DUA_PREVIEW=1
diff --git a/AirshipKit/AirshipKit.xcodeproj/xcshareddata/xcschemes/AirshipKit.xcscheme b/AirshipKit/AirshipKit.xcodeproj/xcshareddata/xcschemes/AirshipKit.xcscheme
@@ -26,8 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">

diff --git a/AirshipKit/AirshipKit/common/UAirshipVersion.m b/AirshipKit/AirshipKit/common/UAirshipVersion.m
@@ -2,7 +2,7 @@
 
 #import "UAirshipVersion.h"
 
-NSString *const versionString = @"8.5.3";
+NSString *const versionString = @"8.6.0";
 
 @implementation UAirshipVersion
 

diff --git a/AirshipKit/AirshipKit/ios/UADisplayInboxAction.m b/AirshipKit/AirshipKit/ios/UADisplayInboxAction.m
@@ -32,26 +32,32 @@ - (BOOL)acceptsArguments:(UAActionArguments *)arguments {
 - (void)performWithArguments:(UAActionArguments *)arguments
            completionHandler:(UAActionCompletionHandler)completionHandler {
 
-    UAInboxMessage *message = nil;
-
     // parse the message id (or possibly the entire message) from the arguments
     NSString *messageID = [UAInboxUtils inboxMessageIDFromValue:arguments.value];
-    if (messageID) {
-        if ([[messageID lowercaseString] isEqualToString:kUADisplayInboxActionMessageIDPlaceHolder]) {
-            // If we have InboxMessage metadata show the message
-            if (arguments.metadata[UAActionMetadataInboxMessageKey]) {
-                message = arguments.metadata[UAActionMetadataInboxMessageKey];
-            } else {
-                // Try getting the message ID from the push notification
-                NSDictionary *notification = arguments.metadata[UAActionMetadataPushPayloadKey];
-                messageID = [UAInboxUtils inboxMessageIDFromNotification:notification];
-            }
-        }
-        if (!message) {
-            message = [[UAirship inbox].messageList messageForID:messageID];
-        }
+
+    // if there is no messageID, or it is an empty string, just show the inbox
+    if (!messageID || [messageID lengthOfBytesUsingEncoding:NSUTF8StringEncoding] == 0) {
+        [self displayInboxWithSituation:arguments.situation];
+        completionHandler([UAActionResult resultWithValue:nil withFetchResult:UAActionFetchResultNoData]);
+        return;
     }
 
+    // look on the device for the message that matches this message ID
+    UAInboxMessage *message = nil;
+    if ([[messageID lowercaseString] isEqualToString:kUADisplayInboxActionMessageIDPlaceHolder]) {
+        // If we have InboxMessage metadata show the message
+        if (arguments.metadata[UAActionMetadataInboxMessageKey]) {
+            message = arguments.metadata[UAActionMetadataInboxMessageKey];
+        } else {
+            // Try getting the message ID from the push notification
+            NSDictionary *notification = arguments.metadata[UAActionMetadataPushPayloadKey];
+            messageID = [UAInboxUtils inboxMessageIDFromNotification:notification];
+        }
+    }
+    if (!message) {
+        message = [[UAirship inbox].messageList messageForID:messageID];
+    }
+
     if (message) {
         // message is available on the device
         [self displayInboxMessage:message situation:arguments.situation];

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,20 @@ iOS Changelog
 
 Migration Guides: Documentation/Migration
 
+Version 8.6.0 - September 13, 2017
+==================================
+Official release for iOS 11 & Xcode 9. Applications should update to this release if they want to support iOS 11 or build under Xcode 9. Applications using SDK 8.5.3 with Carthage should update to this release.
+
+Bug fixes
+---------
+- Force execution of some UI code on the main queue.
+- When executing a Display Inbox action, if the message ID is the empty string, just show the inbox.
+- Turn off code coverage to work-around [this Carthage issue](https://github.com/Carthage/Carthage/issues/2056).
+
+Features
+--------
+- Add support iOS 11 Hidden Notification Content to UANotificationCategory.
+
 Version 8.5.3 - August 22, 2017
 ===============================
 Patch release that fixes missing symbol issues for the static library and removes

diff --git a/Sample/Sample.xcodeproj/project.pbxproj b/Sample/Sample.xcodeproj/project.pbxproj
@@ -82,20 +82,6 @@
 			remoteGlobalIDString = 494DD9561B0EB677009C134E;
 			remoteInfo = AirshipKit;
 		};
-		99666D6C1EDF1DF100BAE46B /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = CC899CAD1D8B6AB400A0CECC /* AirshipKit.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = DF6DD6561E7A1EB8000C281A;
-			remoteInfo = "AirshipKit tvOS";
-		};
-		99666D6E1EDF1DF100BAE46B /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = CC899CAD1D8B6AB400A0CECC /* AirshipKit.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = DF7E739E1E7B3F0A0039F65D;
-			remoteInfo = "AirshipResources tvOS";
-		};
 		CC53F7781D9B12D5004D366C /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = CC899CAD1D8B6AB400A0CECC /* AirshipKit.xcodeproj */;
@@ -124,6 +110,20 @@
 			remoteGlobalIDString = CC8999771D8B625500A0CECC;
 			remoteInfo = AirshipResources;
 		};
+		DF0C33401F69B817002FEE40 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CC899CAD1D8B6AB400A0CECC /* AirshipKit.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = DF6DD6561E7A1EB8000C281A;
+			remoteInfo = "AirshipKit tvOS";
+		};
+		DF0C33421F69B817002FEE40 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CC899CAD1D8B6AB400A0CECC /* AirshipKit.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = DF7E739E1E7B3F0A0039F65D;
+			remoteInfo = "AirshipResources tvOS";
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -401,6 +401,8 @@
 			children = (
 				CC899CB31D8B6AB400A0CECC /* AirshipKit.framework */,
 				CC899CB51D8B6AB400A0CECC /* AirshipResources.bundle */,
+				DF0C33411F69B817002FEE40 /* AirshipKit.framework */,
+				DF0C33431F69B817002FEE40 /* AirshipResources tvOS.bundle */,
 				CC53F7791D9B12D5004D366C /* libUAirship.a */,
 				CC53F77B1D9B12D5004D366C /* AirshipKitTests.xctest */,
 			);
@@ -531,13 +533,6 @@
 			remoteRef = 49251DD61D6F95FC00EED4BD /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		99666D6F1EDF1DF100BAE46B /* AirshipResources tvOS.bundle */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = "AirshipResources tvOS.bundle";
-			remoteRef = 99666D6E1EDF1DF100BAE46B /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		CC53F7791D9B12D5004D366C /* libUAirship.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -566,6 +561,20 @@
 			remoteRef = CC899CB41D8B6AB400A0CECC /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		DF0C33411F69B817002FEE40 /* AirshipKit.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = AirshipKit.framework;
+			remoteRef = DF0C33401F69B817002FEE40 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		DF0C33431F69B817002FEE40 /* AirshipResources tvOS.bundle */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "AirshipResources tvOS.bundle";
+			remoteRef = DF0C33421F69B817002FEE40 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */

diff --git a/Sample/Sample/Info.plist b/Sample/Sample/Info.plist
@@ -2,21 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>UIAppFonts</key>
-	<array>
-		<string>Roboto-Black.ttf</string>
-		<string>Roboto-BlackItalic.ttf</string>
-		<string>Roboto-Bold.ttf</string>
-		<string>Roboto-BoldItalic.ttf</string>
-		<string>Roboto-Italic.ttf</string>
-		<string>Roboto-Light.ttf</string>
-		<string>Roboto-LightItalic.ttf</string>
-		<string>Roboto-Medium.ttf</string>
-		<string>Roboto-MediumItalic.ttf</string>
-		<string>Roboto-Regular.ttf</string>
-		<string>Roboto-Thin.ttf</string>
-		<string>Roboto-ThinItalic.ttf</string>
-	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -41,6 +26,25 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>Sample location</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>Sample location, when in use.</string>
+	<key>UIAppFonts</key>
+	<array>
+		<string>Roboto-Black.ttf</string>
+		<string>Roboto-BlackItalic.ttf</string>
+		<string>Roboto-Bold.ttf</string>
+		<string>Roboto-BoldItalic.ttf</string>
+		<string>Roboto-Italic.ttf</string>
+		<string>Roboto-Light.ttf</string>
+		<string>Roboto-LightItalic.ttf</string>
+		<string>Roboto-Medium.ttf</string>
+		<string>Roboto-MediumItalic.ttf</string>
+		<string>Roboto-Regular.ttf</string>
+		<string>Roboto-Thin.ttf</string>
+		<string>Roboto-ThinItalic.ttf</string>
+	</array>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>fetch</string>
@@ -77,25 +81,5 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-        <key>UIAppFonts</key>
-        <array>
-                <string>Roboto-Black.ttf</string>
-                <string>Roboto-BlackItalic.ttf</string>
-                <string>Roboto-Bold.ttf</string>
-                <string>Roboto-BoldItalic.ttf</string>
-                <string>Roboto-Italic.ttf</string>
-                <string>Roboto-Light.ttf</string>
-                <string>Roboto-LightItalic.ttf</string>
-                <string>Roboto-Medium.ttf</string>
-                <string>Roboto-MediumItalic.ttf</string>
-                <string>Roboto-Regular.ttf</string>
-                <string>Roboto-Thin.ttf</string>
-                <string>Roboto-ThinItalic.ttf</string>
-        </array>
-
-	<key>NSLocationAlwaysUsageDescription</key>
-	<string>Sample location</string>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>Sample location, when in use.</string>
 </dict>
 </plist>
diff --git a/UrbanAirship-iOS-AppExtensions.podspec b/UrbanAirship-iOS-AppExtensions.podspec
@@ -1,5 +1,5 @@
 Pod::Spec.new do |s|
-    s.version                 = "8.5.3"
+    s.version                 = "8.6.0"
 
     s.name                    = "UrbanAirship-iOS-AppExtensions"
     s.summary                 = "Urban Airship iOS App Extensions"

diff --git a/UrbanAirship-iOS-SDK.podspec b/UrbanAirship-iOS-SDK.podspec
@@ -1,5 +1,5 @@
 Pod::Spec.new do |s|
-   s.version                 = "8.5.3"
+   s.version                 = "8.6.0"
    s.name                    = "UrbanAirship-iOS-SDK"
    s.summary                 = "Urban Airship iOS SDK"
 

diff --git a/jenkins-environment.properties b/jenkins-environment.properties
@@ -7,4 +7,4 @@
 # XCODE_6_BETA_7_APP
 # XCODE_6_APP
 # XCODE_6_1_APP
-DEVELOPER_DIR=$XCODE_8_GM_APP/Contents/Developer
+DEVELOPER_DIR=$XCODE_9_GM_APP/Contents/Developer