cocoapods 1.9.1 → 1.10.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (53) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +245 -5
  3. data/README.md +2 -1
  4. data/lib/cocoapods/command/lib/lint.rb +12 -3
  5. data/lib/cocoapods/command/repo/push.rb +1 -1
  6. data/lib/cocoapods/command/repo/update.rb +11 -0
  7. data/lib/cocoapods/command/spec/lint.rb +12 -3
  8. data/lib/cocoapods/command.rb +12 -2
  9. data/lib/cocoapods/config.rb +17 -0
  10. data/lib/cocoapods/downloader/cache.rb +2 -2
  11. data/lib/cocoapods/gem_version.rb +1 -1
  12. data/lib/cocoapods/generator/app_target_helper.rb +10 -2
  13. data/lib/cocoapods/generator/copy_dsyms_script.rb +56 -0
  14. data/lib/cocoapods/generator/copy_resources_script.rb +2 -14
  15. data/lib/cocoapods/generator/copy_xcframework_script.rb +245 -0
  16. data/lib/cocoapods/generator/embed_frameworks_script.rb +125 -212
  17. data/lib/cocoapods/generator/script_phase_constants.rb +99 -0
  18. data/lib/cocoapods/installer/analyzer/target_inspection_result.rb +1 -1
  19. data/lib/cocoapods/installer/analyzer.rb +17 -8
  20. data/lib/cocoapods/installer/base_install_hooks_context.rb +135 -0
  21. data/lib/cocoapods/installer/installation_options.rb +5 -0
  22. data/lib/cocoapods/installer/pod_source_installer.rb +2 -1
  23. data/lib/cocoapods/installer/post_install_hooks_context.rb +1 -127
  24. data/lib/cocoapods/installer/post_integrate_hooks_context.rb +9 -0
  25. data/lib/cocoapods/installer/project_cache/project_metadata_cache.rb +4 -0
  26. data/lib/cocoapods/installer/sandbox_dir_cleaner.rb +2 -1
  27. data/lib/cocoapods/installer/user_project_integrator/target_integrator.rb +132 -111
  28. data/lib/cocoapods/installer/xcode/pods_project_generator/aggregate_target_installer.rb +13 -27
  29. data/lib/cocoapods/installer/xcode/pods_project_generator/app_host_installer.rb +5 -1
  30. data/lib/cocoapods/installer/xcode/pods_project_generator/file_references_installer.rb +2 -1
  31. data/lib/cocoapods/installer/xcode/pods_project_generator/pod_target_dependency_installer.rb +8 -6
  32. data/lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb +180 -59
  33. data/lib/cocoapods/installer/xcode/pods_project_generator/pod_target_integrator.rb +61 -30
  34. data/lib/cocoapods/installer/xcode/pods_project_generator/project_generator.rb +3 -2
  35. data/lib/cocoapods/installer/xcode/pods_project_generator/target_installation_result.rb +5 -7
  36. data/lib/cocoapods/installer/xcode/pods_project_generator.rb +45 -6
  37. data/lib/cocoapods/installer/xcode/pods_project_generator_result.rb +19 -0
  38. data/lib/cocoapods/installer/xcode/target_validator.rb +1 -1
  39. data/lib/cocoapods/installer.rb +70 -3
  40. data/lib/cocoapods/sources_manager.rb +2 -1
  41. data/lib/cocoapods/target/aggregate_target.rb +35 -0
  42. data/lib/cocoapods/target/build_settings.rb +94 -18
  43. data/lib/cocoapods/target/pod_target.rb +85 -11
  44. data/lib/cocoapods/target.rb +44 -2
  45. data/lib/cocoapods/user_interface/error_report.rb +1 -1
  46. data/lib/cocoapods/user_interface/inspector_reporter.rb +3 -10
  47. data/lib/cocoapods/validator.rb +37 -11
  48. data/lib/cocoapods/xcode/framework_paths.rb +1 -1
  49. data/lib/cocoapods/xcode/xcframework/xcframework_slice.rb +81 -3
  50. data/lib/cocoapods/xcode/xcframework.rb +17 -4
  51. data/lib/cocoapods.rb +3 -1
  52. metadata +31 -53
  53. data/lib/cocoapods/generator/prepare_artifacts_script.rb +0 -257
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5d09ebc5f52b3cc99cbd28d1c02d4e91814d1da868f74e0471d24dc68af11418
4
- data.tar.gz: e32f37318381027f67961784e392e3b01535e46299a3ff33394bafcb86f376d3
3
+ metadata.gz: 18029602b0c6762ae9758040ac419c6f06d349a572369fa9bf0345cf765d08a1
4
+ data.tar.gz: c7eb15f452ae34c5478ddb4e64a75bd3e61d2b0a607503dc9cafafd4e563d915
5
5
  SHA512:
6
- metadata.gz: ac8f0545426c0f5bcbe9425a402a700a7b9e101036b7ca9762d627d5a081fd1aed30a1be33b10de4bad5488c43326c479cb63bbe0062e392623afc7d80e31460
7
- data.tar.gz: 4c939088685f310f79f110c38945d4551fdf009086e04677277b8d38523c5d3bb103526346708f4954a37bcfc72446366eb3b2a51088cb3b69c4a6e2942b1d78
6
+ metadata.gz: 7be0a083dac27cc3267cd3d671b83dad1a897c6ef0cdb09bfa61cdfb6f791ac6ea5de13bbf674df3781221901b63fe2c97f1bbd6b8d378fad594c083eeec83a5
7
+ data.tar.gz: 859cb8e68cf8918c7d99066aa49589a3b3bcfc47944b3154876328724dc5b854e5accc518092275a0b130996d1428c09d9f12b4e29a22b7f9628d4c11a0c315e
data/CHANGELOG.md CHANGED
@@ -1,10 +1,231 @@
1
1
  # Installation & Update
2
2
 
3
- To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
3
+ To install or update CocoaPods see this [guide](https://guides.cocoapods.org/using/index.html).
4
4
 
5
5
  To install release candidates run `[sudo] gem install cocoapods --pre`
6
6
 
7
- ## 1.9.1 (2020-03-09)
7
+ ## 1.10.0 (2020-10-20)
8
+
9
+ ##### Enhancements
10
+
11
+ * None.
12
+
13
+ ##### Bug Fixes
14
+
15
+ * Generate the correct LD `-l` flags for XCFrameworks containing libraries
16
+ [Wes Campaigne](https://github.com/Westacular)
17
+ [#10071](https://github.com/CocoaPods/CocoaPods/issues/10071)
18
+
19
+ * Add support for automatically embeddeding XCFramework debug symbols for XCFrameworks generated with Xcode 12
20
+ [johntmcintosh](https://github.com/johntmcintosh)
21
+ [#10111](https://github.com/CocoaPods/CocoaPods/issues/10111)
22
+
23
+ ## 1.10.0.rc.1 (2020-09-15)
24
+
25
+ ##### Enhancements
26
+
27
+ * None.
28
+
29
+ ##### Bug Fixes
30
+
31
+ * Fix XCFramework slice selection
32
+ [lowip](https://github.com/lowip)
33
+ [#10026](https://github.com/CocoaPods/CocoaPods/issues/10026)
34
+
35
+ * Honor test spec deployment target during validation.
36
+ [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
37
+ [#9999](https://github.com/CocoaPods/CocoaPods/pull/9999)
38
+
39
+ * Ensure that incremental installation is able to set target dependencies for a
40
+ test spec that uses a custom `app_host_name` that is in a project that is not
41
+ regenerated.
42
+ [Samuel Giddins](https://github.com/segiddins)
43
+
44
+
45
+ ## 1.10.0.beta.2 (2020-08-12)
46
+
47
+ ##### Enhancements
48
+
49
+ * None.
50
+
51
+ ##### Bug Fixes
52
+
53
+ * Ensure that static frameworks are not embedded
54
+ [Bernard Gatt](https://github.com/BernardGatt)
55
+ [#9943](https://github.com/CocoaPods/CocoaPods/issues/9943)
56
+
57
+ * Ensure that the non-compilable resource skipping in static frameworks happens only for the pod itself
58
+ [Igor Makarov](https://github.com/igor-makarov)
59
+ [#9922](https://github.com/CocoaPods/CocoaPods/pull/9922)
60
+ [#9920](https://github.com/CocoaPods/CocoaPods/issues/9920)
61
+
62
+
63
+ ## 1.10.0.beta.1 (2020-07-17)
64
+
65
+ ##### Breaking
66
+
67
+ * Bump minimum Ruby version to 2.3.3 (included with macOS High Sierra)
68
+ [Eric Amorde](https://github.com/amorde)
69
+ [#9821](https://github.com/CocoaPods/CocoaPods/issues/9821)
70
+
71
+ ##### Enhancements
72
+
73
+ * Add the App Clip product symbol to the list of products that need embedding.
74
+ [Igor Makarov](https://github.com/igor-makarov)
75
+ [#9882](https://github.com/CocoaPods/CocoaPods/pull/9882)
76
+
77
+ * Allow gem to run as root when passing argument flag `--allow-root`
78
+ [Sean Reinhardt](https://github.com/seanreinhardtapps)
79
+ [#8929](https://github.com/CocoaPods/CocoaPods/issues/8929)
80
+
81
+ * Warn users to delete the master specs repo if its not explicitly used.
82
+ [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
83
+ [#9871](https://github.com/CocoaPods/CocoaPods/pull/9871)
84
+
85
+ * Use User Project's compatibilityVersion instead of objectVersion when
86
+ deciding when to use xcfilelists.
87
+ [Sean Reinhardt](https://github.com/seanreinhardtapps)
88
+ [#9140](https://github.com/CocoaPods/CocoaPods/issues/9140)
89
+
90
+ * add a `--configuration` option to `pod lib lint` and `pod spec lint`.
91
+ [Gereon Steffens](https://github.com/gereons)
92
+ [#9686](https://github.com/CocoaPods/CocoaPods/issues/9686)
93
+
94
+ * Add a post_integrate_hook API
95
+ [lucasmpaim](https://github.com/lucasmpaim)
96
+ [#7432](https://github.com/CocoaPods/CocoaPods/issues/7432)
97
+
98
+ * Set the `BUILD_LIBRARY_FOR_DISTRIBUTION` build setting if integrating with
99
+ a target that has the setting set to `YES` (directly or in an .xcconfig).
100
+ [Juanjo López](https://github.com/juanjonol)
101
+ [#9232](https://github.com/CocoaPods/CocoaPods/issues/9232)
102
+
103
+ * Option to lint a specified set of test_specs
104
+ [Paul Beusterien](https://github.com/paulb777)
105
+ [#9392](https://github.com/CocoaPods/CocoaPods/pull/9392)
106
+
107
+ * Add --use-static-frameworks lint option
108
+ [Paul Beusterien](https://github.com/paulb777)
109
+ [#9632](https://github.com/CocoaPods/CocoaPods/pull/9632)
110
+
111
+ * Exclude the local spec-repos directory from Time Machine Backups.
112
+ [Jakob Krigovsky](https://github.com/sonicdoe)
113
+ [#8308](https://github.com/CocoaPods/CocoaPods/issues/8308)
114
+
115
+ ##### Bug Fixes
116
+
117
+ * Override Xcode 12 default for erroring on quoted imports in umbrellas.
118
+ [Paul Beusterien](https://github.com/paulb777)
119
+ [#9902](https://github.com/CocoaPods/CocoaPods/issues/9902)
120
+
121
+ * Remove bitcode symbol maps from embedded framework bundles
122
+ [Eric Amorde](https://github.com/amorde)
123
+ [#9681](https://github.com/CocoaPods/CocoaPods/issues/9681)
124
+
125
+ * Prevent "source changed" message for every version change when using trunk source
126
+ [cltnschlosser](https://github.com/cltnschlosser)
127
+ [#9865](https://github.com/CocoaPods/CocoaPods/issues/9865)
128
+
129
+ * When pod target is a static framework, save time by copying compiled resources
130
+ [Igor Makarov](https://github.com/igor-makarov)
131
+ [#9441](https://github.com/CocoaPods/CocoaPods/pull/9441)
132
+
133
+ * Re-implement `bcsymbolmap` copying to avoid duplicate outputs.
134
+ [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
135
+ [mplorentz](https://github.com/mplorentz)
136
+ [#9734](https://github.com/CocoaPods/CocoaPods/pull/9734)
137
+
138
+ * Fix Xcode 11 warning when setting Bundle Identifier in `info_plist`
139
+ [Sean Reinhardt](https://github.com/seanreinhardtapps)
140
+ [#9536](https://github.com/CocoaPods/CocoaPods/issues/9536)
141
+
142
+ * Fix `incompatible encoding regexp match` for linting non-ascii pod name
143
+ [banjun](https://github.com/banjun)
144
+ [#9765](https://github.com/CocoaPods/CocoaPods/issues/9765)
145
+ [#9776](https://github.com/CocoaPods/CocoaPods/pull/9776)
146
+
147
+ * Fix crash when targets missing in Podfile
148
+ [Paul Beusterien](https://github.com/paulb777)
149
+ [#9745](https://github.com/CocoaPods/CocoaPods/pull/9745)
150
+
151
+ * Fix adding developer library search paths during pod validation.
152
+ [Nick Entin](https://github.com/NickEntin)
153
+ [#9736](https://github.com/CocoaPods/CocoaPods/pull/9736)
154
+
155
+ * Fix an issue that caused multiple xcframework scripts to produce the same output files
156
+ [Eric Amorde](https://github.com/amorde)
157
+ [#9670](https://github.com/CocoaPods/CocoaPods/issues/9670)
158
+ [#9720](https://github.com/CocoaPods/CocoaPods/pull/9720)
159
+
160
+ * Fix an issue preventing framework user targets with an xcframework dependency from building successfully
161
+ [Eric Amorde](https://github.com/amorde)
162
+ [#9525](https://github.com/CocoaPods/CocoaPods/issues/9525)
163
+ [#9720](https://github.com/CocoaPods/CocoaPods/pull/9720)
164
+
165
+ * Fix an issue preventing xcframeworks that wrapped static libraries from linking successfully
166
+ [Eric Amorde](https://github.com/amorde)
167
+ [#9528](https://github.com/CocoaPods/CocoaPods/issues/9528)
168
+ [#9720](https://github.com/CocoaPods/CocoaPods/pull/9720)
169
+
170
+ * Fix setting `swift_version` when deduplicate targets is turned off.
171
+ [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
172
+ [#9689](https://github.com/CocoaPods/CocoaPods/pull/9689)
173
+
174
+ * Honor prefix_header_file=false for subspecs
175
+ [Paul Beusterien](https://github.com/paulb777)
176
+ [#9687](https://github.com/CocoaPods/CocoaPods/pull/9687)
177
+
178
+ * Do not clean user projects from sandbox.
179
+ [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
180
+ [#9683](https://github.com/CocoaPods/CocoaPods/pull/9683)
181
+
182
+ * Fix mapping of resource paths for app specs.
183
+ [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
184
+ [#9676](https://github.com/CocoaPods/CocoaPods/pull/9676)
185
+
186
+ * When preserving pod paths, preserve ALL the paths
187
+ [Igor Makarov](https://github.com/igor-makarov)
188
+ [#9483](https://github.com/CocoaPods/CocoaPods/pull/9483)
189
+
190
+ * Re-implement `dSYM` copying and stripping to avoid duplicate outputs.
191
+ [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
192
+ [#9185](https://github.com/CocoaPods/CocoaPods/issues/9185)
193
+
194
+ * Add support for running tests through the scheme of the app spec host of a test spec
195
+ [Eric Amorde](https://github.com/amorde)
196
+ [#9332](https://github.com/CocoaPods/CocoaPods/issues/9332)
197
+
198
+ * Fix an issue that prevented variables in test bundle scheme settings from expanding
199
+ [Eric Amorde](https://github.com/amorde)
200
+ [#9539](https://github.com/CocoaPods/CocoaPods/pull/9539)
201
+
202
+ * Fix project path handling issue that caused cmake projects to be incorrect
203
+ [Paul Beusterien](https://github.com/paulb777)
204
+ [Andrew](https://github.com/mad-rain)
205
+ [#6268](https://github.com/CocoaPods/CocoaPods/pull/6268)
206
+
207
+ * Set `Missing Localizability` setting to `'YES'` to prevent warnings in Xcode 11
208
+ [Eric Amorde](https://github.com/amorde)
209
+ [#9612](https://github.com/CocoaPods/CocoaPods/pull/9612)
210
+
211
+ * Don't crash on non UTF-8 error message
212
+ [Kenji KATO](https://github.com/katoken-0215)
213
+ [#9706](https://github.com/CocoaPods/CocoaPods/pull/9706)
214
+
215
+ * Fix XCFramework slice selection when having more archs in slice than requested with $ARCHS
216
+ [jerbob92](https://github.com/jerbob92)
217
+ [#9790](https://github.com/CocoaPods/CocoaPods/pull/9790)
218
+
219
+ * Don't add app spec dependencies to the parent library's target in Xcode,
220
+ which was happening when the dependency's project was not being regenerated
221
+ due to incremental installation.
222
+ [segiddins][https://github.com/segiddins]
223
+
224
+ * Add the trunk repo to the default `sources` for the `repo push` command
225
+ [Elf Sundae](https://github.com/ElfSundae)
226
+ [#9840](https://github.com/CocoaPods/CocoaPods/pull/9840)
227
+
228
+ ## 1.9.3 (2020-05-29)
8
229
 
9
230
  ##### Enhancements
10
231
 
@@ -12,6 +233,26 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
12
233
 
13
234
  ##### Bug Fixes
14
235
 
236
+ * None.
237
+
238
+
239
+ ## 1.9.2 (2020-05-22)
240
+
241
+ ##### Enhancements
242
+
243
+ * None.
244
+
245
+ ##### Bug Fixes
246
+
247
+ * None.
248
+
249
+
250
+ ## 1.9.1 (2020-03-09)
251
+
252
+ ##### Enhancements
253
+
254
+ ##### Bug Fixes
255
+
15
256
  * Apply correct `SYSTEM_FRAMEWORK_SEARCH_PATHS` for `XCTUnwrap` fix.
16
257
  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
17
258
  [#9579](https://github.com/CocoaPods/CocoaPods/pull/9579)
@@ -35,13 +276,12 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
35
276
 
36
277
  * Also apply Xcode 11 `XCTUnwrap` fix to library and framework targets that weakly link `XCTest`.
37
278
  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
38
- [#9518](https://github.com/CocoaPods/CocoaPods/pull/9518)
39
-
279
+ [#9518](https://github.com/CocoaPods/CocoaPods/pull/9518)
280
+
40
281
  * Fix dSYM handling for XCFrameworks.
41
282
  [Eric Amorde](https://github.com/amorde)
42
283
  [#9530](https://github.com/CocoaPods/CocoaPods/issues/9530)
43
284
 
44
-
45
285
  ## 1.9.0.beta.3 (2020-02-04)
46
286
 
47
287
  ##### Enhancements
data/README.md CHANGED
@@ -4,7 +4,8 @@
4
4
 
5
5
  [![Build Status](http://img.shields.io/travis/CocoaPods/CocoaPods/master.svg?style=flat)](https://travis-ci.org/CocoaPods/CocoaPods)
6
6
  [![Gem Version](http://img.shields.io/gem/v/cocoapods.svg?style=flat)](http://badge.fury.io/rb/cocoapods)
7
- [![Code Climate](http://img.shields.io/codeclimate/github/CocoaPods/CocoaPods.svg?style=flat)](https://codeclimate.com/github/CocoaPods/CocoaPods)
7
+ [![Maintainability](https://api.codeclimate.com/v1/badges/8f0fe544baf2ae1acc2b/maintainability)](https://codeclimate.com/github/CocoaPods/CocoaPods/maintainability)
8
+ [![Test Coverage](https://api.codeclimate.com/v1/badges/8f0fe544baf2ae1acc2b/test_coverage)](https://codeclimate.com/github/CocoaPods/CocoaPods/test_coverage)
8
9
 
9
10
  CocoaPods manages dependencies for your Xcode projects.
10
11
 
@@ -22,6 +22,7 @@ module Pod
22
22
  ['--fail-fast', 'Lint stops on the first failing platform or subspec'],
23
23
  ['--use-libraries', 'Lint uses static libraries to install the spec'],
24
24
  ['--use-modular-headers', 'Lint uses modular headers during installation'],
25
+ ['--use-static-frameworks', 'Lint uses static frameworks during installation'],
25
26
  ["--sources=#{Pod::TrunkSource::TRUNK_REPO_URL}", 'The sources from which to pull dependent pods ' \
26
27
  "(defaults to #{Pod::TrunkSource::TRUNK_REPO_URL}). Multiple sources must be comma-delimited"],
27
28
  ['--platforms=ios,macos', 'Lint against specific platforms (defaults to all platforms supported by the ' \
@@ -34,7 +35,9 @@ module Pod
34
35
  'via :podspec. If there are --include-podspecs, then these are removed from them'],
35
36
  ['--skip-import-validation', 'Lint skips validating that the pod can be imported'],
36
37
  ['--skip-tests', 'Lint skips building and running tests during validation'],
38
+ ['--test-specs=test-spec1,test-spec2,etc', 'List of test specs to run'],
37
39
  ['--analyze', 'Validate with the Xcode Static Analysis tool'],
40
+ ['--configuration=CONFIGURATION', 'Build using the given configuration (defaults to Release)'],
38
41
  ].concat(super)
39
42
  end
40
43
 
@@ -47,6 +50,7 @@ module Pod
47
50
  @only_subspec = argv.option('subspec')
48
51
  @use_frameworks = !argv.flag?('use-libraries')
49
52
  @use_modular_headers = argv.flag?('use-modular-headers')
53
+ @use_static_frameworks = argv.flag?('use-static-frameworks')
50
54
  @source_urls = argv.option('sources', Pod::TrunkSource::TRUNK_REPO_URL).split(',')
51
55
  @platforms = argv.option('platforms', '').split(',')
52
56
  @private = argv.flag?('private', false)
@@ -54,9 +58,11 @@ module Pod
54
58
  @include_podspecs = argv.option('include-podspecs', nil)
55
59
  @external_podspecs = argv.option('external-podspecs', nil)
56
60
  @skip_import_validation = argv.flag?('skip-import-validation', false)
57
- @skip_tests = argv.flag?('skip-tests', false)
58
- @analyze = argv.flag?('analyze', false)
59
- @podspecs_paths = argv.arguments!
61
+ @skip_tests = argv.flag?('skip-tests', false)
62
+ @test_specs = argv.option('test-specs', nil)&.split(',')
63
+ @analyze = argv.flag?('analyze', false)
64
+ @podspecs_paths = argv.arguments!
65
+ @configuration = argv.option('configuration', nil)
60
66
  super
61
67
  end
62
68
 
@@ -77,13 +83,16 @@ module Pod
77
83
  validator.only_subspec = @only_subspec
78
84
  validator.use_frameworks = @use_frameworks
79
85
  validator.use_modular_headers = @use_modular_headers
86
+ validator.use_static_frameworks = @use_static_frameworks
80
87
  validator.ignore_public_only_results = @private
81
88
  validator.swift_version = @swift_version
82
89
  validator.skip_import_validation = @skip_import_validation
83
90
  validator.skip_tests = @skip_tests
91
+ validator.test_specs = @test_specs
84
92
  validator.analyze = @analyze
85
93
  validator.include_podspecs = @include_podspecs
86
94
  validator.external_podspecs = @external_podspecs
95
+ validator.configuration = @configuration
87
96
  validator.validate
88
97
 
89
98
  unless @clean
@@ -45,7 +45,7 @@ module Pod
45
45
  @local_only = argv.flag?('local-only')
46
46
  @repo = argv.shift_argument
47
47
  @source = source_for_repo
48
- @source_urls = argv.option('sources', config.sources_manager.all.map(&:url).join(',')).split(',')
48
+ @source_urls = argv.option('sources', config.sources_manager.all.map(&:url).append(Pod::TrunkSource::TRUNK_REPO_URL).uniq.join(',')).split(',')
49
49
  @podspec = argv.shift_argument
50
50
  @use_frameworks = !argv.flag?('use-libraries')
51
51
  @use_modular_headers = argv.flag?('use-modular-headers', false)
@@ -21,6 +21,17 @@ module Pod
21
21
  def run
22
22
  show_output = !config.silent?
23
23
  config.sources_manager.update(@name, show_output)
24
+ exclude_repos_dir_from_backup
25
+ end
26
+
27
+ private
28
+
29
+ # Excludes the repos directory from backups.
30
+ #
31
+ # @return [void]
32
+ #
33
+ def exclude_repos_dir_from_backup
34
+ config.exclude_from_backup(config.repos_dir)
24
35
  end
25
36
  end
26
37
  end
@@ -24,6 +24,7 @@ module Pod
24
24
  ['--fail-fast', 'Lint stops on the first failing platform or subspec'],
25
25
  ['--use-libraries', 'Lint uses static libraries to install the spec'],
26
26
  ['--use-modular-headers', 'Lint uses modular headers during installation'],
27
+ ['--use-static-frameworks', 'Lint uses static frameworks during installation'],
27
28
  ["--sources=#{Pod::TrunkSource::TRUNK_REPO_URL}", 'The sources from which to pull dependent pods ' \
28
29
  "(defaults to #{Pod::TrunkSource::TRUNK_REPO_URL}). Multiple sources must be comma-delimited"],
29
30
  ['--platforms=ios,macos', 'Lint against specific platforms (defaults to all platforms supported by the ' \
@@ -33,7 +34,9 @@ module Pod
33
34
  'This takes precedence over the Swift versions specified by the spec or a `.swift-version` file'],
34
35
  ['--skip-import-validation', 'Lint skips validating that the pod can be imported'],
35
36
  ['--skip-tests', 'Lint skips building and running tests during validation'],
37
+ ['--test-specs=test-spec1,test-spec2,etc', 'List of test specs to run'],
36
38
  ['--analyze', 'Validate with the Xcode Static Analysis tool'],
39
+ ['--configuration=CONFIGURATION', 'Build using the given configuration (defaults to Release)'],
37
40
  ].concat(super)
38
41
  end
39
42
 
@@ -46,14 +49,17 @@ module Pod
46
49
  @only_subspec = argv.option('subspec')
47
50
  @use_frameworks = !argv.flag?('use-libraries')
48
51
  @use_modular_headers = argv.flag?('use-modular-headers')
52
+ @use_static_frameworks = argv.flag?('use-static-frameworks')
49
53
  @source_urls = argv.option('sources', Pod::TrunkSource::TRUNK_REPO_URL).split(',')
50
54
  @platforms = argv.option('platforms', '').split(',')
51
55
  @private = argv.flag?('private', false)
52
56
  @swift_version = argv.option('swift-version', nil)
53
57
  @skip_import_validation = argv.flag?('skip-import-validation', false)
54
- @skip_tests = argv.flag?('skip-tests', false)
55
- @analyze = argv.flag?('analyze', false)
56
- @podspecs_paths = argv.arguments!
58
+ @skip_tests = argv.flag?('skip-tests', false)
59
+ @test_specs = argv.option('test-specs', nil)&.split(',')
60
+ @analyze = argv.flag?('analyze', false)
61
+ @podspecs_paths = argv.arguments!
62
+ @configuration = argv.option('configuration', nil)
57
63
  super
58
64
  end
59
65
 
@@ -70,11 +76,14 @@ module Pod
70
76
  validator.only_subspec = @only_subspec
71
77
  validator.use_frameworks = @use_frameworks
72
78
  validator.use_modular_headers = @use_modular_headers
79
+ validator.use_static_frameworks = @use_static_frameworks
73
80
  validator.ignore_public_only_results = @private
74
81
  validator.swift_version = @swift_version
75
82
  validator.skip_import_validation = @skip_import_validation
76
83
  validator.skip_tests = @skip_tests
84
+ validator.test_specs = @test_specs
77
85
  validator.analyze = @analyze
86
+ validator.configuration = @configuration
78
87
  validator.validate
79
88
  failure_reasons << validator.failure_reason
80
89
 
@@ -39,13 +39,13 @@ module Pod
39
39
 
40
40
  def self.options
41
41
  [
42
+ ['--allow-root', 'Allows CocoaPods to run as root'],
42
43
  ['--silent', 'Show nothing'],
43
44
  ].concat(super)
44
45
  end
45
46
 
46
47
  def self.run(argv)
47
- help! 'You cannot run CocoaPods as root.' if Process.uid == 0 && !Gem.win_platform?
48
-
48
+ ensure_not_root_or_allowed! argv
49
49
  verify_minimum_git_version!
50
50
  verify_xcode_license_approved!
51
51
 
@@ -85,6 +85,7 @@ module Pod
85
85
  def initialize(argv)
86
86
  super
87
87
  config.silent = argv.flag?('silent', config.silent)
88
+ config.allow_root = argv.flag?('allow-root', config.allow_root)
88
89
  config.verbose = self.verbose? unless verbose.nil?
89
90
  unless self.ansi_output?
90
91
  Colored2.disable!
@@ -92,6 +93,15 @@ module Pod
92
93
  end
93
94
  end
94
95
 
96
+ # Ensure root user
97
+ #
98
+ # @return [void]
99
+ #
100
+ def self.ensure_not_root_or_allowed!(argv, uid = Process.uid, is_windows = Gem.win_platform?)
101
+ root_allowed = argv.include?('--allow-root') || !ENV['COCOAPODS_ALLOW_ROOT'].nil?
102
+ help! 'You cannot run CocoaPods as root.' unless root_allowed || uid != 0 || is_windows
103
+ end
104
+
95
105
  # Ensure that the master spec repo exists
96
106
  #
97
107
  # @return [void]
@@ -60,6 +60,11 @@ module Pod
60
60
  attr_accessor :silent
61
61
  alias_method :silent?, :silent
62
62
 
63
+ # @return [Bool] Whether CocoaPods is allowed to run as root.
64
+ #
65
+ attr_accessor :allow_root
66
+ alias_method :allow_root?, :allow_root
67
+
63
68
  # @return [Bool] Whether a message should be printed when a new version of
64
69
  # CocoaPods is available.
65
70
  #
@@ -314,6 +319,18 @@ module Pod
314
319
  nil
315
320
  end
316
321
 
322
+ # Excludes the given dir from Time Machine backups.
323
+ #
324
+ # @param [Pathname] dir
325
+ # The directory to exclude from Time Machine backups.
326
+ #
327
+ # @return [void]
328
+ #
329
+ def exclude_from_backup(dir)
330
+ return if Gem.win_platform?
331
+ system('tmutil', 'addexclusion', dir.to_s, %i(out err) => File::NULL)
332
+ end
333
+
317
334
  public
318
335
 
319
336
  #-------------------------------------------------------------------------#
@@ -97,7 +97,7 @@ module Pod
97
97
  # `request`.
98
98
  #
99
99
  def path_for_pod(request, slug_opts = {})
100
- root + request.slug(slug_opts)
100
+ root + request.slug(**slug_opts)
101
101
  end
102
102
 
103
103
  # @param [Request] request
@@ -111,7 +111,7 @@ module Pod
111
111
  # `request`.
112
112
  #
113
113
  def path_for_spec(request, slug_opts = {})
114
- path = root + 'Specs' + request.slug(slug_opts)
114
+ path = root + 'Specs' + request.slug(**slug_opts)
115
115
  path.sub_ext('.podspec.json')
116
116
  end
117
117
 
@@ -1,5 +1,5 @@
1
1
  module Pod
2
2
  # The version of the CocoaPods command line tool.
3
3
  #
4
- VERSION = '1.9.1'.freeze unless defined? Pod::VERSION
4
+ VERSION = '1.10.0'.freeze unless defined? Pod::VERSION
5
5
  end
@@ -127,9 +127,17 @@ module Pod
127
127
  # @return [void]
128
128
  #
129
129
  def self.add_xctest_search_paths(target)
130
+ requires_libs = target.platform_name == :ios &&
131
+ Version.new(target.deployment_target) < Version.new('12.2')
132
+
130
133
  target.build_configurations.each do |configuration|
131
- search_paths = configuration.build_settings['FRAMEWORK_SEARCH_PATHS'] ||= '$(inherited)'
132
- search_paths << ' "$(PLATFORM_DIR)/Developer/Library/Frameworks"'
134
+ framework_search_paths = configuration.build_settings['FRAMEWORK_SEARCH_PATHS'] ||= '$(inherited)'
135
+ framework_search_paths << ' "$(PLATFORM_DIR)/Developer/Library/Frameworks"'
136
+
137
+ if requires_libs
138
+ library_search_paths = configuration.build_settings['LIBRARY_SEARCH_PATHS'] ||= '$(inherited)'
139
+ library_search_paths << ' "$(PLATFORM_DIR)/Developer/usr/lib"'
140
+ end
133
141
  end
134
142
  end
135
143
 
@@ -0,0 +1,56 @@
1
+ module Pod
2
+ module Generator
3
+ class CopydSYMsScript
4
+ # @return [Array<Pathname>] dsym_paths the dSYM paths to include in the script contents.
5
+ #
6
+ attr_reader :dsym_paths
7
+
8
+ # @return [Array<Pathname>] bcsymbolmap_paths the bcsymbolmap paths to include in the script contents.
9
+ #
10
+ attr_reader :bcsymbolmap_paths
11
+
12
+ # Initialize a new instance
13
+ #
14
+ # @param [Array<Pathname>] dsym_paths @see dsym_paths
15
+ # @param [Array<Pathname>] bcsymbolmap_paths @see bcsymbolmap_paths
16
+ #
17
+ def initialize(dsym_paths, bcsymbolmap_paths)
18
+ @dsym_paths = Array(dsym_paths)
19
+ @bcsymbolmap_paths = Array(bcsymbolmap_paths)
20
+ end
21
+
22
+ # Saves the copy dSYMs script to the given pathname.
23
+ #
24
+ # @param [Pathname] pathname
25
+ # The path where the copy dSYMs script should be saved.
26
+ #
27
+ # @return [void]
28
+ #
29
+ def save_as(pathname)
30
+ pathname.open('w') do |file|
31
+ file.puts(generate)
32
+ end
33
+ File.chmod(0755, pathname.to_s)
34
+ end
35
+
36
+ # @return [String] The generated of the copy dSYMs script.
37
+ #
38
+ def generate
39
+ script = <<-SH.strip_heredoc
40
+ #{Pod::Generator::ScriptPhaseConstants::DEFAULT_SCRIPT_PHASE_HEADER}
41
+ #{Pod::Generator::ScriptPhaseConstants::STRIP_INVALID_ARCHITECTURES_METHOD}
42
+ #{Pod::Generator::ScriptPhaseConstants::RSYNC_PROTECT_TMP_FILES}
43
+ #{Pod::Generator::ScriptPhaseConstants::INSTALL_DSYM_METHOD}
44
+ #{Pod::Generator::ScriptPhaseConstants::INSTALL_BCSYMBOLMAP_METHOD}
45
+ SH
46
+ dsym_paths.each do |dsym_path|
47
+ script << %(install_dsym "#{dsym_path}"\n)
48
+ end
49
+ bcsymbolmap_paths.each do |bcsymbolmap_path|
50
+ script << %(install_bcsymbolmap "#{bcsymbolmap_path}"\n)
51
+ end
52
+ script
53
+ end
54
+ end
55
+ end
56
+ end
@@ -100,16 +100,7 @@ module Pod
100
100
  end
101
101
 
102
102
  INSTALL_RESOURCES_FUNCTION = <<EOS
103
- #!/bin/sh
104
- set -e
105
- set -u
106
- set -o pipefail
107
-
108
- function on_error {
109
- echo "$(realpath -mq "${0}"):$1: error: Unexpected failure"
110
- }
111
- trap 'on_error $LINENO' ERR
112
-
103
+ #{Pod::Generator::ScriptPhaseConstants::DEFAULT_SCRIPT_PHASE_HEADER}
113
104
  if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
114
105
  # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
115
106
  # resources to, so exit 0 (signalling the script phase was successful).
@@ -123,10 +114,7 @@ RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
123
114
 
124
115
  XCASSET_FILES=()
125
116
 
126
- # This protects against multiple targets copying the same framework dependency at the same time. The solution
127
- # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
128
- RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
129
-
117
+ #{Pod::Generator::ScriptPhaseConstants::RSYNC_PROTECT_TMP_FILES}
130
118
  case "${TARGETED_DEVICE_FAMILY:-}" in
131
119
  1,2)
132
120
  TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"