Merge branch 'release/1.9.0'

Blackjacx · May 9, 2023 · dc51a17 · dc51a17
2 parents 98b7b9a + 832a1a9
commit dc51a17
Show file tree

Hide file tree

Showing 21 changed files with 57 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@
 * Implement DisplayState - [@Blackjacx](https://github.com/Blackjacx).
 * Inject config directly in ViewController - [@Blackjacx](https://github.com/Blackjacx).
 
+## [1.9.0] - 2023-05-09Z
+* [#49](https://github.com/Blackjacx/Columbus/pull/49): Add fallback for CTCarrier deprecation - [@mic-ioki](https://github.com/mic-ioki).
+* Use default country for the initial country code - [@Blackjacx](https://github.com/Blackjacx).
+* Update Copyright - [@Blackjacx](https://github.com/Blackjacx).
+
 ## [1.8.0] - 2023-05-02Z
 * Remove auto assign to project workflow - [@Blackjacx](https://github.com/Blackjacx).
 * Make CoreTelephony Approach Debuggable - [@Blackjacx](https://github.com/Blackjacx).

diff --git a/Columbus.podspec b/Columbus.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name              = 'Columbus'
-    s.version           = '1.8.1'
+    s.version           = '1.9.0'
     s.license           = { :type => 'MIT', :file => 'LICENSE' }
     s.summary           = 'A country picker for iOS, tvOS and watchOS.'
     s.description       = <<-DESC

diff --git a/Columbus.xcodeproj/project.pbxproj b/Columbus.xcodeproj/project.pbxproj
@@ -683,11 +683,11 @@
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CURRENT_PROJECT_VERSION = 35;
+				CURRENT_PROJECT_VERSION = 36;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 35;
+				DYLIB_CURRENT_VERSION = 36;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_MODULE_VERIFIER = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -725,10 +725,10 @@
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CURRENT_PROJECT_VERSION = 35;
+				CURRENT_PROJECT_VERSION = 36;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 35;
+				DYLIB_CURRENT_VERSION = 36;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_MODULE_VERIFIER = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -906,11 +906,11 @@
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CURRENT_PROJECT_VERSION = 35;
+				CURRENT_PROJECT_VERSION = 36;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 35;
+				DYLIB_CURRENT_VERSION = 36;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_MODULE_VERIFIER = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -949,10 +949,10 @@
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CURRENT_PROJECT_VERSION = 35;
+				CURRENT_PROJECT_VERSION = 36;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 35;
+				DYLIB_CURRENT_VERSION = 36;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_MODULE_VERIFIER = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;

diff --git a/Example/Source/AppDelegate.swift b/Example/Source/AppDelegate.swift
@@ -3,7 +3,7 @@
 //  Columbus_iOS_Example
 //
 //  Created by Stefan Herold on 23.06.18.
-//  Copyright © 2022 Stefan Herold. All rights reserved.
+//  Copyright © 2023 Stefan Herold. All rights reserved.
 //
 
 import UIKit
@@ -20,14 +20,15 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
         window = UIWindow(frame: UIScreen.main.bounds)
 
         let config = CountryPickerConfig()
-        var countryPicker = CountryPickerViewController(config: config, initialCountryCode: "DE") { (country) in
+        let defaultCountryCode = CountryPickerViewController.defaultCountry().isoCountryCode
+        var countryPicker = CountryPickerViewController(config: config, initialCountryCode: defaultCountryCode) { (country) in
             print("Programmatic: \(country)")
         }
 
         #if os(iOS)
         let storyboard = UIStoryboard(name: "CountryPickerStoryboard", bundle: nil)
         countryPicker = storyboard.instantiateViewController(identifier: "picker") { (coder) -> CountryPickerViewController? in
-            CountryPickerViewController(coder: coder, config: config, initialCountryCode: "DE") { (country) in
+            CountryPickerViewController(coder: coder, config: config, initialCountryCode: defaultCountryCode) { (country) in
                 print("Storyboard: \(country)")
             }
         }

diff --git a/Example/Source/UIColor+SemanticColors.swift b/Example/Source/UIColor+SemanticColors.swift
@@ -3,7 +3,7 @@
 //  Columbus-iOS
 //
 //  Created by Stefan Herold on 31.01.20.
-//  Copyright © 2022 Stefan Herold. All rights reserved.
+//  Copyright © 2023 Stefan Herold. All rights reserved.
 //
 
 import UIKit

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -16,16 +16,16 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.759.0)
-    aws-sdk-core (3.171.0)
+    aws-partitions (1.761.0)
+    aws-sdk-core (3.172.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
     aws-sdk-kms (1.64.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.121.0)
+    aws-sdk-s3 (1.122.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)

diff --git a/Source/Classes/ColumbusMain.swift b/Source/Classes/ColumbusMain.swift
@@ -3,7 +3,7 @@
 //  Columbus
 //
 //  Created by Stefan Herold on 22.06.18.
-//  Copyright © 2022 Stefan Herold. All rights reserved.
+//  Copyright © 2023 Stefan Herold. All rights reserved.
 //
 
 import Foundation

diff --git a/Source/Classes/Configurable.swift b/Source/Classes/Configurable.swift
@@ -3,7 +3,7 @@
 //  Columbus
 //
 //  Created by Stefan Herold on 21.06.18.
-//  Copyright © 2022 Stefan Herold. All rights reserved.
+//  Copyright © 2023 Stefan Herold. All rights reserved.
 //
 
 import UIKit

diff --git a/Source/Classes/Country.swift b/Source/Classes/Country.swift
@@ -3,7 +3,7 @@
 //  Columbus
 //
 //  Created by Stefan Herold on 21.06.18.
-//  Copyright © 2022 Stefan Herold. All rights reserved.
+//  Copyright © 2023 Stefan Herold. All rights reserved.
 //
 
 import UIKit

diff --git a/Source/Classes/CountryCell.swift b/Source/Classes/CountryCell.swift
@@ -3,7 +3,7 @@
 //  Columbus
 //
 //  Created by Stefan Herold on 21.06.18.
-//  Copyright © 2022 Stefan Herold. All rights reserved.
+//  Copyright © 2023 Stefan Herold. All rights reserved.
 //
 
 import UIKit

diff --git a/Source/Classes/CountryList.swift b/Source/Classes/CountryList.swift
@@ -3,7 +3,7 @@
 //  Columbus
 //
 //  Created by Stefan Herold on 22.06.18.
-//  Copyright © 2022 Stefan Herold. All rights reserved.
+//  Copyright © 2023 Stefan Herold. All rights reserved.
 //
 
 import UIKit

diff --git a/Source/Classes/CountryPickerViewController+DisplayState.swift b/Source/Classes/CountryPickerViewController+DisplayState.swift
@@ -3,7 +3,7 @@
 //  Columbus
 //
 //  Created by Stefan Herold on 05.02.21.
-//  Copyright © 2022 Stefan Herold. All rights reserved.
+//  Copyright © 2023 Stefan Herold. All rights reserved.
 //
 
 import UIKit

diff --git a/Source/Classes/CountryPickerViewController.swift b/Source/Classes/CountryPickerViewController.swift
@@ -3,7 +3,7 @@
 //  Columbus
 //
 //  Created by Stefan Herold on 22.06.18.
-//  Copyright © 2022 Stefan Herold. All rights reserved.
+//  Copyright © 2023 Stefan Herold. All rights reserved.
 //
 
 import UIKit
@@ -266,15 +266,23 @@ public final class CountryPickerViewController: UIViewController {
         // Core Telephony Approach
 
         #if os(iOS) && !targetEnvironment(simulator)
-        guard let cellularProviders = CTTelephonyNetworkInfo().serviceSubscriberCellularProviders else {
-            return defaultCountry
-        }
-        let carriers = cellularProviders.map(\.value)
-
-        guard let firstIsoCountryCode = carriers.compactMap(\.isoCountryCode).first?.uppercased() else {
-            return defaultCountry
+
+        // CTCarrier is deprecated from 16.4 and Locale region is used as fallback.
+        // see: https://developer.apple.com/documentation/ios-ipados-release-notes/ios-ipados-16_4-release-notes#Deprecations
+
+        var deviceIsoCountryCode: String?
+        if #available(iOS 16.4, *) {
+            deviceIsoCountryCode = Locale.current.language.region?.identifier
+        } else {
+            guard let cellularProviders = CTTelephonyNetworkInfo().serviceSubscriberCellularProviders else {
+                return defaultCountry
+            }
+            let carriers = cellularProviders.map(\.value)
+            deviceIsoCountryCode = carriers.compactMap(\.isoCountryCode).first?.uppercased()
         }
-        guard let country = (countries.first { $0.isoCountryCode.compare(firstIsoCountryCode, options: .caseInsensitive) == .orderedSame }) else {
+
+        guard let deviceIsoCountryCode,
+              let country = (countries.first { $0.isoCountryCode.compare(deviceIsoCountryCode, options: .caseInsensitive) == .orderedSame }) else {
             return defaultCountry
         }
         return country

diff --git a/Source/Classes/CountryView.swift b/Source/Classes/CountryView.swift
@@ -3,7 +3,7 @@
 //  Columbus
 //
 //  Created by Stefan Herold on 21.06.18.
-//  Copyright © 2022 Stefan Herold. All rights reserved.
+//  Copyright © 2023 Stefan Herold. All rights reserved.
 //
 
 import UIKit

diff --git a/Source/Classes/EmptyDecodable.swift b/Source/Classes/EmptyDecodable.swift
@@ -3,7 +3,7 @@
 //  Columbus
 //
 //  Created by Stefan Herold on 20.02.21.
-//  Copyright © 2022 Stefan Herold. All rights reserved.
+//  Copyright © 2023 Stefan Herold. All rights reserved.
 //
 
 import Foundation

diff --git a/Source/Classes/UIView+Subviews.swift b/Source/Classes/UIView+Subviews.swift
@@ -3,7 +3,7 @@
 //  Columbus
 //
 //  Created by Stefan Herold on 13.08.19.
-//  Copyright © 2022 Stefan Herold. All rights reserved.
+//  Copyright © 2023 Stefan Herold. All rights reserved.
 //
 
 import UIKit

diff --git a/Source/Columbus.h b/Source/Columbus.h
@@ -3,7 +3,7 @@
 //  Columbus
 //
 //  Created by Stefan Herold on 21.12.18.
-//  Copyright © 2022 Stefan Herold. All rights reserved.
+//  Copyright © 2023 Stefan Herold. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/Source/Info.plist b/Source/Info.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.8.1</string>
+	<string>1.9.0</string>
 	<key>CFBundleVersion</key>
-	<string>35</string>
+	<string>36</string>
 </dict>
 </plist>
diff --git a/Source/Resources/Info.plist b/Source/Resources/Info.plist
@@ -13,11 +13,11 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.8.1</string>
+	<string>1.9.0</string>
 	<key>CFBundleVersion</key>
-	<string>35</string>
+	<string>36</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2022 Stefan Herold. All rights reserved.</string>
+	<string>Copyright © 2023 Stefan Herold. All rights reserved.</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

diff --git a/Tests/ColumbusTests.swift b/Tests/ColumbusTests.swift
@@ -3,7 +3,7 @@
 //  Columbus
 //
 //  Created by Stefan Herold on 24.12.18.
-//  Copyright © 2022 Stefan Herold. All rights reserved.
+//  Copyright © 2023 Stefan Herold. All rights reserved.
 //
 
 import XCTest

diff --git a/Tests/Info.plist b/Tests/Info.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.8.1</string>
+	<string>1.9.0</string>
 	<key>CFBundleVersion</key>
-	<string>35</string>
+	<string>36</string>
 </dict>
 </plist>