Merge pull request #387 from Iterable/feature/mob-2125-xcode12

[MOB-2125] - iOS 14 warnings fix
Iterable · Sep 23, 2020 · e2f23c3 · e2f23c3
2 parents 71230ac + 5a0929b
commit e2f23c3
Show file tree

Hide file tree

Showing 15 changed files with 62 additions and 55 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -8,9 +8,14 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+
+    - uses: maxim-lobanov/setup-xcode@v1.1
+      with:
+        xcode-version: 12.0
+
     - name: Build and test
       run: |
-        xcodebuild test -project swift-sdk.xcodeproj -scheme swift-sdk -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 11' -enableCodeCoverage YES CODE_SIGNING_REQUIRED=NO | xcpretty || exit 1
+        xcodebuild test -project swift-sdk.xcodeproj -scheme swift-sdk -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 11' -enableCodeCoverage YES CODE_SIGNING_REQUIRED=NO | xcpretty && exit ${PIPESTATUS[0]}
         
     - name: CocoaPods lint
       run: pod lib lint

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.2.11
+#### Added
+- Xcode 12 and iOS 14 support.
+
+#### Fixed
+- Fixed minor warnings.
+
 ## 6.2.10
 #### Added
 - An option to pause automatic in-app displaying has been added. To pause, set `IterableAPI.inAppManager.isAutoDisplayPaused` to `true` (default: `false`).

diff --git a/Iterable-iOS-AppExtensions.podspec b/Iterable-iOS-AppExtensions.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "Iterable-iOS-AppExtensions"
   s.module_name  = "IterableAppExtensions"
-  s.version      = "6.2.10"
+  s.version      = "6.2.11"
   s.summary      = "App Extensions for Iterable SDK"
 
   s.description  = <<-DESC

diff --git a/Iterable-iOS-SDK.podspec b/Iterable-iOS-SDK.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "Iterable-iOS-SDK"
   s.module_name  = "IterableSDK"
-  s.version      = "6.2.10"
+  s.version      = "6.2.11"
   s.summary      = "Iterable's official SDK for iOS"
 
   s.description  = <<-DESC

