Skip to content

Commit e2f23c3

Browse files
tapashmajumdertapashmajumder
authored
Merge pull request #387 from Iterable/feature/mob-2125-xcode12
[MOB-2125] - iOS 14 warnings fix
2 parents 71230ac + 5a0929b commit e2f23c3

File tree

15 files changed

+62
-55
lines changed

15 files changed

+62
-55
lines changed

‎.github/workflows/build-and-test.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,14 @@ jobs:
88

99
steps:
1010
- uses: actions/checkout@v2
11+
12+
- uses: maxim-lobanov/setup-xcode@v1.1
13+
with:
14+
xcode-version: 12.0
15+
1116
- name: Build and test
1217
run: |
13-
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
18+
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]}
1419
1520
- name: CocoaPods lint
1621
run: pod lib lint

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

5+
## 6.2.11
6+
#### Added
7+
- Xcode 12 and iOS 14 support.
8+
9+
#### Fixed
10+
- Fixed minor warnings.
11+
512
## 6.2.10
613
#### Added
714
- An option to pause automatic in-app displaying has been added. To pause, set `IterableAPI.inAppManager.isAutoDisplayPaused` to `true` (default: `false`).

‎Iterable-iOS-AppExtensions.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = "Iterable-iOS-AppExtensions"
33
s.module_name = "IterableAppExtensions"
4-
s.version = "6.2.10"
4+
s.version = "6.2.11"
55
s.summary = "App Extensions for Iterable SDK"
66

77
s.description = <<-DESC

‎Iterable-iOS-SDK.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = "Iterable-iOS-SDK"
33
s.module_name = "IterableSDK"
4-
s.version = "6.2.10"
4+
s.version = "6.2.11"
55
s.summary = "Iterable's official SDK for iOS"
66

77
s.description = <<-DESC

‎swift-sdk.xcodeproj/project.pbxproj‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,7 @@
11641164
isa = PBXProject;
11651165
attributes = {
11661166
LastSwiftUpdateCheck = 1030;
1167-
LastUpgradeCheck = 0940;
1167+
LastUpgradeCheck = 1200;
11681168
ORGANIZATIONNAME = Iterable;
11691169
TargetAttributes = {
11701170
AC2263DE20CF49B8009800EB = {
@@ -1770,6 +1770,7 @@
17701770
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
17711771
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
17721772
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1773+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
17731774
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
17741775
CLANG_WARN_STRICT_PROTOTYPES = YES;
17751776
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1796,7 +1797,7 @@
17961797
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
17971798
GCC_WARN_UNUSED_FUNCTION = YES;
17981799
GCC_WARN_UNUSED_VARIABLE = YES;
1799-
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
1800+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
18001801
MTL_ENABLE_DEBUG_INFO = YES;
18011802
ONLY_ACTIVE_ARCH = YES;
18021803
PRODUCT_NAME = IterableSDK;
@@ -1835,6 +1836,7 @@
18351836
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
18361837
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
18371838
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1839+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
18381840
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
18391841
CLANG_WARN_STRICT_PROTOTYPES = YES;
18401842
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1856,7 +1858,7 @@
18561858
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
18571859
GCC_WARN_UNUSED_FUNCTION = YES;
18581860
GCC_WARN_UNUSED_VARIABLE = YES;
1859-
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
1861+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
18601862
MTL_ENABLE_DEBUG_INFO = NO;
18611863
PRODUCT_NAME = IterableSDK;
18621864
SDKROOT = iphoneos;
@@ -1881,7 +1883,7 @@
18811883
DYLIB_INSTALL_NAME_BASE = "@rpath";
18821884
INFOPLIST_FILE = "swift-sdk/Info.plist";
18831885
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1884-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1886+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
18851887
LD_RUNPATH_SEARCH_PATHS = (
18861888
"$(inherited)",
18871889
"@executable_path/Frameworks",
@@ -1911,7 +1913,7 @@
19111913
ENABLE_TESTABILITY = YES;
19121914
INFOPLIST_FILE = "swift-sdk/Info.plist";
19131915
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1914-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1916+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
19151917
LD_RUNPATH_SEARCH_PATHS = (
19161918
"$(inherited)",
19171919
"@executable_path/Frameworks",
@@ -1933,7 +1935,7 @@
19331935
CODE_SIGN_STYLE = Automatic;
19341936
DEVELOPMENT_TEAM = BP98Z28R86;
19351937
INFOPLIST_FILE = "Tests/swift-sdk-swift-tests/Info.plist";
1936-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1938+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
19371939
LD_RUNPATH_SEARCH_PATHS = (
19381940
"$(inherited)",
19391941
"@executable_path/Frameworks",
@@ -1952,7 +1954,7 @@
19521954
CODE_SIGN_STYLE = Automatic;
19531955
DEVELOPMENT_TEAM = BP98Z28R86;
19541956
INFOPLIST_FILE = "Tests/swift-sdk-swift-tests/Info.plist";
1955-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1957+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
19561958
LD_RUNPATH_SEARCH_PATHS = (
19571959
"$(inherited)",
19581960
"@executable_path/Frameworks",
@@ -1980,7 +1982,7 @@
19801982
ENABLE_TESTABILITY = YES;
19811983
INFOPLIST_FILE = "notification-extension/Info.plist";
19821984
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1983-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
1985+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
19841986
LD_RUNPATH_SEARCH_PATHS = (
19851987
"$(inherited)",
19861988
"@executable_path/Frameworks",
@@ -2011,7 +2013,7 @@
20112013
ENABLE_TESTABILITY = YES;
20122014
INFOPLIST_FILE = "notification-extension/Info.plist";
20132015
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
2014-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
2016+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
20152017
LD_RUNPATH_SEARCH_PATHS = (
20162018
"$(inherited)",
20172019
"@executable_path/Frameworks",
@@ -2034,7 +2036,7 @@
20342036
CODE_SIGN_STYLE = Automatic;
20352037
DEVELOPMENT_TEAM = BP98Z28R86;
20362038
INFOPLIST_FILE = "Tests/notification-extension-tests/Info.plist";
2037-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
2039+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
20382040
LD_RUNPATH_SEARCH_PATHS = (
20392041
"$(inherited)",
20402042
"@executable_path/Frameworks",
@@ -2057,7 +2059,7 @@
20572059
CODE_SIGN_STYLE = Automatic;
20582060
DEVELOPMENT_TEAM = BP98Z28R86;
20592061
INFOPLIST_FILE = "Tests/notification-extension-tests/Info.plist";
2060-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
2062+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
20612063
LD_RUNPATH_SEARCH_PATHS = (
20622064
"$(inherited)",
20632065
"@executable_path/Frameworks",
@@ -2210,7 +2212,7 @@
22102212
DEVELOPMENT_TEAM = BP98Z28R86;
22112213
ENABLE_TESTABILITY = YES;
22122214
INFOPLIST_FILE = "host-app/Info.plist";
2213-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
2215+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
22142216
LD_RUNPATH_SEARCH_PATHS = (
22152217
"$(inherited)",
22162218
"@executable_path/Frameworks",
@@ -2231,7 +2233,7 @@
22312233
DEVELOPMENT_TEAM = BP98Z28R86;
22322234
ENABLE_TESTABILITY = YES;
22332235
INFOPLIST_FILE = "host-app/Info.plist";
2234-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
2236+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
22352237
LD_RUNPATH_SEARCH_PATHS = (
22362238
"$(inherited)",
22372239
"@executable_path/Frameworks",
@@ -2252,7 +2254,7 @@
22522254
DEVELOPMENT_TEAM = BP98Z28R86;
22532255
ENABLE_TESTABILITY = YES;
22542256
INFOPLIST_FILE = "ui-tests-app/info.plist";
2255-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
2257+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
22562258
LD_RUNPATH_SEARCH_PATHS = (
22572259
"$(inherited)",
22582260
"@executable_path/Frameworks",
@@ -2273,7 +2275,7 @@
22732275
DEVELOPMENT_TEAM = BP98Z28R86;
22742276
ENABLE_TESTABILITY = YES;
22752277
INFOPLIST_FILE = "ui-tests-app/info.plist";
2276-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
2278+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
22772279
LD_RUNPATH_SEARCH_PATHS = (
22782280
"$(inherited)",
22792281
"@executable_path/Frameworks",

‎swift-sdk.xcodeproj/xcshareddata/xcschemes/inbox-ui-tests-app.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1130"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎swift-sdk.xcodeproj/xcshareddata/xcschemes/ios9-tests.xcscheme‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -54,9 +54,18 @@
5454
buildConfiguration = "Debug"
5555
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5656
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
57+
shouldUseLaunchSchemeArgsEnv = "YES"
5758
codeCoverageEnabled = "YES"
58-
onlyGenerateCoverageForSpecifiedTargets = "YES"
59-
shouldUseLaunchSchemeArgsEnv = "YES">
59+
onlyGenerateCoverageForSpecifiedTargets = "YES">
60+
<MacroExpansion>
61+
<BuildableReference
62+
BuildableIdentifier = "primary"
63+
BlueprintIdentifier = "ACF560D220E443BF000AAC23"
64+
BuildableName = "host-app.app"
65+
BlueprintName = "host-app"
66+
ReferencedContainer = "container:swift-sdk.xcodeproj">
67+
</BuildableReference>
68+
</MacroExpansion>
6069
<CodeCoverageTargets>
6170
<BuildableReference
6271
BuildableIdentifier = "primary"
@@ -99,17 +108,6 @@
99108
</SkippedTests>
100109
</TestableReference>
101110
</Testables>
102-
<MacroExpansion>
103-
<BuildableReference
104-
BuildableIdentifier = "primary"
105-
BlueprintIdentifier = "ACF560D220E443BF000AAC23"
106-
BuildableName = "host-app.app"
107-
BlueprintName = "host-app"
108-
ReferencedContainer = "container:swift-sdk.xcodeproj">
109-
</BuildableReference>
110-
</MacroExpansion>
111-
<AdditionalOptions>
112-
</AdditionalOptions>
113111
</TestAction>
114112
<LaunchAction
115113
buildConfiguration = "Debug"
@@ -131,8 +129,6 @@
131129
ReferencedContainer = "container:swift-sdk.xcodeproj">
132130
</BuildableReference>
133131
</BuildableProductRunnable>
134-
<AdditionalOptions>
135-
</AdditionalOptions>
136132
</LaunchAction>
137133
<ProfileAction
138134
buildConfiguration = "Release"

‎swift-sdk.xcodeproj/xcshareddata/xcschemes/swift-sdk-parallel.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎swift-sdk.xcodeproj/xcshareddata/xcschemes/swift-sdk.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎swift-sdk.xcodeproj/xcshareddata/xcschemes/ui-tests-app.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1140"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)