Merge branch 'master' of github.com:SURYAKANTSHARMA/CountryPicker int…

…o iOS15AndAbove # Conflicts: # CountryPicker/Examples/CoCoaPods/CountryPickerExample.xcodeproj/project.pbxproj # CountryPicker/Examples/CoCoaPods/Pods/Local Podspecs/SKCountryPicker.podspec.json # CountryPicker/Examples/CoCoaPods/Pods/Target Support Files/SKCountryPicker/SKCountryPicker.debug.xcconfig # CountryPicker/Examples/CoCoaPods/Pods/Target Support Files/SKCountryPicker/SKCountryPicker.release.xcconfig # CountryPickeriOS15+/CountryPicker13+Example/Podfile # CountryPickeriOS15+/CountryPicker13+Example/Pods/Pods.xcodeproj/project.pbxproj # CountryPickeriOS15+/CountryPicker13+Example/Pods/Target Support Files/Pods-CountryPicker13+Example/Pods-CountryPicker13+Example-acknowledgements.markdown # CountryPickeriOS15+/CountryPicker13+Example/Pods/Target Support Files/Pods-CountryPicker13+Example/Pods-CountryPicker13+Example-acknowledgements.plist
SURYAKANTSHARMA · Apr 28, 2024 · 3990a51 · 3990a51
2 parents 7083744 + 99d92ef
commit 3990a51
Show file tree

Hide file tree

Showing 521 changed files with 4,487 additions and 75 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-osx_image: xcode11
+osx_image: xcode15
 language: swift
 xcode_project: CountryPicker/CountryPicker.xcodeproj
 script:

diff --git a/CountryPicker/Examples/CoCoaPods/Pods/Pods.xcodeproj/project.pbxproj b/CountryPicker/Examples/CoCoaPods/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/CountryPickeriOS15+/CountryPicker13+Example/Podfile b/CountryPickeriOS15+/CountryPicker13+Example/Podfile
@@ -0,0 +1,13 @@
+# Uncomment the next line to define a global platform for your project
+# platform :ios, '15.0'
+
+target 'CountryPicker13+Example' do
+  # Comment the next line if you don't want to use dynamic frameworks
+  use_frameworks!
+
+  pod 'SKCountryPicker', :git => 'https://github.com/SURYAKANTSHARMA/CountryPicker', :branch => 'iOS15AndAbove'
+
+   #pod 'SKCountryPicker', path: '../'
+  # Pods for CountryPicker13+Example
+
+end