diff --git a/swift-sdk.xcodeproj/project.pbxproj b/swift-sdk.xcodeproj/project.pbxproj
@@ -1164,7 +1164,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1030;
-				LastUpgradeCheck = 0940;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = Iterable;
 				TargetAttributes = {
 					AC2263DE20CF49B8009800EB = {
@@ -1770,6 +1770,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1796,7 +1797,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = IterableSDK;
@@ -1835,6 +1836,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1856,7 +1858,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_NAME = IterableSDK;
 				SDKROOT = iphoneos;
@@ -1881,7 +1883,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = "swift-sdk/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1911,7 +1913,7 @@
 				ENABLE_TESTABILITY = YES;
 				INFOPLIST_FILE = "swift-sdk/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1933,7 +1935,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = BP98Z28R86;
 				INFOPLIST_FILE = "Tests/swift-sdk-swift-tests/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1952,7 +1954,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = BP98Z28R86;
 				INFOPLIST_FILE = "Tests/swift-sdk-swift-tests/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1980,7 +1982,7 @@
 				ENABLE_TESTABILITY = YES;
 				INFOPLIST_FILE = "notification-extension/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2011,7 +2013,7 @@
 				ENABLE_TESTABILITY = YES;
 				INFOPLIST_FILE = "notification-extension/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2034,7 +2036,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = BP98Z28R86;
 				INFOPLIST_FILE = "Tests/notification-extension-tests/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2057,7 +2059,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = BP98Z28R86;
 				INFOPLIST_FILE = "Tests/notification-extension-tests/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2210,7 +2212,7 @@
 				DEVELOPMENT_TEAM = BP98Z28R86;
 				ENABLE_TESTABILITY = YES;
 				INFOPLIST_FILE = "host-app/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2231,7 +2233,7 @@
 				DEVELOPMENT_TEAM = BP98Z28R86;
 				ENABLE_TESTABILITY = YES;
 				INFOPLIST_FILE = "host-app/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2252,7 +2254,7 @@
 				DEVELOPMENT_TEAM = BP98Z28R86;
 				ENABLE_TESTABILITY = YES;
 				INFOPLIST_FILE = "ui-tests-app/info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2273,7 +2275,7 @@
 				DEVELOPMENT_TEAM = BP98Z28R86;
 				ENABLE_TESTABILITY = YES;
 				INFOPLIST_FILE = "ui-tests-app/info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

diff --git a/swift-sdk.xcodeproj/xcshareddata/xcschemes/inbox-ui-tests-app.xcscheme b/swift-sdk.xcodeproj/xcshareddata/xcschemes/inbox-ui-tests-app.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/swift-sdk.xcodeproj/xcshareddata/xcschemes/ios9-tests.xcscheme b/swift-sdk.xcodeproj/xcshareddata/xcschemes/ios9-tests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -54,9 +54,18 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES"
-      onlyGenerateCoverageForSpecifiedTargets = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      onlyGenerateCoverageForSpecifiedTargets = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "ACF560D220E443BF000AAC23"
+            BuildableName = "host-app.app"
+            BlueprintName = "host-app"
+            ReferencedContainer = "container:swift-sdk.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <CodeCoverageTargets>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -99,17 +108,6 @@
             </SkippedTests>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "ACF560D220E443BF000AAC23"
-            BuildableName = "host-app.app"
-            BlueprintName = "host-app"
-            ReferencedContainer = "container:swift-sdk.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -131,8 +129,6 @@
             ReferencedContainer = "container:swift-sdk.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/swift-sdk.xcodeproj/xcshareddata/xcschemes/swift-sdk-parallel.xcscheme b/swift-sdk.xcodeproj/xcshareddata/xcschemes/swift-sdk-parallel.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/swift-sdk.xcodeproj/xcshareddata/xcschemes/swift-sdk.xcscheme b/swift-sdk.xcodeproj/xcshareddata/xcschemes/swift-sdk.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/swift-sdk.xcodeproj/xcshareddata/xcschemes/ui-tests-app.xcscheme b/swift-sdk.xcodeproj/xcshareddata/xcschemes/ui-tests-app.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/swift-sdk/Internal/DeviceInfo.swift b/swift-sdk/Internal/DeviceInfo.swift
@@ -7,7 +7,7 @@ import Foundation
 import UIKit
 
 struct DeviceInfo: Codable {
-    let mobileDeviceType = MobileDeviceType.iOS
+    var mobileDeviceType = MobileDeviceType.iOS
     let deviceFp: DeviceFp
 
     struct DeviceFp: Codable {
@@ -54,6 +54,8 @@ struct DeviceInfo: Codable {
             return "AppleTV"
         case .carPlay:
             return "CarPlay"
+        case .mac:
+            return "Mac"
         case .unspecified:
             return "Other"
         @unknown default:

diff --git a/swift-sdk/Internal/InAppManager.swift b/swift-sdk/Internal/InAppManager.swift
@@ -124,7 +124,7 @@ class InAppManager: NSObject, IterableInternalInAppManagerProtocol {
 
         // This is public (via public protocol implementation), so make sure we call from Main Thread
         DispatchQueue.main.async {
-            _ = self.showInternal(message: message, consume: consume, callback: callback)
+            self.showInternal(message: message, consume: consume, callback: callback)
         }
     }
 

diff --git a/swift-sdk/IterableAPI.swift b/swift-sdk/IterableAPI.swift
@@ -9,7 +9,7 @@ import UIKit
 
 @objcMembers public final class IterableAPI: NSObject {
     // Current SDK Version.
-    public static let sdkVersion = "6.2.10"
+    public static let sdkVersion = "6.2.11"
 
     // MARK: Initialization
 

diff --git a/tests/swift-sdk-swift-tests/IterableAPIResponseTests.swift b/tests/swift-sdk-swift-tests/IterableAPIResponseTests.swift
@@ -46,7 +46,6 @@ class IterableAPIResponseTests: XCTestCase {
 
     func testResponseCode200WithNoData() {
         let xpectation = expectation(description: "no data")
-        let networkSession = MockNetworkSession(statusCode: 200, data: nil)
         let iterableRequest = IterableRequest.post(PostRequest(path: "", args: nil, body: [:]))
 
         createApiClient(networkSession: MockNetworkSession(statusCode: 200, data: nil))
@@ -61,7 +60,6 @@ class IterableAPIResponseTests: XCTestCase {
     func testResponseCode200WithInvalidJson() {
         let xpectation = expectation(description: "invalid json")
         let data = "{'''}}".data(using: .utf8)!
-        let networkSession = MockNetworkSession(statusCode: 200, data: data)
         let iterableRequest = IterableRequest.post(PostRequest(path: "", args: nil, body: [:]))
 
         createApiClient(networkSession: MockNetworkSession(statusCode: 200, data: data))
@@ -75,7 +73,6 @@ class IterableAPIResponseTests: XCTestCase {
 
     func testResponseCode400WithoutMessage() { // 400 = bad reqeust
         let xpectation = expectation(description: "400 without message")
-        let networkSession = MockNetworkSession(statusCode: 400)
         let iterableRequest = IterableRequest.post(PostRequest(path: "", args: nil, body: [:]))
 
         createApiClient(networkSession: MockNetworkSession(statusCode: 400))
@@ -89,7 +86,6 @@ class IterableAPIResponseTests: XCTestCase {
 
     func testResponseCode400WitMessage() {
         let xpectation = expectation(description: "400 with message")
-        let networkSession = MockNetworkSession(statusCode: 400, json: ["msg": "Test error"])
         let iterableRequest = IterableRequest.post(PostRequest(path: "", args: nil, body: [:]))
 
         createApiClient(networkSession: MockNetworkSession(statusCode: 400, json: ["msg": "Test error"]))
@@ -103,7 +99,6 @@ class IterableAPIResponseTests: XCTestCase {
 
     func testResponseCode401() { // 401 = unauthorized
         let xpectation = expectation(description: "401")
-        let networkSession = MockNetworkSession(statusCode: 401)
         let iterableRequest = IterableRequest.post(PostRequest(path: "", args: nil, body: [:]))
 
         createApiClient(networkSession: MockNetworkSession(statusCode: 401))
@@ -117,7 +112,6 @@ class IterableAPIResponseTests: XCTestCase {
 
     func testResponseCode500() { // 500 = internal server error
         let xpectation = expectation(description: "500")
-        let networkSession = MockNetworkSession(statusCode: 500)
         let iterableRequest = IterableRequest.post(PostRequest(path: "", args: nil, body: [:]))
 
         createApiClient(networkSession: MockNetworkSession(statusCode: 500))
@@ -131,7 +125,6 @@ class IterableAPIResponseTests: XCTestCase {
 
     func testNon200ResponseCode() { // 302 = redirection
         let xpectation = expectation(description: "non 200")
-        let networkSession = MockNetworkSession(statusCode: 302)
         let iterableRequest = IterableRequest.post(PostRequest(path: "", args: nil, body: [:]))
 
         createApiClient(networkSession: MockNetworkSession(statusCode: 302))
@@ -145,7 +138,6 @@ class IterableAPIResponseTests: XCTestCase {
 
     func testNoNetworkResponse() {
         let xpectation = expectation(description: "no network response")
-        let networkSession = NoNetworkNetworkSession()
         let iterableRequest = IterableRequest.post(PostRequest(path: "", args: nil, body: [:]))
 
         createApiClient(networkSession: NoNetworkNetworkSession())