Merge pull request #123 from SuryakantRapido/feature/Swift_6Ready

Feature/swift 6 ready
SURYAKANTSHARMA · Oct 30, 2024 · 8c298fc · 8c298fc
2 parents 78c20e6 + d7a0d7c
commit 8c298fc
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 23 deletions.
diff --git a/CountryPicker/Examples/CoCoaPods/CountryPickerExample.xcodeproj/project.pbxproj b/CountryPicker/Examples/CoCoaPods/CountryPickerExample.xcodeproj/project.pbxproj
@@ -352,7 +352,7 @@
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 15;
+				IPHONEOS_DEPLOYMENT_TARGET = 17;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -382,7 +382,7 @@
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 15;
+				IPHONEOS_DEPLOYMENT_TARGET = 17;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

diff --git a/CountryPicker/Examples/CoCoaPods/Pods/Pods.xcodeproj/project.pbxproj b/CountryPicker/Examples/CoCoaPods/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Framework/Framework.xcodeproj/project.pbxproj b/Framework/Framework.xcodeproj/project.pbxproj
@@ -329,7 +329,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 17.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -389,7 +389,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 17.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;

diff --git a/Framework/Framework/Sources/CountryManager.swift b/Framework/Framework/Sources/CountryManager.swift
@@ -111,7 +111,7 @@ public extension CountryManager {
     func fetchCountries(fromURLPath path: URL) throws -> [Country] {
         guard let rawData = try? Data(contentsOf: path),
               let countryCodes = try? PropertyListSerialization.propertyList(from: rawData, format: nil) as? [String] else {
-            throw "[CountryManager] ❌ Missing countries plist file from path: \(path)"
+            throw CountryPickerError.couldNotLoadCountries
         }
 
         // Sort country list by `countryName`
@@ -236,9 +236,15 @@ public extension CountryManager {
 }
 
 // MARK: - Error Handling
-extension String: Error {}
-extension String: LocalizedError {
-    public var errorDescription: String? { return self }
+enum CountryPickerError: Error, LocalizedError {
+    case couldNotLoadCountries
+
+    var errorDescription: String? {
+        switch self {
+        case .couldNotLoadCountries:
+            return "[CountryManager] ❌ Missing countries plist file from path"
+        }
+    }
 }
 
 // MARK: - Array Extension

diff --git a/Framework/Framework/Sources/CountryPickerView.swift b/Framework/Framework/Sources/CountryPickerView.swift
@@ -51,8 +51,8 @@ struct CountryPickerView: View {
             }.listStyle(.grouped)
             .searchable(text: $searchText)
             .navigationTitle("Country Picker")
-            .onChange(of: searchText) { newValue in
-                filterCountries = manager.filterCountries(searchText: newValue)
+            .onChange(of: searchText) {
+                filterCountries = manager.filterCountries(searchText: searchText)
             }
             .onDisappear {
                 manager.lastCountrySelected = selectedCountry
@@ -68,7 +68,7 @@ struct CountryPickerView: View {
                     }
             }
         }
-        .onChange(of: selectedCountry) { _ in
+        .onChange(of: selectedCountry) {
             presentationMode.wrappedValue.dismiss()
         }
     }

diff --git a/Framework/Framework/Sources/CountryPickerWheelView.swift b/Framework/Framework/Sources/CountryPickerWheelView.swift
@@ -22,7 +22,7 @@ struct CountryPickerWheelView: View {
             .pickerStyle(.wheel)
         }
         .onChange(of: selectedCountry) { 
-            viewModel.dataSource.lastCountrySelected = $0
+            viewModel.dataSource.lastCountrySelected = selectedCountry
         }
         .padding()
     }

diff --git a/Framework/Framework/Sources/CountryPickerWithSections.swift b/Framework/Framework/Sources/CountryPickerWithSections.swift
@@ -57,10 +57,10 @@ struct CountryPickerWithSections: View {
                     }
                 }
                 .onChange(of: searchText) {
-                    viewModel.filterWithText($0)
+                    viewModel.filterWithText(searchText)
                 }
                 .onChange(of: viewModel.selectedCountry) {
-                   selectedCountry = $0
+                   selectedCountry = viewModel.selectedCountry
                    presentationMode.wrappedValue.dismiss()
                 }