Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 1-15-stable #764

Merged
merged 2 commits into from
Jan 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,17 @@

##### Bug Fixes

* None.


## 1.15.0 (2024-01-28)

##### Enhancements

* None.

##### Bug Fixes

* Fix an issue updating spec repos in Podfile.lock when the key already exists
[fnxpt](https://github.com/fnxpt)
[#748](https://github.com/CocoaPods/Core/issues/748)
Expand Down
14 changes: 7 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
cocoapods-core (1.14.3)
cocoapods-core (1.15.0)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
Expand All @@ -15,7 +15,7 @@ PATH
GEM
remote: https://rubygems.org/
specs:
activesupport (7.1.2)
activesupport (7.1.3)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand All @@ -25,7 +25,7 @@ GEM
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.5)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
Expand All @@ -34,9 +34,9 @@ GEM
awesome_print (1.9.2)
bacon (1.2.0)
base64 (0.1.1)
bigdecimal (3.1.4)
bigdecimal (3.1.6)
coderay (1.1.3)
concurrent-ruby (1.2.2)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
crack (0.4.5)
rexml
Expand All @@ -50,7 +50,7 @@ GEM
httpclient (2.8.3)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
json (2.6.3)
json (2.7.1)
kicker (3.0.0)
listen (~> 1.3.0)
notify (~> 0.5.2)
Expand All @@ -61,7 +61,7 @@ GEM
rb-kqueue (>= 0.2)
metaclass (0.0.4)
method_source (1.0.0)
minitest (5.20.0)
minitest (5.21.2)
mocha (1.4.0)
metaclass (~> 0.0.1)
mocha-on-bacon (0.2.3)
Expand Down
2 changes: 1 addition & 1 deletion lib/cocoapods-core/gem_version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Pod
# The version of the cocoapods-core.
#
CORE_VERSION = '1.14.3'.freeze unless defined? Pod::CORE_VERSION
CORE_VERSION = '1.15.0'.freeze unless defined? Pod::CORE_VERSION
end