Merge pull request #40 from JNDisrupter/development

Upgrade minimum IOS Version

Example/JNPhoneNumberView.xcodeproj/project.pbxproj

@@ -422,7 +422,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -471,7 +471,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -487,7 +487,7 @@
 				CURRENT_PROJECT_VERSION = "⁨⁨⁨⁨";
 				DEVELOPMENT_TEAM = 243T5L9MQG;
 				INFOPLIST_FILE = JNPhoneNumberView/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
@@ -504,7 +504,7 @@
 				CURRENT_PROJECT_VERSION = "⁨⁨⁨⁨";
 				DEVELOPMENT_TEAM = 243T5L9MQG;
 				INFOPLIST_FILE = JNPhoneNumberView/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";

Example/Podfile

@@ -1,8 +1,11 @@
+source 'https://github.com/CocoaPods/Specs.git'
+
 use_frameworks!
-platform :ios, '9.0'
+platform :ios, '12.0'
 
 target 'JNPhoneNumberView_Example' do
   pod 'JNPhoneNumberView', :path => '../'
 
   pod 'libPhoneNumber-iOS'
 end
+

JNPhoneNumberView.podspec

@@ -8,8 +8,8 @@ Pod::Spec.new do |s|
   s.license                     = { :type => "MIT", :file => "LICENSE" }
   s.author                      = { "Jayel Zaghmoutt" => "eng.jayel.z@gmail.com", "hamzakhanfar" => "ha.khanfer@gmail.com" }
   s.source                      = { :git => "https://github.com/JNDisrupter/JNPhoneNumberView.git", :tag => "#{s.version}" }
-  s.ios.deployment_target       = "9.0"
-  s.swift_version               = "5.0"
+  s.ios.deployment_target       = "12.0"
+  s.swift_version               = "5.10"
   s.source_files                = "JNPhoneNumberView/**/*.swift"
   s.resources                   = "JNPhoneNumberView/**/*.{png,pdf,jpeg,jpg,storyboard,xib,xcassets,ttf,json}"
   s.dependency "libPhoneNumber-iOS"

JNPhoneNumberView/Classes/Utils/CountryUtil/JNCountryUtil.swift

@@ -37,7 +37,7 @@ import libPhoneNumber_iOS
         let metaDataHelper = NBMetadataHelper()
 
         // get meta data for specific region code
-        if let metaData = metaDataHelper.getMetadataForRegion(regionCode) {
+        if let metaData = metaDataHelper?.getMetadataForRegion(regionCode) {
 
             // Init and fill country code
             let country = Country()
@@ -70,19 +70,19 @@ import libPhoneNumber_iOS
         guard let dialCodeNumber = Int(modifiedDialCode) else { return nil }
 
         // Phone number util
-        let phoneNumberUtil = NBPhoneNumberUtil()
+        let phoneNumberUtil = NBPhoneNumberUtil.sharedInstance()
 
         // Country code
         var generatedRegionCode: String?
 
         // Get region code
-        if let regionCode = phoneNumberUtil.getRegionCode(for: phoneNumber) {
+        if let regionCode = phoneNumberUtil?.getRegionCode(for: phoneNumber) {
 
             generatedRegionCode = regionCode
         }
 
             // Country code
-        else if let countryCode = phoneNumberUtil.getRegionCode(forCountryCode: NSNumber(value: dialCodeNumber)) {
+        else if let countryCode = phoneNumberUtil?.getRegionCode(forCountryCode: NSNumber(value: dialCodeNumber)) {
 
             generatedRegionCode = countryCode
         }

JNPhoneNumberView/Classes/Utils/PhoneNumberUtil/JNPhoneNumberUtil.swift

@@ -20,11 +20,8 @@ import libPhoneNumber_iOS
      */
     @objc public class func isPhoneNumberValid(phoneNumber: String, defaultRegion: String) -> Bool {
 
-        // Init phone number util
-        let phoneNumberUtil = NBPhoneNumberUtil()
-
         // Parse phone number
-        if let parsedPhoneNumber = JNPhoneNumberUtil.parsePhoneNumber(phoneNumber, defaultRegion: defaultRegion) {
+        if  let phoneNumberUtil = NBPhoneNumberUtil.sharedInstance(), let parsedPhoneNumber = JNPhoneNumberUtil.parsePhoneNumber(phoneNumber, defaultRegion: defaultRegion) {
 
             // Check if region code is empty
             if defaultRegion.isEmpty {
@@ -58,7 +55,7 @@ import libPhoneNumber_iOS
         }
 
         // Init phone number util
-        let phoneNumberUtil = NBPhoneNumberUtil()
+        guard let phoneNumberUtil = NBPhoneNumberUtil.sharedInstance() else { return nil}
 
         // Parse phone number
         do {

README.md

@@ -7,9 +7,9 @@
 
 ## Requirements
 
-- iOS 9.0+ / macOS 10.10+
-- Xcode 9.0+
-- Swift 4+
+- iOS 12.0+ / macOS 14.4+
+- Xcode 15.3+
+- Swift 5+
 
 
 ## Installation