From 24f2ac53232677b9390089ae2defc3f9f3d6ea3a Mon Sep 17 00:00:00 2001 From: Stefan Herold Date: Mon, 5 Sep 2022 10:15:06 +0200 Subject: [PATCH 01/14] Fix twitter handle --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 40512a5..cfaa48e 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ [![Xcode 13+](https://img.shields.io/badge/Xcode-13%2B-blue.svg)](https://developer.apple.com/download/) [![Codebeat](https://codebeat.co/badges/7ad2da62-af22-4a76-a4da-2eb2002bde18)](https://codebeat.co/projects/github-com-blackjacx-columbus-develop) [![License](https://img.shields.io/github/license/blackjacx/columbus.svg)](https://github.com/blackjacx/columbus/blob/main/LICENSE) -[![Twitter](https://img.shields.io/twitter/follow/blackjacxxx?label=%40Blackjacxxx)](https://twitter.com/blackjacx) +[![Twitter](https://img.shields.io/twitter/follow/blackjacxxx?label=%40Blackjacxxx)](https://twitter.com/blackjacxxx) [![Donate](https://img.shields.io/badge/Donate-PayPal-blue.svg)](https://www.paypal.me/STHEROLD) A country picker for iOS, tvOS ad watchOS with features you will only find distributed in many different country-picker implementations. From e139a8c848a4623f8fcc65c2045bc332e555ce52 Mon Sep 17 00:00:00 2001 From: Stefan Herold Date: Mon, 5 Sep 2022 10:55:29 +0200 Subject: [PATCH 02/14] Update gems --- Gemfile.lock | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b30a8f6..1ffb87e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,34 +3,34 @@ GEM specs: CFPropertyList (3.0.5) rexml - activesupport (6.1.6) + activesupport (6.1.6.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.603.0) - aws-sdk-core (3.131.2) + aws-partitions (1.626.0) + aws-sdk-core (3.140.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.57.0) + aws-sdk-kms (1.58.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.114.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.0) + aws-sigv4 (1.5.1) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.1.0) @@ -113,13 +113,13 @@ GEM rake (>= 12.0.0, < 14.0.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.6) + dotenv (2.8.1) emoji_regex (3.2.3) escape (0.0.4) ethon (0.15.0) ffi (>= 1.15.0) - excon (0.92.3) - faraday (1.10.0) + excon (0.92.4) + faraday (1.10.2) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -137,7 +137,7 @@ GEM faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) - faraday-http-cache (2.4.0) + faraday-http-cache (2.4.1) faraday (>= 0.8) faraday-httpclient (1.0.1) faraday-multipart (1.0.4) @@ -150,7 +150,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.6) - fastlane (2.207.0) + fastlane (2.209.1) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -194,9 +194,10 @@ GEM fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - git (1.11.0) + git (1.12.0) + addressable (~> 2.8) rchardet (~> 1.8) - google-apis-androidpublisher_v3 (0.24.0) + google-apis-androidpublisher_v3 (0.25.0) google-apis-core (>= 0.7, < 2.a) google-apis-core (0.7.0) addressable (~> 2.5, >= 2.5.1) @@ -219,11 +220,11 @@ GEM google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) google-cloud-errors (1.2.0) - google-cloud-storage (1.37.0) + google-cloud-storage (1.39.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.17.0) google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) @@ -238,11 +239,11 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.10.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) jmespath (1.6.1) json (2.6.2) - jwt (2.4.1) + jwt (2.5.0) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) @@ -250,7 +251,7 @@ GEM memoist (0.16.2) mini_magick (4.11.0) mini_mime (1.1.2) - minitest (5.16.2) + minitest (5.16.3) molinillo (0.8.0) multi_json (1.15.0) multipart-post (2.0.0) @@ -303,7 +304,7 @@ GEM tty-cursor (~> 0.7) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (2.0.4) + tzinfo (2.0.5) concurrent-ruby (~> 1.0) uber (0.1.0) unf (0.1.4) @@ -348,4 +349,4 @@ DEPENDENCIES xcov BUNDLED WITH - 2.3.17 + 2.3.21 From 7591621a4a71528b22c2437051ea5c233a836391 Mon Sep 17 00:00:00 2001 From: Stefan Herold Date: Mon, 5 Sep 2022 10:56:09 +0200 Subject: [PATCH 03/14] Version Gemfile --- .gitignore | 2 -- Gemfile | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 Gemfile diff --git a/.gitignore b/.gitignore index 82ae598..ab12654 100644 --- a/.gitignore +++ b/.gitignore @@ -23,8 +23,6 @@ Mintfile .swiftlint.yml # Danger config file which is downloaded Dangerfile -# Ruby gems config file which is downloaded -Gemfile # Bundler configuration which is bootstrapped .bundle # Bundler vendor information which is bootstrapped diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..72f0171 --- /dev/null +++ b/Gemfile @@ -0,0 +1,17 @@ +# Autogenerated by fastlane +# +# Ensure this file is checked in to source control! + +source "https://rubygems.org" + +gem 'fastlane' +gem 'cocoapods' +gem 'xcov' +gem 'danger' +gem 'danger-changelog' +gem 'danger-commit_lint' +gem 'danger-swiftlint' +gem 'danger-xcov' + +plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') +eval_gemfile(plugins_path) if File.exist?(plugins_path) \ No newline at end of file From f0949a475185c86bdf70d45b244dc8bdd9cbb0a0 Mon Sep 17 00:00:00 2001 From: Stefan Herold Date: Sun, 27 Nov 2022 01:56:55 +0100 Subject: [PATCH 04/14] Add contributors section --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index cfaa48e..7494341 100644 --- a/README.md +++ b/README.md @@ -137,6 +137,14 @@ Filtering|Index bar|History|Localization|Theming [Stefan Herold](mailto:stefan.herold@gmail.com) • 🐦 [@Blackjacxxx](https://twitter.com/Blackjacxxx) +## Contributors + +Thanks to all of you who are part of this: + + + + + ## Links - [Modifying UISearchBar Cancel button font text color and style](https://stackoverflow.com/questions/11572372/modifying-uisearchbar-cancel-button-font-text-color-and-style) From 12eb064de31088edf6a6e4862d9a49e6895ebbcd Mon Sep 17 00:00:00 2001 From: Stefan Herold Date: Wed, 1 Mar 2023 20:56:28 +0100 Subject: [PATCH 05/14] Update Badges --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7494341..fe164c8 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,7 @@ -# Columbus - -[![Version]("https://img.shields.io/github/release/blackjacx/Columbus.svg")](https://github.com/Blackjacx/Columbus/releases) +[![Twitter Follow](https://img.shields.io/badge/follow-%40blackjacx-1DA1F2?logo=twitter&style=for-the-badge)](https://twitter.com/intent/follow?original_referer=https%3A%2F%2Fgithub.com%2Fblackjacx&screen_name=Blackjacxxx) +[![Version](https://img.shields.io/github/release/blackjacx/Columbus.svg)](https://github.com/Blackjacx/Columbus/releases) [![Carthage compatible](https://img.shields.io/badge/Carthage-Compatible-brightgreen.svg?style=flat)](https://github.com/Carthage/Carthage) [![Platforms](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2FBlackjacx%2FColumbus%2Fbadge%3Ftype%3Dplatforms)](https://swiftpackageindex.com/Blackjacx/Columbus) [![Swift Versions](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2FBlackjacx%2FColumbus%2Fbadge%3Ftype%3Dswift-versions)](https://swiftpackageindex.com/Blackjacx/Columbus) @@ -10,8 +9,9 @@ [![Xcode 13+](https://img.shields.io/badge/Xcode-13%2B-blue.svg)](https://developer.apple.com/download/) [![Codebeat](https://codebeat.co/badges/7ad2da62-af22-4a76-a4da-2eb2002bde18)](https://codebeat.co/projects/github-com-blackjacx-columbus-develop) [![License](https://img.shields.io/github/license/blackjacx/columbus.svg)](https://github.com/blackjacx/columbus/blob/main/LICENSE) -[![Twitter](https://img.shields.io/twitter/follow/blackjacxxx?label=%40Blackjacxxx)](https://twitter.com/blackjacxxx) -[![Donate](https://img.shields.io/badge/Donate-PayPal-blue.svg)](https://www.paypal.me/STHEROLD) +[![Donate](https://img.shields.io/badge/Donate-PayPal-blue.svg?logo=paypal&style=for-the-badge)](https://www.paypal.me/STHEROLD) + +# Columbus A country picker for iOS, tvOS ad watchOS with features you will only find distributed in many different country-picker implementations. From 5eeace5235f5638358a09c5a52ae8a1152d0849d Mon Sep 17 00:00:00 2001 From: Stefan Herold Date: Fri, 3 Mar 2023 23:51:40 +0100 Subject: [PATCH 06/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fe164c8..923e2b1 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ # Columbus -A country picker for iOS, tvOS ad watchOS with features you will only find distributed in many different country-picker implementations. +A country picker 🌎 for iOS, tvOS ad watchOS with features you will only find distributed in many different country-picker implementations. ## Features From 4d0d1e7da61eaad52b36fc220ab68356c1eed211 Mon Sep 17 00:00:00 2001 From: Stefan Herold Date: Tue, 2 May 2023 22:12:26 +0200 Subject: [PATCH 07/14] Make CoreTelephony Approach Debuggable --- .../Classes/CountryPickerViewController.swift | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/Source/Classes/CountryPickerViewController.swift b/Source/Classes/CountryPickerViewController.swift index 7c0d31d..dc16970 100644 --- a/Source/Classes/CountryPickerViewController.swift +++ b/Source/Classes/CountryPickerViewController.swift @@ -249,6 +249,12 @@ public final class CountryPickerViewController: UIViewController { /// 3. Using `US` as fallback if the other approaches didn't work. public static func defaultCountry(from isoCountryCode: String? = nil) -> Country { + // Fallback to United States + + let defaultCountry = countries.first { + $0.isoCountryCode.compare("US", options: .caseInsensitive) == .orderedSame + }! + // Using the `isoCountryCode` parameter to force the picker to return a specific country. if @@ -260,16 +266,24 @@ public final class CountryPickerViewController: UIViewController { // Core Telephony Approach #if os(iOS) && !targetEnvironment(simulator) - if let carriers = CTTelephonyNetworkInfo().serviceSubscriberCellularProviders?.map(\.value), - let firstIsoCountryCode = carriers.compactMap(\.isoCountryCode).first?.uppercased(), - let country = (countries.first { $0.isoCountryCode.compare(firstIsoCountryCode, options: .caseInsensitive) == .orderedSame }) { - return country + guard let cellularProviders = CTTelephonyNetworkInfo().serviceSubscriberCellularProviders else { + return defaultCountry + } + guard let carriers = cellularProviders.map(\.value) else { + return defaultCountry + } + guard let firstIsoCountryCode = carriers.compactMap(\.isoCountryCode).first?.uppercased() else { + return defaultCountry + } + guard let country = (countries.first { $0.isoCountryCode.compare(firstIsoCountryCode, options: .caseInsensitive) == .orderedSame }) else { + return defaultCountry } + return country #endif // Fallback to United States - return countries.first { $0.isoCountryCode.compare("US", options: .caseInsensitive) == .orderedSame }! + return defaultCountry } private static func createCountries() -> CountryList { From d7cafdf4b20d730a8a54306ab52d1af0389f7465 Mon Sep 17 00:00:00 2001 From: Stefan Herold Date: Tue, 2 May 2023 22:13:33 +0200 Subject: [PATCH 08/14] Update Gems --- Gemfile.lock | 116 +++++++++++++++++++++++++-------------------------- 1 file changed, 56 insertions(+), 60 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1ffb87e..6d5944b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,15 +1,14 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.5) + CFPropertyList (3.0.6) rexml - activesupport (6.1.6.1) + activesupport (7.0.4.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) - addressable (2.8.1) + addressable (2.8.4) public_suffix (>= 2.0.2, < 6.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) @@ -17,20 +16,20 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.626.0) - aws-sdk-core (3.140.0) + aws-partitions (1.759.0) + aws-sdk-core (3.171.0) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.525.0) - aws-sigv4 (~> 1.1) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.58.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-kms (1.64.0) + aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.114.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-s3 (1.121.0) + aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.1) + aws-sigv4 (1.5.2) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.1.0) @@ -38,15 +37,15 @@ GEM cork nap open4 (~> 1.3) - cocoapods (1.11.3) + cocoapods (1.12.1) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.11.3) + cocoapods-core (= 1.12.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.4.0, < 2.0) + cocoapods-downloader (>= 1.6.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.4.0, < 2.0) + cocoapods-trunk (>= 1.6.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) @@ -54,10 +53,10 @@ GEM gh_inspector (~> 1.0) molinillo (~> 0.8.0) nap (~> 1.0) - ruby-macho (>= 1.0, < 3.0) + ruby-macho (>= 2.3.0, < 3.0) xcodeproj (>= 1.21.0, < 2.0) - cocoapods-core (1.11.3) - activesupport (>= 5.0, < 7) + cocoapods-core (1.12.1) + activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) @@ -79,21 +78,21 @@ GEM colored2 (3.1.2) commander (4.6.0) highline (~> 2.0.0) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) cork (0.3.0) colored2 (~> 3.1) - danger (8.6.1) + danger (9.3.0) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) cork (~> 0.1) - faraday (>= 0.9.0, < 2.0) + faraday (>= 0.9.0, < 3.0) faraday-http-cache (~> 2.0) - git (~> 1.7) + git (~> 1.13.0) kramdown (~> 2.3) kramdown-parser-gfm (~> 1.0) no_proxy_fix - octokit (~> 4.7) + octokit (~> 5.0) terminal-table (>= 1, < 4) danger-changelog (0.6.1) danger-plugin-api (~> 1.0) @@ -101,7 +100,7 @@ GEM danger-plugin-api (~> 1.0) danger-plugin-api (1.0.0) danger (> 2.0) - danger-swiftlint (0.30.2) + danger-swiftlint (0.33.0) danger rake (> 10) thor (~> 0.19) @@ -116,10 +115,10 @@ GEM dotenv (2.8.1) emoji_regex (3.2.3) escape (0.0.4) - ethon (0.15.0) + ethon (0.16.0) ffi (>= 1.15.0) - excon (0.92.4) - faraday (1.10.2) + excon (0.99.0) + faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -137,7 +136,7 @@ GEM faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) - faraday-http-cache (2.4.1) + faraday-http-cache (2.5.0) faraday (>= 0.8) faraday-httpclient (1.0.1) faraday-multipart (1.0.4) @@ -150,7 +149,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.6) - fastlane (2.209.1) + fastlane (2.212.2) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -189,17 +188,16 @@ GEM xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) - fastlane-plugin-changelog (0.16.0) ffi (1.15.5) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - git (1.12.0) + git (1.13.2) addressable (~> 2.8) rchardet (~> 1.8) - google-apis-androidpublisher_v3 (0.25.0) - google-apis-core (>= 0.7, < 2.a) - google-apis-core (0.7.0) + google-apis-androidpublisher_v3 (0.41.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.0) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -208,27 +206,27 @@ GEM retriable (>= 2.0, < 4.a) rexml webrick - google-apis-iamcredentials_v1 (0.13.0) - google-apis-core (>= 0.7, < 2.a) - google-apis-playcustomapp_v1 (0.10.0) - google-apis-core (>= 0.7, < 2.a) - google-apis-storage_v1 (0.17.0) - google-apis-core (>= 0.7, < 2.a) + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-storage_v1 (0.19.0) + google-apis-core (>= 0.9.0, < 2.a) google-cloud-core (1.6.0) google-cloud-env (~> 1.0) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.2.0) - google-cloud-storage (1.39.0) + google-cloud-errors (1.3.1) + google-cloud-storage (1.44.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.17.0) + google-apis-storage_v1 (~> 0.19.0) google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.2.0) + googleauth (1.5.2) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) memoist (~> 0.16) @@ -239,19 +237,19 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.12.0) + i18n (1.13.0) concurrent-ruby (~> 1.0) - jmespath (1.6.1) - json (2.6.2) - jwt (2.5.0) + jmespath (1.6.2) + json (2.6.3) + jwt (2.7.0) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) memoist (0.16.2) - mini_magick (4.11.0) + mini_magick (4.12.0) mini_mime (1.1.2) - minitest (5.16.3) + minitest (5.18.0) molinillo (0.8.0) multi_json (1.15.0) multipart-post (2.0.0) @@ -260,13 +258,13 @@ GEM naturally (2.2.1) netrc (0.11.0) no_proxy_fix (0.1.2) - octokit (4.25.1) + octokit (5.6.1) faraday (>= 1, < 3) sawyer (~> 0.9) open4 (1.3.4) optparse (0.1.1) os (1.1.4) - plist (3.6.0) + plist (3.7.0) public_suffix (4.0.7) rake (13.0.6) rchardet (1.8.0) @@ -289,7 +287,7 @@ GEM faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simctl (1.6.8) + simctl (1.6.10) CFPropertyList naturally slack-notifier (2.4.0) @@ -304,14 +302,14 @@ GEM tty-cursor (~> 0.7) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) unf (0.1.4) unf_ext unf_ext (0.0.8.2) unicode-display_width (1.8.0) - webrick (1.7.0) + webrick (1.8.1) word_wrap (1.0.0) xcodeproj (1.22.0) CFPropertyList (>= 2.3.3, < 4.0) @@ -332,7 +330,6 @@ GEM xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) xcresult (0.2.1) - zeitwerk (2.6.0) PLATFORMS ruby @@ -345,8 +342,7 @@ DEPENDENCIES danger-swiftlint danger-xcov fastlane - fastlane-plugin-changelog xcov BUNDLED WITH - 2.3.21 + 2.4.12 From 5842b9d9cc8fea7288eab1bd91d634075ffe0ba5 Mon Sep 17 00:00:00 2001 From: Stefan Herold Date: Tue, 2 May 2023 22:14:57 +0200 Subject: [PATCH 09/14] Remove auto assign to project workflow --- .github/workflows/auto-assign-to-project.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .github/workflows/auto-assign-to-project.yml diff --git a/.github/workflows/auto-assign-to-project.yml b/.github/workflows/auto-assign-to-project.yml deleted file mode 100644 index a1512d1..0000000 --- a/.github/workflows/auto-assign-to-project.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Auto Assign to Project - -on: - issues: - types: [opened] - pull_request: - types: [opened] - -jobs: - add-to-project: - runs-on: ubuntu-latest - name: Assign to "Backlog" Project - steps: - - name: Assign NEW issues and NEW pull requests to global project "Backlog" (1) - uses: actions/add-to-project@main - with: - project-url: https://github.com/users/Blackjacx/projects/1 - github-token: ${{ secrets.ACCESS_TOKEN }} \ No newline at end of file From 5a010c437f6b9fe74ef3a1cbe4affa3a814bd037 Mon Sep 17 00:00:00 2001 From: Stefan Herold Date: Tue, 2 May 2023 22:22:41 +0200 Subject: [PATCH 10/14] Add generic test workflow --- .github/workflows/test.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..d5eee4d --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,28 @@ +name: Test + +on: + push: + branches: [ develop ] + +jobs: + build: + strategy: + fail-fast: false + matrix: + os: ["macos-12"] + swift: ["5.6.1"] + runs-on: ${{ matrix.os }} + + steps: + - uses: swift-actions/setup-swift@v1 + with: + swift-version: ${{ matrix.swift }} + - uses: actions/checkout@v3 + - name: Log Swift Version + run: swift --version + - name: Log Xcode Versions + run: ls -la /Applications/ + - name: Build for macOS + run: swift build -v + - name: Run Tests for macOS + run: swift test -v \ No newline at end of file From 63c2cb926e2f6c15fefcfb6cb0933843b0d883a0 Mon Sep 17 00:00:00 2001 From: Stefan Herold Date: Tue, 2 May 2023 22:22:49 +0200 Subject: [PATCH 11/14] Update Gems --- Gemfile.lock | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index 6d5944b..f00c2b7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -188,6 +188,7 @@ GEM xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) + fastlane-plugin-changelog (0.16.0) ffi (1.15.5) fourflusher (2.3.1) fuzzy_match (2.0.4) @@ -342,6 +343,7 @@ DEPENDENCIES danger-swiftlint danger-xcov fastlane + fastlane-plugin-changelog xcov BUNDLED WITH From f56f8a5414cb753cf3b4b7b40cdff365b1d1d7a5 Mon Sep 17 00:00:00 2001 From: Stefan Herold Date: Tue, 2 May 2023 22:24:54 +0200 Subject: [PATCH 12/14] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 631a16f..cc8275e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Change Log ## [Unreleased] +* Remove auto assign to project workflow - [@Blackjacx](https://github.com/Blackjacx). +* Make CoreTelephony Approach Debuggable - [@Blackjacx](https://github.com/Blackjacx). ## [1.7.6] - 2022-07-07Z From 302fc14bc6592e03bde113735e5f3e9554aa7a04 Mon Sep 17 00:00:00 2001 From: Stefan Herold Date: Tue, 2 May 2023 22:36:57 +0200 Subject: [PATCH 13/14] Upgrade project settings --- Columbus.xcodeproj/project.pbxproj | 17 ++++++++++++++++- .../xcschemes/Columbus-iOS.xcscheme | 2 +- .../xcschemes/Columbus-tvOS.xcscheme | 2 +- .../xcschemes/Columbus_iOS_Example.xcscheme | 2 +- .../xcschemes/Columbus_tvOS_Example.xcscheme | 2 +- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/Columbus.xcodeproj/project.pbxproj b/Columbus.xcodeproj/project.pbxproj index e180c9a..44aba00 100644 --- a/Columbus.xcodeproj/project.pbxproj +++ b/Columbus.xcodeproj/project.pbxproj @@ -379,8 +379,9 @@ 607FACC81AFB9204008FA782 /* Project object */ = { isa = PBXProject; attributes = { + BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 1010; - LastUpgradeCheck = 1250; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = "Stefan Herold"; TargetAttributes = { B94B1AF421CD38B400FF1B72 = { @@ -593,6 +594,7 @@ CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -650,6 +652,7 @@ CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = YES; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -686,6 +689,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 33; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = Source/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -694,6 +698,8 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.stherold.columbus; @@ -724,6 +730,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 33; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = Source/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -732,6 +739,8 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14"; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.stherold.columbus; PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)"; @@ -903,6 +912,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 33; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = Source/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -911,6 +921,8 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.stherold.columbus; @@ -942,6 +954,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 33; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = Source/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -950,6 +963,8 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14"; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.stherold.columbus; PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)"; diff --git a/Columbus.xcodeproj/xcshareddata/xcschemes/Columbus-iOS.xcscheme b/Columbus.xcodeproj/xcshareddata/xcschemes/Columbus-iOS.xcscheme index 5ab1630..4e5cb6d 100644 --- a/Columbus.xcodeproj/xcshareddata/xcschemes/Columbus-iOS.xcscheme +++ b/Columbus.xcodeproj/xcshareddata/xcschemes/Columbus-iOS.xcscheme @@ -1,6 +1,6 @@ Date: Tue, 2 May 2023 22:51:13 +0200 Subject: [PATCH 14/14] Fastlane: Release on Production 1.8.0 --- CHANGELOG.md | 2 ++ Columbus.podspec | 2 +- Columbus.xcodeproj/project.pbxproj | 16 ++++++++-------- LICENSE | 2 +- Source/Info.plist | 4 ++-- Source/Resources/Info.plist | 4 ++-- Tests/Info.plist | 4 ++-- 7 files changed, 18 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc8275e..9c62e0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Change Log ## [Unreleased] + +## [1.8.0] - 2023-05-02Z * Remove auto assign to project workflow - [@Blackjacx](https://github.com/Blackjacx). * Make CoreTelephony Approach Debuggable - [@Blackjacx](https://github.com/Blackjacx). diff --git a/Columbus.podspec b/Columbus.podspec index 081e63f..5ccda5c 100644 --- a/Columbus.podspec +++ b/Columbus.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Columbus' - s.version = '1.7.6' + s.version = '1.8.0' 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 index 44aba00..4901c5c 100644 --- 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 = 33; + CURRENT_PROJECT_VERSION = 34; DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 33; + DYLIB_CURRENT_VERSION = 34; 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 = 33; + CURRENT_PROJECT_VERSION = 34; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 33; + DYLIB_CURRENT_VERSION = 34; 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 = 33; + CURRENT_PROJECT_VERSION = 34; DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 33; + DYLIB_CURRENT_VERSION = 34; 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 = 33; + CURRENT_PROJECT_VERSION = 34; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 33; + DYLIB_CURRENT_VERSION = 34; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_MODULE_VERIFIER = YES; GCC_C_LANGUAGE_STANDARD = gnu11; diff --git a/LICENSE b/LICENSE index 3a242ef..f317850 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2022 Stefan Herold +Copyright (c) 2023 Stefan Herold Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Source/Info.plist b/Source/Info.plist index 6907190..5d01010 100644 --- a/Source/Info.plist +++ b/Source/Info.plist @@ -15,8 +15,8 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.7.6 + 1.8.0 CFBundleVersion - 33 + 34 diff --git a/Source/Resources/Info.plist b/Source/Resources/Info.plist index a41aa38..fce57f1 100644 --- a/Source/Resources/Info.plist +++ b/Source/Resources/Info.plist @@ -13,9 +13,9 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.7.6 + 1.8.0 CFBundleVersion - 33 + 34 NSHumanReadableCopyright Copyright © 2022 Stefan Herold. All rights reserved. NSPrincipalClass diff --git a/Tests/Info.plist b/Tests/Info.plist index e940fdf..3610af1 100644 --- a/Tests/Info.plist +++ b/Tests/Info.plist @@ -15,8 +15,8 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.7.6 + 1.8.0 CFBundleVersion - 33 + 34