Skip to content

C
cocoapods
Unverified Commit 7352385b authored by Samuel Giddins's avatar Samuel Giddins
Browse files
Options

Merge tag '1.5.1' 

Release 1.5.1

# gpg: Signature made Sun May  6 22:18:59 2018 PDT
# gpg:                using RSA key 01195BB315DDA856
# gpg: Good signature from "Samuel Giddins <segiddins@segiddins.me>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 7B19 37A9 CF66 AEF6 52C9  4090 0119 5BB3 15DD A856

# Conflicts:
#	Gemfile.lock
#	lib/cocoapods/gem_version.rb
#	lib/cocoapods/generator/xcconfig/pod_xcconfig.rb
#	lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
#	lib/cocoapods/installer/xcode/pods_project_generator.rb
#	spec/cocoapods-integration-specs
#	spec/unit/generator/xcconfig/xcconfig_helper_spec.rb
#	spec/unit/installer/xcode/pods_project_generator/pod_target_integrator_spec.rb
#	spec/unit/installer/xcode/pods_project_generator_spec.rb
#	spec/unit/target/pod_target_spec.rb
parents 601e0d70 ddb59c7f
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 29 deletions
CHANGELOG.md
View file @ 7352385b
......@@ -12,9 +12,6 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#7610](https://github.com/CocoaPods/CocoaPods/pull/7610)
* Improve performance of the dependency resolver by removing duplicates for dependency nodes.
[Jacek Suliga](https://github.com/jmkk)
* Improve performance of Pods project generator by skipping native targets for which dependent targets have already been added.
[Jacek Suliga](https://github.com/jmkk)
......@@ -35,11 +32,33 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#7671](https://github.com/CocoaPods/CocoaPods/pull/7671)
* Remove [system] declaration attribute from generated module maps
* When integrating a vendored framework while building pods as static
libraries, public headers will be found via `FRAMEWORK_SEARCH_PATHS`
instead of via the sandbox headers store.
[Samuel Giddins](https://github.com/segiddins)
* Improve performance of grouping pods by configuration.
[Samuel Giddins](https://github.com/segiddins)
## 1.5.1 (2018-05-07)
##### Enhancements
* Improve performance of the dependency resolver by removing duplicates for dependency nodes.
[Jacek Suliga](https://github.com/jmkk)
##### Bug Fixes
* Do not include test dependencies input and output paths.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#7688](https://github.com/CocoaPods/CocoaPods/pull/7688)
* Remove [system] declaration attribute from generated module maps.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#7589](https://github.com/CocoaPods/CocoaPods/issues/7589)
* Properly namespace Info.plist names during target installation
* Properly namespace Info.plist names during target installation.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#7611](https://github.com/CocoaPods/CocoaPods/pull/7611)
......@@ -51,7 +70,7 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Paul Beusterien](https://github.com/paulb777)
[#7597](https://github.com/CocoaPods/CocoaPods/issues/7597)
* Fix static framework dependent target double linking without use_frameworks
* Fix static framework dependent target double linking without `use_frameworks`.
[Paul Beusterien](https://github.com/paulb777)
[#7592](https://github.com/CocoaPods/CocoaPods/issues/7592)
......@@ -59,27 +78,18 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Paul Beusterien](https://github.com/paulb777)
[#7596](https://github.com/CocoaPods/CocoaPods/issues/7596)
* Inhibit warnings for all dependencies during validation except for the one being validated
* Inhibit warnings for all dependencies during validation except for the one being validated.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#7434](https://github.com/CocoaPods/CocoaPods/issues/7434)
* Prevent duplicated targets from being stripped out from the framework search paths
* Prevent duplicated targets from being stripped out from the framework search paths.
[Liquidsoul](https://github.com/liquidsoul)
[#7644](https://github.com/CocoaPods/CocoaPods/pull/7644)
* Fix assetcatalog_generated_info.plist path in copy resources phase
* Fix `assetcatalog_generated_info.plist` path in copy resources phase.
[Maxime Le Moine](https://github.com/MaximeLM)
[#7590](https://github.com/CocoaPods/CocoaPods/issues/7590)
* When integrating a vendored framework while building pods as static
libraries, public headers will be found via `FRAMEWORK_SEARCH_PATHS`
instead of via the sandbox headers store.
[Samuel Giddins](https://github.com/segiddins)
* Improve performance of grouping pods by configuration.
[Samuel Giddins](https://github.com/segiddins)
## 1.5.0 (2018-04-04)
......
Gemfile.lock
View file @ 7352385b
......@@ -7,31 +7,31 @@ GIT
GIT
remote: https://github.com/CocoaPods/Core.git
revision: 35b53a939c553c510e81fcf2cec0ff6682399b9a
revision: 14db1616354add8708bd7a4b421ee7495ae38c7a
branch: master
specs:
cocoapods-core (1.5.0)
cocoapods-core (1.5.1)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
GIT
remote: https://github.com/CocoaPods/Molinillo.git
revision: 7b80ebfab83a49eb09f1553615c2a239703bc58b
revision: 62d2053655b1cbf0058d66ba18390e00fb33e95b
branch: master
specs:
molinillo (0.6.5)
GIT
remote: https://github.com/CocoaPods/Nanaimo.git
revision: 0761356d8d6f42248bd2ee262accfd414bc566ca
revision: aa4d0c50772c4392039e70a88bd9cc944064f0ad
branch: master
specs:
nanaimo (0.2.5)
GIT
remote: https://github.com/CocoaPods/Xcodeproj.git
revision: bd3dc02dc8680e655d8f562c9f5ad196b5d9fac1
revision: b792bafe384981530c58b50345d0aed9a4130b2c
branch: master
specs:
xcodeproj (1.5.7)
......@@ -50,14 +50,14 @@ GIT
GIT
remote: https://github.com/CocoaPods/cocoapods-downloader.git
revision: e3d4c635550e8a583962cd12769ec57d218e4a38
revision: 0ee265e0f869c8866da458a61d41c5be96dbbc67
branch: master
specs:
cocoapods-downloader (1.2.0)
GIT
remote: https://github.com/CocoaPods/cocoapods-plugins.git
revision: 814d115bfc40f53bb260711330c10e307e1c86e7
revision: 014a4632cb1732a8fd6d0fca1993905e5e9fadf8
branch: master
specs:
cocoapods-plugins (1.0.0)
......@@ -103,10 +103,10 @@ GIT
PATH
remote: .
specs:
cocoapods (1.5.0)
cocoapods (1.5.1)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.5.0)
cocoapods-core (= 1.5.1)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-downloader (>= 1.2.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
......
lib/cocoapods/gem_version.rb
View file @ 7352385b
module Pod
# The version of the CocoaPods command line tool.
#
VERSION = '1.5.0'.freeze unless defined? Pod::VERSION
VERSION = '1.5.1'.freeze unless defined? Pod::VERSION
end
cocoapods-integration-specs @ d76d5718
Subproject commit f97b8dce2ecb1f82b7b289189016778465bfd39e
Subproject commit d76d57181848aff661506ad5b6d6481fc79d86f8
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment