Merge branch 'release/1.8.1'

Blackjacx · May 2, 2023 · 98b7b9a · 98b7b9a
2 parents 4530558 + 239711d
commit 98b7b9a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 18 deletions.
diff --git a/Columbus.podspec b/Columbus.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name              = 'Columbus'
-    s.version           = '1.8.0'
+    s.version           = '1.8.1'
     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 = 34;
+				CURRENT_PROJECT_VERSION = 35;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 34;
+				DYLIB_CURRENT_VERSION = 35;
 				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 = 34;
+				CURRENT_PROJECT_VERSION = 35;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 34;
+				DYLIB_CURRENT_VERSION = 35;
 				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 = 34;
+				CURRENT_PROJECT_VERSION = 35;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 34;
+				DYLIB_CURRENT_VERSION = 35;
 				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 = 34;
+				CURRENT_PROJECT_VERSION = 35;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 34;
+				DYLIB_CURRENT_VERSION = 35;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_MODULE_VERIFIER = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;

diff --git a/Source/Classes/CountryPickerViewController.swift b/Source/Classes/CountryPickerViewController.swift
@@ -269,9 +269,8 @@ public final class CountryPickerViewController: UIViewController {
         guard let cellularProviders = CTTelephonyNetworkInfo().serviceSubscriberCellularProviders else {
             return defaultCountry
         }
-        guard let carriers = cellularProviders.map(\.value) else {
-            return defaultCountry
-        }
+        let carriers = cellularProviders.map(\.value)
+
         guard let firstIsoCountryCode = carriers.compactMap(\.isoCountryCode).first?.uppercased() else {
             return defaultCountry
         }

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.0</string>
+	<string>1.8.1</string>
 	<key>CFBundleVersion</key>
-	<string>34</string>
+	<string>35</string>
 </dict>
 </plist>
diff --git a/Source/Resources/Info.plist b/Source/Resources/Info.plist
@@ -13,9 +13,9 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.8.0</string>
+	<string>1.8.1</string>
 	<key>CFBundleVersion</key>
-	<string>34</string>
+	<string>35</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2022 Stefan Herold. All rights reserved.</string>
 	<key>NSPrincipalClass</key>

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.0</string>
+	<string>1.8.1</string>
 	<key>CFBundleVersion</key>
-	<string>34</string>
+	<string>35</string>
 </dict>
 </plist>