Merge branch 'develop'

kosratdev · Mar 26, 2023 · c8596b9 · c8596b9
2 parents 6cea440 + 9fee78c
commit c8596b9
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 12 deletions.
diff --git a/Example/MuslimData.xcodeproj/project.pbxproj b/Example/MuslimData.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -331,6 +331,7 @@
 /* Begin PBXShellScriptBuildPhase section */
 		2DABCDE821628FFF008F4B9B /* SwiftLint */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -349,6 +350,7 @@
 		};
 		2DABCDEA216296CC008F4B9B /* SwiftFormat */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -581,7 +583,8 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -594,7 +597,10 @@
 				DEVELOPMENT_TEAM = 4HFFW4423Q;
 				INFOPLIST_FILE = MuslimData/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -610,7 +616,10 @@
 				DEVELOPMENT_TEAM = 4HFFW4423Q;
 				INFOPLIST_FILE = MuslimData/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -633,7 +642,11 @@
 				);
 				INFOPLIST_FILE = Tests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -652,7 +665,11 @@
 				);
 				INFOPLIST_FILE = Tests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

diff --git a/Example/Tests/LocationTests.swift b/Example/Tests/LocationTests.swift
@@ -92,11 +92,11 @@ class LocationTests: XCTestCase {
         XCTAssertEqual("Atrish".mapper(countryCode: "IQ"), "Duhok")
         XCTAssertEqual("Choman".mapper(countryCode: "IQ"), "Erbil")
         XCTAssertEqual("Byara".mapper(countryCode: "IQ"), "Khurmal")
-        XCTAssertEqual("Ranya".mapper(countryCode: "IQ"), "Chamchamal")
+        XCTAssertEqual("Hajiawa".mapper(countryCode: "IQ"), "Ranya")
         XCTAssertEqual("Taza Khurmatu".mapper(countryCode: "IQ"), "Kirkuk")
-        XCTAssertEqual("Khalakan".mapper(countryCode: "IQ"), "Chamchamal")
+        XCTAssertEqual("Khalakan".mapper(countryCode: "IQ"), "Ranya")
         XCTAssertEqual("Sangasar".mapper(countryCode: "IQ"), "Qaladiza")
-        XCTAssertEqual("Takiya".mapper(countryCode: "IQ"), "Kifri")
+        XCTAssertEqual("Takiya".mapper(countryCode: "IQ"), "Chamchamal")
         XCTAssertEqual("Divandarreh".mapper(countryCode: "IR"), "Sanandaj")
         XCTAssertEqual("Rai".mapper(countryCode: "KW"), "Al Asimah")
         XCTAssertEqual("Kubbar Island".mapper(countryCode: "KW"), "Failaka Island")

diff --git a/MuslimData.podspec b/MuslimData.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'MuslimData'
-  s.version          = '1.2.3'
+  s.version          = '1.2.4'
   s.summary          = 'Islamic library (Prayer Times [fixed and calculated], Names of Allah, and Azkars).'
 
 # This description is used to generate tags and improve search results.

diff --git a/MuslimData/Assets/cityMapper.json b/MuslimData/Assets/cityMapper.json
@@ -8,8 +8,8 @@
         "Sulaymaniyah": ["Kalar", "Mawat", "Arbat"],
         "Qaladiza": ["Halsho", "Nawdasht", "Piramagroon", "Tasluja", "Bazian", "Sangasar", "Zharawa"],
         "Kifri": ["Dokan", "Qadir Karam"],
-        "Ranya": ["Hajiawa", "Sarkapkan", "Khalakan", "Taqtaq", "Hizop", "Chwarqurna"]
-        "Chamchamal": ["Takiya", "Takiay Jabari", "Shorsh", "Aghjalar", "Sangaw"]
+        "Ranya": ["Hajiawa", "Sarkapkan", "Khalakan", "Taqtaq", "Hizop", "Chwarqurna"],
+        "Chamchamal": ["Takiya", "Takiay Jabari", "Shorsh", "Aghjalar", "Sangaw"],
         "Darbandikhan": ["Zalan", "Gapilon", "Chwarta", "Barzinjah", "Zarayan", "Halebjai Taza","Qara Dagh", "Khanaqin"],
         "Halabja": ["Garmk", "Penjwen", "Nalparez", "Said Sadiq", "Sirwan", "Pshta"],
         "Khurmal": ["Byara", "Tawella", "Gokhlan", "Balkha"]