Skip to content

Commit

Permalink
Merge branch 'release/1.9.0' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Blackjacx committed May 9, 2023
2 parents b59b95f + 832a1a9 commit f7ac144
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 15 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Change Log

## [Unreleased]

## [1.9.0] - 2023-05-09Z
* [#49](https://github.com/Blackjacx/Columbus/pull/49): Add fallback for CTCarrier deprecation - [@mic-ioki](https://github.com/mic-ioki).
* Use default country for the initial country code - [@Blackjacx](https://github.com/Blackjacx).
* Update Copyright - [@Blackjacx](https://github.com/Blackjacx).
Expand Down
2 changes: 1 addition & 1 deletion Columbus.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Columbus'
s.version = '1.8.1'
s.version = '1.9.0'
s.license = { :type => 'MIT', :file => 'LICENSE' }
s.summary = 'A country picker for iOS, tvOS and watchOS.'
s.description = <<-DESC
Expand Down
16 changes: 8 additions & 8 deletions Columbus.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -683,11 +683,11 @@
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CURRENT_PROJECT_VERSION = 35;
CURRENT_PROJECT_VERSION = 36;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 35;
DYLIB_CURRENT_VERSION = 36;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -725,10 +725,10 @@
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CURRENT_PROJECT_VERSION = 35;
CURRENT_PROJECT_VERSION = 36;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 35;
DYLIB_CURRENT_VERSION = 36;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -906,11 +906,11 @@
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CURRENT_PROJECT_VERSION = 35;
CURRENT_PROJECT_VERSION = 36;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 35;
DYLIB_CURRENT_VERSION = 36;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -949,10 +949,10 @@
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CURRENT_PROJECT_VERSION = 35;
CURRENT_PROJECT_VERSION = 36;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 35;
DYLIB_CURRENT_VERSION = 36;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down
4 changes: 2 additions & 2 deletions Source/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.8.1</string>
<string>1.9.0</string>
<key>CFBundleVersion</key>
<string>35</string>
<string>36</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions Source/Resources/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.8.1</string>
<string>1.9.0</string>
<key>CFBundleVersion</key>
<string>35</string>
<string>36</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2023 Stefan Herold. All rights reserved.</string>
<key>NSPrincipalClass</key>
Expand Down
4 changes: 2 additions & 2 deletions Tests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.8.1</string>
<string>1.9.0</string>
<key>CFBundleVersion</key>
<string>35</string>
<string>36</string>
</dict>
</plist>

0 comments on commit f7ac144

Please sign in to comment.