cocoapods 0.34.2 → 0.34.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +47 -1
- data/LICENSE +2 -2
- data/lib/cocoapods/command.rb +15 -0
- data/lib/cocoapods/command/outdated.rb +1 -1
- data/lib/cocoapods/gem_version.rb +1 -1
- data/lib/cocoapods/generator/copy_resources_script.rb +3 -1
- data/lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb +1 -0
- data/lib/cocoapods/generator/xcconfig/private_pod_xcconfig.rb +1 -1
- data/lib/cocoapods/installer/analyzer.rb +1 -1
- data/lib/cocoapods/installer/target_installer.rb +1 -1
- data/lib/cocoapods/installer/user_project_integrator/target_integrator.rb +22 -6
- data/lib/cocoapods/installer/user_project_integrator/target_integrator/xcconfig_integrator.rb +2 -2
- data/lib/cocoapods/sources_manager.rb +12 -2
- data/lib/cocoapods/user_interface/error_report.rb +5 -0
- metadata +8 -8
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 3f3abb2d3de142a65e9ee1f6f6aa56f207b049ff
|
4
|
+
data.tar.gz: 3c0e8b8c8051aaf81e528ed63b6e2677a4d0ccb9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 12b256248b4daee4938865e5f94fa85df245592b712d4877c8cb4385a81dd22511fcc6789477ad2d0eb760c58c037256f5b87d2b1e16fe8da466e31a483cd889
|
7
|
+
data.tar.gz: fb256b64d4ad70edbefcff2a4c8f37e746c13dfcaf43b75ae95854f05dc4af7e71b13f9b8066dd1a32528a35f69a56aa3f04dac518b0cf6c8a347276509e2658
|
data/CHANGELOG.md
CHANGED
@@ -2,6 +2,52 @@
|
|
2
2
|
|
3
3
|
To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
|
4
4
|
|
5
|
+
## 0.34.4
|
6
|
+
|
7
|
+
##### Bug Fixes
|
8
|
+
|
9
|
+
* Fixes a crash when running `pod outdated`.
|
10
|
+
[Samuel Giddins](https://github.com/segiddins)
|
11
|
+
[#2624](https://github.com/CocoaPods/CocoaPods/issues/2624)
|
12
|
+
|
13
|
+
* Ensure that external sources (as specified in the `Podfile`) are downloaded
|
14
|
+
when their source is missing, even if their specification is present.
|
15
|
+
[Samuel Giddins](https://github.com/segiddins)
|
16
|
+
[#2494](https://github.com/CocoaPods/CocoaPods/issues/2494)
|
17
|
+
|
18
|
+
* Fixes an issue where running `pod install/update` while the Xcode project
|
19
|
+
is open can cause the open project to have build failures until Xcode
|
20
|
+
is restarted.
|
21
|
+
[Kyle Fuller](https://github.com/kylef)
|
22
|
+
[#2627](https://github.com/CocoaPods/CocoaPods/issues/2627)
|
23
|
+
[#2665](https://github.com/CocoaPods/CocoaPods/issues/2665)
|
24
|
+
|
25
|
+
* Fixes a crash when using file URLs as a source.
|
26
|
+
[Kurry Tran](https://github.com/kurry)
|
27
|
+
[#2683](https://github.com/CocoaPods/CocoaPods/issues/2683)
|
28
|
+
|
29
|
+
* Fixes an issue when using pods in static library targets and building with
|
30
|
+
Xcode 6 which requires `OTHER_LIBTOOLFLAGS` instead of `OTHER_LDFLAGS`, thus
|
31
|
+
basically reverting to the previous Xcode behaviour, for now at least.
|
32
|
+
[Kyle Fuller](https://github.com/kylef)
|
33
|
+
[Eloy Durán](https://github.com/alloy)
|
34
|
+
[#2666](https://github.com/CocoaPods/CocoaPods/issues/2666)
|
35
|
+
|
36
|
+
* Fixes an issue running the resources script when Xcode is installed to a
|
37
|
+
directory with a space when compiling xcassets.
|
38
|
+
[Kyle Fuller](https://github.com/kylef)
|
39
|
+
[#2684](https://github.com/CocoaPods/CocoaPods/issues/2684)
|
40
|
+
|
41
|
+
* Fixes an issue when installing Pods with resources to a target which
|
42
|
+
doesn't have any resources.
|
43
|
+
[Kyle Fuller](https://github.com/kylef)
|
44
|
+
[#2083](https://github.com/CocoaPods/CocoaPods/issues/2083)
|
45
|
+
|
46
|
+
* Ensure that git 1.7.5 or newer is installed when running pod.
|
47
|
+
[Kyle Fuller](https://github.com/kylef)
|
48
|
+
[#2651](https://github.com/CocoaPods/CocoaPods/issues/2651)
|
49
|
+
|
50
|
+
|
5
51
|
## 0.34.2
|
6
52
|
|
7
53
|
##### Enhancements
|
@@ -2589,7 +2635,7 @@ podspec, then update these method calls.
|
|
2589
2635
|
generated Pods project file.
|
2590
2636
|
|
2591
2637
|
* [#142](https://github.com/CocoaPods/CocoaPods/issues/): Add `-fobjc-arc` to
|
2592
|
-
`
|
2638
|
+
`OTHER_LDFLAGS` if _any_ pods require ARC.
|
2593
2639
|
|
2594
2640
|
* [#148](https://github.com/CocoaPods/CocoaPods/issues/148): External encoding
|
2595
2641
|
set to UTF-8 on Ruby 1.9 to fix crash caused by non-ascii characters in pod
|
data/LICENSE
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
This project is licensed under the MIT license.
|
2
2
|
|
3
|
-
Copyright (c) 2011 -
|
4
|
-
Copyright (c) 2012 -
|
3
|
+
Copyright (c) 2011 - 2014 Eloy Durán <eloy.de.enige@gmail.com>
|
4
|
+
Copyright (c) 2012 - 2014 Fabio Pelosin <fabiopelosin@gmail.com>
|
5
5
|
|
6
6
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
7
7
|
of this software and associated documentation files (the "Software"), to deal
|
data/lib/cocoapods/command.rb
CHANGED
@@ -45,6 +45,8 @@ module Pod
|
|
45
45
|
|
46
46
|
def self.run(argv)
|
47
47
|
help! 'You cannot run CocoaPods as root.' if Process.uid == 0
|
48
|
+
verify_git_version!
|
49
|
+
|
48
50
|
super(argv)
|
49
51
|
UI.print_warnings
|
50
52
|
end
|
@@ -114,5 +116,18 @@ module Pod
|
|
114
116
|
raise Informative, "No `Podfile.lock' found in the project directory, run `pod install'."
|
115
117
|
end
|
116
118
|
end
|
119
|
+
|
120
|
+
def self.verify_git_version!
|
121
|
+
begin
|
122
|
+
git_version = `git version`.strip
|
123
|
+
rescue Errno::ENOENT
|
124
|
+
help! 'CocoaPods requires you to have `git` installed.'
|
125
|
+
end
|
126
|
+
|
127
|
+
git_version = Version.new(git_version.split[2])
|
128
|
+
if git_version < Pod::Version.new('1.7.5')
|
129
|
+
help! 'CocoaPods requires git version 1.7.5 or newer. Please update git.'
|
130
|
+
end
|
131
|
+
end
|
117
132
|
end
|
118
133
|
end
|
@@ -98,7 +98,7 @@ module Pod
|
|
98
98
|
|
99
99
|
def spec_sets
|
100
100
|
@spec_sets ||= begin
|
101
|
-
aggregate = Source::Aggregate.new(analyzer.sources)
|
101
|
+
aggregate = Source::Aggregate.new(analyzer.sources.map(&:repo))
|
102
102
|
installed_pods.map do |pod_name|
|
103
103
|
aggregate.search(Dependency.new(pod_name))
|
104
104
|
end.compact.uniq
|
@@ -80,6 +80,8 @@ module Pod
|
|
80
80
|
#!/bin/sh
|
81
81
|
set -e
|
82
82
|
|
83
|
+
mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
|
84
|
+
|
83
85
|
RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
|
84
86
|
> "$RESOURCES_TO_COPY"
|
85
87
|
|
@@ -133,7 +135,7 @@ EOS
|
|
133
135
|
|
134
136
|
XCASSETS_COMPILE = <<EOS
|
135
137
|
|
136
|
-
if [[ -n "${WRAPPER_EXTENSION}" ]] && [ `xcrun --find actool` ] && [ `find . -name '*.xcassets' | wc -l` -ne 0 ]
|
138
|
+
if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ `find . -name '*.xcassets' | wc -l` -ne 0 ]
|
137
139
|
then
|
138
140
|
case "${TARGETED_DEVICE_FAMILY}" in
|
139
141
|
1,2)
|
@@ -50,6 +50,7 @@ module Pod
|
|
50
50
|
header_search_path_flags = target.sandbox.public_headers.search_paths
|
51
51
|
@xcconfig = Xcodeproj::Config.new(
|
52
52
|
'OTHER_LDFLAGS' => XCConfigHelper.default_ld_flags(target),
|
53
|
+
'OTHER_LIBTOOLFLAGS' => '$(OTHER_LDFLAGS)',
|
53
54
|
'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(target.sandbox.public_headers.search_paths),
|
54
55
|
'PODS_ROOT' => target.relative_pods_root,
|
55
56
|
'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
|
@@ -283,7 +283,7 @@ module Pod
|
|
283
283
|
end
|
284
284
|
deps_to_fetch = deps_with_external_source.select { |dep| pods_to_fetch.include?(dep.root_name) }
|
285
285
|
deps_to_fetch_if_needed = deps_with_external_source.select { |dep| result.podfile_state.unchanged.include?(dep.root_name) }
|
286
|
-
deps_to_fetch += deps_to_fetch_if_needed.select { |dep| sandbox.specification(dep.root_name).nil? || !dep.external_source[:local].nil? || !dep.external_source[:path].nil? }
|
286
|
+
deps_to_fetch += deps_to_fetch_if_needed.select { |dep| sandbox.specification(dep.root_name).nil? || !dep.external_source[:local].nil? || !dep.external_source[:path].nil? || !sandbox.pod_dir(dep.root_name).directory? }
|
287
287
|
end
|
288
288
|
|
289
289
|
unless deps_to_fetch.empty?
|
@@ -27,14 +27,30 @@ module Pod
|
|
27
27
|
#
|
28
28
|
def integrate!
|
29
29
|
UI.section(integration_message) do
|
30
|
-
|
31
|
-
|
30
|
+
# TODO: refactor into Xcodeproj https://github.com/CocoaPods/Xcodeproj/issues/202
|
31
|
+
project_is_dirty = [
|
32
|
+
XCConfigIntegrator.integrate(target, native_targets),
|
33
|
+
update_to_cocoapods_0_34,
|
34
|
+
unless native_targets_to_integrate.empty?
|
35
|
+
add_pods_library
|
36
|
+
add_copy_resources_script_phase
|
37
|
+
add_check_manifest_lock_script_phase
|
38
|
+
true
|
39
|
+
end
|
40
|
+
].any?
|
32
41
|
|
33
|
-
|
34
|
-
add_pods_library
|
35
|
-
add_copy_resources_script_phase
|
36
|
-
add_check_manifest_lock_script_phase
|
42
|
+
if project_is_dirty
|
37
43
|
user_project.save
|
44
|
+
else
|
45
|
+
# There is a bug in Xcode where the process of deleting and
|
46
|
+
# re-creating the xcconfig files used in the build
|
47
|
+
# configuration cause building the user project to fail until
|
48
|
+
# Xcode is relaunched.
|
49
|
+
#
|
50
|
+
# Touching/saving the project causes Xcode to reload these.
|
51
|
+
#
|
52
|
+
# https://github.com/CocoaPods/CocoaPods/issues/2665
|
53
|
+
FileUtils.touch(user_project.path + 'project.pbxproj')
|
38
54
|
end
|
39
55
|
end
|
40
56
|
end
|
data/lib/cocoapods/installer/user_project_integrator/target_integrator/xcconfig_integrator.rb
CHANGED
@@ -89,10 +89,10 @@ module Pod
|
|
89
89
|
file_ref = group.files.find { |f| f.path == path }
|
90
90
|
if config.base_configuration_reference != file_ref
|
91
91
|
UI.warn 'CocoaPods did not set the base configuration of your ' \
|
92
|
-
'project because
|
92
|
+
'project because your project already has a custom ' \
|
93
93
|
'config set. In order for CocoaPods integration to work at ' \
|
94
94
|
'all, please either set the base configurations of the target ' \
|
95
|
-
"
|
95
|
+
"`#{target.name}` to `#{path}` or include the `#{path}` in your " \
|
96
96
|
'build configuration.'
|
97
97
|
false
|
98
98
|
elsif !file_ref
|
@@ -410,6 +410,11 @@ module Pod
|
|
410
410
|
# name_for_url('https://sourceforge.org/Artsy/Specs.git')
|
411
411
|
# # sourceforge-artsy-specs
|
412
412
|
#
|
413
|
+
# @example A file URL
|
414
|
+
#
|
415
|
+
# name_for_url('file:///Artsy/Specs.git')
|
416
|
+
# # artsy-specs
|
417
|
+
#
|
413
418
|
# @param [#to_s] url
|
414
419
|
# The URL of the source.
|
415
420
|
#
|
@@ -417,8 +422,13 @@ module Pod
|
|
417
422
|
#
|
418
423
|
def name_for_url(url)
|
419
424
|
base_from_host_and_path = lambda do |host, path|
|
420
|
-
|
421
|
-
|
425
|
+
if host
|
426
|
+
base = host.split('.')[-2] || host
|
427
|
+
base += '-'
|
428
|
+
else
|
429
|
+
base = ''
|
430
|
+
end
|
431
|
+
base += path.gsub(/.git$/, '').gsub(/^\//, '').
|
422
432
|
split('/').join('-')
|
423
433
|
end
|
424
434
|
|
@@ -29,6 +29,7 @@ module Pod
|
|
29
29
|
RubyGems : #{Gem::VERSION}
|
30
30
|
Host : #{host_information}
|
31
31
|
Xcode : #{xcode_information}
|
32
|
+
Git : #{git_information}
|
32
33
|
Ruby lib dir : #{RbConfig::CONFIG['libdir']}
|
33
34
|
Repositories : #{repo_information.join("\n ")}
|
34
35
|
```
|
@@ -105,6 +106,10 @@ EOS
|
|
105
106
|
"#{version} (#{build})"
|
106
107
|
end
|
107
108
|
|
109
|
+
def git_information
|
110
|
+
`git --version`.strip.split("\n").first
|
111
|
+
end
|
112
|
+
|
108
113
|
def installed_plugins
|
109
114
|
CLAide::Command::PluginsHelper.specifications.
|
110
115
|
reduce({}) { |hash, s| hash.tap { |h| h[s.name] = s.version.to_s } }
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cocoapods
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.34.
|
4
|
+
version: 0.34.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Eloy Duran
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2014-10-
|
12
|
+
date: 2014-10-18 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: cocoapods-core
|
@@ -17,14 +17,14 @@ dependencies:
|
|
17
17
|
requirements:
|
18
18
|
- - '='
|
19
19
|
- !ruby/object:Gem::Version
|
20
|
-
version: 0.34.
|
20
|
+
version: 0.34.4
|
21
21
|
type: :runtime
|
22
22
|
prerelease: false
|
23
23
|
version_requirements: !ruby/object:Gem::Requirement
|
24
24
|
requirements:
|
25
25
|
- - '='
|
26
26
|
- !ruby/object:Gem::Version
|
27
|
-
version: 0.34.
|
27
|
+
version: 0.34.4
|
28
28
|
- !ruby/object:Gem::Dependency
|
29
29
|
name: claide
|
30
30
|
requirement: !ruby/object:Gem::Requirement
|
@@ -45,14 +45,14 @@ dependencies:
|
|
45
45
|
requirements:
|
46
46
|
- - ~>
|
47
47
|
- !ruby/object:Gem::Version
|
48
|
-
version: 0.19.
|
48
|
+
version: 0.19.4
|
49
49
|
type: :runtime
|
50
50
|
prerelease: false
|
51
51
|
version_requirements: !ruby/object:Gem::Requirement
|
52
52
|
requirements:
|
53
53
|
- - ~>
|
54
54
|
- !ruby/object:Gem::Version
|
55
|
-
version: 0.19.
|
55
|
+
version: 0.19.4
|
56
56
|
- !ruby/object:Gem::Dependency
|
57
57
|
name: cocoapods-downloader
|
58
58
|
requirement: !ruby/object:Gem::Requirement
|
@@ -101,14 +101,14 @@ dependencies:
|
|
101
101
|
requirements:
|
102
102
|
- - ~>
|
103
103
|
- !ruby/object:Gem::Version
|
104
|
-
version: 0.3.
|
104
|
+
version: 0.3.1
|
105
105
|
type: :runtime
|
106
106
|
prerelease: false
|
107
107
|
version_requirements: !ruby/object:Gem::Requirement
|
108
108
|
requirements:
|
109
109
|
- - ~>
|
110
110
|
- !ruby/object:Gem::Version
|
111
|
-
version: 0.3.
|
111
|
+
version: 0.3.1
|
112
112
|
- !ruby/object:Gem::Dependency
|
113
113
|
name: colored
|
114
114
|
requirement: !ruby/object:Gem::Requirement
|