Skip to content

Commit 1db869c

Browse files
roninopfroninopf
committed
Merge branch 'release' into 6.2.12-beta
# Conflicts: # CHANGELOG.md # Iterable-iOS-AppExtensions.podspec # Iterable-iOS-SDK.podspec # swift-sdk.xcodeproj/project.pbxproj # swift-sdk/Internal/InAppManager.swift # swift-sdk/IterableAPI.swift # tests/swift-sdk-swift-tests/AuthTests.swift
2 parents cd124c0 + e2f23c3 commit 1db869c

File tree

6 files changed

+24
-33
lines changed

6 files changed

+24
-33
lines changed

‎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: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1777,7 +1777,7 @@
17771777
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
17781778
GCC_WARN_UNUSED_FUNCTION = YES;
17791779
GCC_WARN_UNUSED_VARIABLE = YES;
1780-
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
1780+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
17811781
MTL_ENABLE_DEBUG_INFO = YES;
17821782
ONLY_ACTIVE_ARCH = YES;
17831783
PRODUCT_NAME = IterableSDK;
@@ -1838,7 +1838,7 @@
18381838
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
18391839
GCC_WARN_UNUSED_FUNCTION = YES;
18401840
GCC_WARN_UNUSED_VARIABLE = YES;
1841-
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
1841+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
18421842
MTL_ENABLE_DEBUG_INFO = NO;
18431843
PRODUCT_NAME = IterableSDK;
18441844
SDKROOT = iphoneos;
@@ -1863,7 +1863,7 @@
18631863
DYLIB_INSTALL_NAME_BASE = "@rpath";
18641864
INFOPLIST_FILE = "swift-sdk/Info.plist";
18651865
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1866-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1866+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
18671867
LD_RUNPATH_SEARCH_PATHS = (
18681868
"$(inherited)",
18691869
"@executable_path/Frameworks",
@@ -1893,7 +1893,7 @@
18931893
ENABLE_TESTABILITY = YES;
18941894
INFOPLIST_FILE = "swift-sdk/Info.plist";
18951895
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1896-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1896+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
18971897
LD_RUNPATH_SEARCH_PATHS = (
18981898
"$(inherited)",
18991899
"@executable_path/Frameworks",
@@ -1956,7 +1956,7 @@
19561956
CODE_SIGN_STYLE = Automatic;
19571957
DEVELOPMENT_TEAM = BP98Z28R86;
19581958
INFOPLIST_FILE = "Tests/swift-sdk-swift-tests/Info.plist";
1959-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1959+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
19601960
LD_RUNPATH_SEARCH_PATHS = (
19611961
"$(inherited)",
19621962
"@executable_path/Frameworks",
@@ -1975,7 +1975,7 @@
19751975
CODE_SIGN_STYLE = Automatic;
19761976
DEVELOPMENT_TEAM = BP98Z28R86;
19771977
INFOPLIST_FILE = "Tests/swift-sdk-swift-tests/Info.plist";
1978-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
1978+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
19791979
LD_RUNPATH_SEARCH_PATHS = (
19801980
"$(inherited)",
19811981
"@executable_path/Frameworks",
@@ -2003,7 +2003,7 @@
20032003
ENABLE_TESTABILITY = YES;
20042004
INFOPLIST_FILE = "notification-extension/Info.plist";
20052005
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
2006-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
2006+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
20072007
LD_RUNPATH_SEARCH_PATHS = (
20082008
"$(inherited)",
20092009
"@executable_path/Frameworks",
@@ -2034,7 +2034,7 @@
20342034
ENABLE_TESTABILITY = YES;
20352035
INFOPLIST_FILE = "notification-extension/Info.plist";
20362036
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
2037-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
2037+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
20382038
LD_RUNPATH_SEARCH_PATHS = (
20392039
"$(inherited)",
20402040
"@executable_path/Frameworks",
@@ -2057,7 +2057,7 @@
20572057
CODE_SIGN_STYLE = Automatic;
20582058
DEVELOPMENT_TEAM = BP98Z28R86;
20592059
INFOPLIST_FILE = "Tests/notification-extension-tests/Info.plist";
2060-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
2060+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
20612061
LD_RUNPATH_SEARCH_PATHS = (
20622062
"$(inherited)",
20632063
"@executable_path/Frameworks",
@@ -2080,7 +2080,7 @@
20802080
CODE_SIGN_STYLE = Automatic;
20812081
DEVELOPMENT_TEAM = BP98Z28R86;
20822082
INFOPLIST_FILE = "Tests/notification-extension-tests/Info.plist";
2083-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
2083+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
20842084
LD_RUNPATH_SEARCH_PATHS = (
20852085
"$(inherited)",
20862086
"@executable_path/Frameworks",
@@ -2233,7 +2233,7 @@
22332233
DEVELOPMENT_TEAM = BP98Z28R86;
22342234
ENABLE_TESTABILITY = YES;
22352235
INFOPLIST_FILE = "host-app/Info.plist";
2236-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
2236+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
22372237
LD_RUNPATH_SEARCH_PATHS = (
22382238
"$(inherited)",
22392239
"@executable_path/Frameworks",
@@ -2254,7 +2254,7 @@
22542254
DEVELOPMENT_TEAM = BP98Z28R86;
22552255
ENABLE_TESTABILITY = YES;
22562256
INFOPLIST_FILE = "host-app/Info.plist";
2257-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
2257+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
22582258
LD_RUNPATH_SEARCH_PATHS = (
22592259
"$(inherited)",
22602260
"@executable_path/Frameworks",
@@ -2275,7 +2275,7 @@
22752275
DEVELOPMENT_TEAM = BP98Z28R86;
22762276
ENABLE_TESTABILITY = YES;
22772277
INFOPLIST_FILE = "ui-tests-app/info.plist";
2278-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
2278+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
22792279
LD_RUNPATH_SEARCH_PATHS = (
22802280
"$(inherited)",
22812281
"@executable_path/Frameworks",
@@ -2296,7 +2296,7 @@
22962296
DEVELOPMENT_TEAM = BP98Z28R86;
22972297
ENABLE_TESTABILITY = YES;
22982298
INFOPLIST_FILE = "ui-tests-app/info.plist";
2299-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
2299+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
23002300
LD_RUNPATH_SEARCH_PATHS = (
23012301
"$(inherited)",
23022302
"@executable_path/Frameworks",

‎swift-sdk.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎swift-sdk/IterableAPI.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import UIKit
99

1010
@objcMembers public final class IterableAPI: NSObject {
1111
/// The current SDK version
12-
public static let sdkVersion = "6.2.10"
12+
public static let sdkVersion = "6.2.11"
1313

1414
/// The email of the logged in user that this IterableAPI is using
1515
public static var email: String? {

0 commit comments

Comments
 (0)