Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit f6c490e
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Mon Sep 13 09:19:24 2021 -0700

    Release 1.11.2

commit fa89b9e
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Thu Sep 2 14:43:07 2021 -0700

    Do not validate modular header dependencies for pre-built Swift pods

commit fe2ce4a
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Sun Sep 12 18:11:50 2021 -0700

    [CHANGELOG] Add empty Master section

commit a5a3efe
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Sun Sep 12 18:11:45 2021 -0700

    Release 1.11.1

commit 8348236
Merge: 4855e1d bae03f2
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Sat Sep 11 18:30:19 2021 -0700

    Merge pull request CocoaPods#10942 from CocoaPods/userinfo_cdn_url

    Handle spec repo urls with user info when determining if they are CDN.

commit bae03f2
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Sat Sep 11 16:21:39 2021 -0700

    Handle spec repo urls with user info when determining if they are CDN.

commit 4855e1d
Merge: c39584d 48973fb
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Fri Sep 10 10:00:29 2021 -0700

    Merge pull request CocoaPods#10937 from CocoaPods/info_plist_fix

    Set `INFOPLIST_FILE` build setting to `$(SRCROOT)/App/App-Info.plist`…

commit 48973fb
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Thu Sep 9 13:00:57 2021 -0700

    Set `INFOPLIST_FILE` build setting to `$(SRCROOT)/App/App-Info.plist` during lint.

commit c39584d
Merge: cd70c40 0c8f96e
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Thu Sep 9 11:07:54 2021 -0700

    Merge pull request CocoaPods#10936 from CocoaPods/fix_odr_lint

    Set `PRODUCT_BUNDLE_IDENTIFIER` for generated app during lint.

commit 0c8f96e
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Thu Sep 9 10:42:29 2021 -0700

    Set `PRODUCT_BUNDLE_IDENTIFIER` for generated app during lint.

commit cd70c40
Merge: b2ca7c5 0dad700
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Tue Sep 7 08:28:44 2021 -0700

    Merge pull request CocoaPods#10925 from CocoaPods/update_ci_ubuntu

    Update ubuntu to 18.04

commit 0dad700
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Tue Sep 7 08:02:20 2021 -0700

    Update ubuntu to 18.04

commit b2ca7c5
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Wed Sep 1 09:54:06 2021 -0700

    [CHANGELOG] Add empty Master section

commit 6bccd58
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Wed Sep 1 09:54:02 2021 -0700

    Release 1.11.0

commit d2f942d
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Wed Sep 1 09:29:02 2021 -0700

    Update pre_release task to avoid checking if the master specs repo exists.

commit ae95e63
Author: Dimitris Koutsogiorgas <dimitris@dimitrisimac.local>
Date:   Tue Aug 31 08:02:31 2021 -0700

    Update post_release task to no longer update the master specs repo automatically.

commit 0aca976
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Wed Aug 25 19:09:03 2021 +0300

    [CHANGELOG] Add empty Master section

commit 7523da2
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Wed Aug 25 19:09:00 2021 +0300

    Release 1.11.0.rc.1

commit f76a08f
Merge: 7b6a289 534a7be
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Wed Aug 25 08:14:40 2021 +0300

    Merge pull request CocoaPods#10884 from dnkoutso/multi_xcframeworks_fix

    Correctly process multiple `xcframeworks` a pod provides.

commit 534a7be
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Fri Aug 20 20:50:35 2021 +0300

    Correctly process multiple `xcframeworks` a pod provides.

commit 7b6a289
Merge: 3f0d276 f17d1a6
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Fri Aug 13 01:25:47 2021 +0300

    Merge pull request CocoaPods#10865 from dnkoutso/its_4

    Even more correct xcframework paths

commit f17d1a6
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Fri Aug 13 00:42:59 2021 +0300

    Even more correct xcframework paths

commit 3f0d276
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Thu Aug 12 01:22:37 2021 +0300

    [CHANGELOG] Add empty Master section

commit 70e5d08
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Thu Aug 12 01:22:33 2021 +0300

    Release 1.11.0.beta.2

commit 82d4784
Merge: 97d8f23 1586df5
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Wed Aug 11 23:00:39 2021 +0300

    Merge pull request CocoaPods#10858 from dnkoutso/attempt_fix_10430

    Pass correct paths for `select_slice` method.

commit 1586df5
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Wed Aug 11 22:34:53 2021 +0300

    Pass correct paths for `select_slice` method.

commit 97d8f23
Merge: 22a6218 19dc3f4
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Wed Aug 11 03:30:42 2021 +0300

    Merge pull request CocoaPods#10855 from dnkoutso/odr_categories

    Integrate ODR categories into projects.

commit 19dc3f4
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Tue Aug 10 21:00:40 2021 +0300

    Integrate ODR categories into projects.

commit 22a6218
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Mon Aug 9 21:46:46 2021 +0300

    Point to 1-11-stable of Core

commit e2b32f0
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Mon Aug 9 21:20:32 2021 +0300

    [CHANGELOG] Add empty Master section

commit 3de280f
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Mon Aug 9 21:20:27 2021 +0300

    Release 1.11.0.beta.1

commit 627ef05
Merge: 91732cf 73fc6d6
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Mon Aug 9 20:51:17 2021 +0300

    Merge pull request CocoaPods#10849 from CocoaPods/bump_molinillo_080

    Bump Molinillo version to 0.8.0

commit 73fc6d6
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Mon Aug 9 19:26:41 2021 +0300

    Bump Molinillo version to 0.8.0

commit 91732cf
Merge: ac3cdc6 6e640e3
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Mon Aug 9 18:52:04 2021 +0300

    Merge pull request CocoaPods#10848 from CocoaPods/bump_xcodeproj_121

    Bump minimum Xcodeproj version to 1.21.0

commit 6e640e3
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Mon Aug 9 18:28:31 2021 +0300

    Bump minimum Xcodeproj version to 1.21.0

commit ac3cdc6
Merge: 9cebcde a161611
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Mon Aug 9 14:39:20 2021 +0300

    Merge pull request CocoaPods#10834 from igor-makarov/compilable-variant-group

    Fix resource variant groups in static frameworks

commit a161611
Author: Igor Makarov <igormaka@gmail.com>
Date:   Sun Aug 8 17:53:16 2021 +0300

    add changelog

commit ba05e89
Author: Igor Makarov <igormaka@gmail.com>
Date:   Sun Aug 8 17:51:13 2021 +0300

    add test for aggregate target with base-localized storyboard & static framework

commit 104d0b6
Author: Igor Makarov <igormaka@gmail.com>
Date:   Sun Aug 8 17:02:47 2021 +0300

    fix tests affected by podspec change

commit 590442b
Author: Igor Makarov <igormaka@gmail.com>
Date:   Sun Aug 8 16:31:31 2021 +0300

    test for base-localized resources

commit 8e7a92b
Author: Igor Makarov <igormaka@gmail.com>
Date:   Sun Aug 8 16:29:25 2021 +0300

    make test fixture tarballs tasks more robust

commit d9c930d
Author: Igor Makarov <igormaka@gmail.com>
Date:   Wed Aug 4 22:07:31 2021 +0300

    create correct output paths for localized resources

commit 4238043
Author: Igor Makarov <igormaka@gmail.com>
Date:   Wed Aug 4 21:02:39 2021 +0300

    When a resource is a variant group, retrieve the resource filename correctly

commit 9cebcde
Merge: 4c77243 9d28c49
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Sat Aug 7 02:55:27 2021 +0300

    Merge pull request CocoaPods#10845 from dnkoutso/odr_integrate_app_specs

    Integrate ODRs for app specs.

commit 9d28c49
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Wed Aug 4 01:05:03 2021 +0300

    Integrate ODRs for app specs.

commit 4c77243
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Sat Aug 7 01:05:11 2021 +0300

    Run rubocop on Gemfile

commit c89bfd9
Merge: 81a3dbb 4df00cb
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Wed Aug 4 23:42:41 2021 +0300

    Merge pull request CocoaPods#10835 from CocoaPods/fix_regression

    Fix xcframework paths when multiple xcframeworks are vended from subspecs.

commit 4df00cb
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Wed Aug 4 22:57:19 2021 +0300

    Add AppCenter pod consumtion example

commit c2fd540
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Wed Aug 4 22:04:39 2021 +0300

    Fix xcframework paths when multiple xcframeworks are vended from subspecs.

commit 81a3dbb
Merge: 3b34b48 22182ac
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Wed Aug 4 15:30:49 2021 +0300

    Merge pull request CocoaPods#10324 from CocoaPods/segiddins/ruby-3

    Run specs on Ruby 3

commit 22182ac
Author: Samuel Giddins <segiddins@segiddins.me>
Date:   Fri Jan 1 13:16:00 2021 -0800

    Run specs on Ruby 3

commit 3b34b48
Merge: 24a8bac 65d4059
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Wed Aug 4 02:26:22 2021 +0300

    Merge pull request CocoaPods#10827 from dnkoutso/add_project_header_files_dsl

    Integrate `project_header_files` specified by specs.

commit 65d4059
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Sat Jul 31 18:06:14 2021 +0300

    Integrate `project_header_files` specified by specs.

commit 24a8bac
Merge: 3917fd4 f2b4487
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Wed Aug 4 01:57:47 2021 +0300

    Merge pull request CocoaPods#10830 from dnkoutso/bug_embed_xcframeworks_test_bundles

    Fix adding embed frameworks script phase to unit test targets if xcframeworks are present.

commit f2b4487
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Tue Aug 3 12:10:51 2021 +0300

    Fix adding embed frameworks script phase to unit test targets if xcframeworks are present.

commit 3917fd4
Merge: 10c7683 dd8c6c9
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Wed Aug 4 01:28:41 2021 +0300

    Merge pull request CocoaPods#10831 from dnkoutso/cleanup_unused_xcframeworks_Code

    Remove unused `install_xcframework_library` code.

commit dd8c6c9
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Tue Aug 3 12:40:47 2021 +0300

    Remove unused `install_xcframework_library` code.

commit 10c7683
Merge: 2123764 336cc5f
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Tue Aug 3 18:14:09 2021 +0300

    Merge pull request CocoaPods#10832 from dnkoutso/lib_name_validation

    Validate vendored library names after they have been expanded.

commit 336cc5f
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Tue Aug 3 15:37:29 2021 +0300

    Validate vendored library names after they have been expanded.

commit 2123764
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Sat Jul 31 18:07:20 2021 +0300

    Remove bad comment from codebase

commit 7b53ec8
Merge: 07ee195 24c151f
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Sat Jul 31 02:53:21 2021 +0300

    Merge pull request CocoaPods#10826 from dnkoutso/unique_output_xcframework_path

    Place frameworks from xcframeworks into a unique folder name to avoid duplicate outputs.

commit 24c151f
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Fri Jul 30 20:31:46 2021 +0300

    Place frameworks from xcframeworks into a unique folder name to avoid duplicate outputs.

commit 07ee195
Merge: 75a5e2d 674c067
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Fri Jul 30 21:10:00 2021 +0300

    Merge pull request CocoaPods#10825 from gonghonglou/fix_pod_changed

    Update pod in Pods folder when changing the pod from branch to version in Podfie

commit 674c067
Author: gonghonglou <gonghonglou@icloud.com>
Date:   Sat Jul 31 00:16:29 2021 +0800

    Fix changelog entry

commit 2ab18df
Author: gonghonglou <gonghonglou@icloud.com>
Date:   Fri Jul 30 23:33:24 2021 +0800

    update from code review

commit 274971a
Author: gonghonglou <gonghonglou@icloud.com>
Date:   Fri Jul 30 18:19:49 2021 +0800

    Update pod in Pods folder when changing the pod from branch to version in Podfie

commit 75a5e2d
Merge: c1e5605 365845c
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Fri Jul 30 08:57:54 2021 +0300

    Merge pull request CocoaPods#10812 from dnkoutso/odr_support

    Add support for integrating on demand resources.

commit 365845c
Author: jimu.xjy <jimu.xjy@alibaba-inc.com>
Date:   Wed Mar 18 16:54:11 2020 +0800

    Add support for integrating on demand resources.

commit c1e5605
Merge: 42cce88 880d046
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Thu Jul 29 18:33:46 2021 +0300

    Merge pull request CocoaPods#10820 from dnkoutso/update_xcodeproj_120

    Update Xcodeproj gem

commit 880d046
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Thu Jul 29 17:27:00 2021 +0300

    Update Xcodeproj gem

commit 42cce88
Merge: 94e00b0 28fa28f
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Thu Jul 29 17:23:07 2021 +0300

    Merge pull request CocoaPods#10792 from dnkoutso/mkdir_p_dsym

    Fix touch on a missing directory for dSYM copy phase script.

commit 28fa28f
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Tue Jul 20 21:56:31 2021 +0300

    Fix touch on a missing directory for dSYM copy phase script.

commit 94e00b0
Merge: 2f7d440 b37c5eb
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Thu Jul 29 02:25:33 2021 +0300

    Merge pull request CocoaPods#10816 from CocoaPods/merge_1102stable_into_master

    Merge `1-10-stable` (1.10.2) into `master`

commit b37c5eb
Merge: 2f7d440 68d6fb0
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Thu Jul 29 01:49:30 2021 +0300

    Merge branch '1-10-stable' into merge_1102stable_into_master

    * 1-10-stable:
      Update integration specs submodule sha
      [CHANGELOG] Add empty Master section
      Release 1.10.2
      Update examples to build with Xcode 12
      Fix CHANGELOG
      Fix changelog entry
      Review feedback
      Fixes and integration test update
      fix missing -objc for xcframeworks - take 2
      Fix the PR number in the changelog
      Actually test iOS for the iOS version of a header_mappings_dir test
      Bump the maximum block length from 1476 to 1493
      Fix Archive failures when using header_mappings_dir and Catalyst
      Change URL validation failure to a note

commit 2f7d440
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Thu Jul 29 01:46:41 2021 +0300

    Update integration specs submodule SHA

commit 68d6fb0
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Thu Jul 29 01:21:47 2021 +0300

    Update integration specs submodule sha

commit 94e37ed
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Wed Jul 28 23:58:30 2021 +0300

    [CHANGELOG] Add empty Master section

commit 804eed5
Merge: 22ab8cf abed930
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Sat Jul 24 11:56:33 2021 +0300

    Merge pull request CocoaPods#10804 from dnkoutso/bump_addressable

    Bump addressable dependency to 2.8.

commit abed930
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Fri Jul 23 19:38:43 2021 +0300

    Bump addressable dependency to 2.8.

commit 22ab8cf
Merge: b6570c7 7e3004b
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Fri Jul 23 10:10:26 2021 +0300

    Merge pull request CocoaPods#10795 from dnkoutso/integrate_pre_built_take1

    Integrate test specs and app specs of pre-built pods.

commit b6570c7
Merge: 2d8c1d1 69398a0
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Thu Jul 22 20:36:06 2021 +0300

    Merge pull request CocoaPods#10800 from dnkoutso/uniq_bcsymbolpaths

    Dedup bcsymbolmap paths found from multiple vendored frameworks.

commit 69398a0
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Thu Jul 22 16:45:47 2021 +0300

    Dedup bcsymbolmap paths found from multiple vendored frameworks.

commit 2d8c1d1
Merge: 2342d7f eba91ad
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Thu Jul 22 02:07:26 2021 +0300

    Merge pull request CocoaPods#10794 from dnkoutso/proper_filter_deps

    Correctly filter dependencies for pod variants across different platforms.

commit eba91ad
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Wed Jul 21 00:58:35 2021 +0300

    Correctly filter dependencies for pod variants across different platforms.

commit 7e3004b
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Wed Jul 21 09:47:31 2021 +0300

    Integrate test specs and app specs of pre-built pods.

commit 2342d7f
Merge: b8065d0 ec3cb4f
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Thu Jul 22 01:28:26 2021 +0300

    Merge pull request CocoaPods#10793 from dnkoutso/rcproject_files_support

    Mark RealityComposer-projects (`.rcproject`) files defined in resources for compilation.

commit ec3cb4f
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Tue Jul 20 22:37:27 2021 +0300

    Mark RealityComposer-projects (`.rcproject`) files defined in resources for compilation.

commit b8065d0
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Wed Jul 21 01:19:55 2021 +0300

    Add missing link for CHANGELOG entry

commit 4423dd1
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Wed Jul 21 01:18:00 2021 +0300

    fix pre integrate hook changelog entry

commit d26080e
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Wed Jul 21 01:16:33 2021 +0300

    More CHANGELOG entry fixes

commit a44cbd7
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Wed Jul 21 01:11:50 2021 +0300

    Minor fixes to CHANGELOG entries

commit 2df49f5
Merge: 1c3eeb0 9899944
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Tue Jul 20 09:36:59 2021 +0300

    Merge pull request CocoaPods#10787 from dnkoutso/info_plist_consumer_app

    Generate default `Info.plist` for consumer app during validation.

commit 1c3eeb0
Merge: b84f341 4843195
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Tue Jul 20 09:30:50 2021 +0300

    Merge pull request CocoaPods#10788 from dnkoutso/copy_headers_script_phase

    Add support for `before_headers` and `after_headers` script phase DSL.

commit 4843195
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Tue Jul 20 01:09:44 2021 +0300

    Add support for `before_headers` and `after_headers` script phase DSL.

commit 9899944
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Mon Jul 19 22:09:13 2021 +0300

    Generate default `Info.plist` for consumer app during validation.

commit b84f341
Merge: 3bb7a3b e665ed6
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Wed Jul 7 17:08:38 2021 +0300

    Merge pull request CocoaPods#10764 from gonghonglou/fix_warn_for_removing_git_master_specs_repo

    Check the podfile sources and plugin sources when printing warnings without explicitly using the master source.

commit e665ed6
Author: gonghonglou <gonghonglou@icloud.com>
Date:   Tue Jul 6 14:12:43 2021 +0800

    Check the podfile sources and plugin sources when printing warnings without explicitly using the master source.

commit 3bb7a3b
Merge: 7a66b9e df8b9a4
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Tue Jul 6 16:18:13 2021 +0300

    Merge pull request CocoaPods#10762 from dnkoutso/ruby_macho_update

    Update `ruby-macho` gem version to support 1.x and 2.x.

commit df8b9a4
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Tue Jul 6 01:55:21 2021 +0300

    Update `ruby-macho` gem version to support 1.x and 2.x.

commit 7a66b9e
Merge: 3bf22c0 b3d9db2
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Tue Jul 6 15:52:25 2021 +0300

    Merge pull request CocoaPods#10761 from dnkoutso/fix_subspec_name_error

    Fix validation when subspec name starts with the name of the root spec

commit b3d9db2
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Tue Jul 6 00:59:42 2021 +0300

    Fix validation when subspec name starts with the name of the root spec

commit 3bf22c0
Merge: d6c68be 4f4267d
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Sat Jul 3 01:59:18 2021 +0300

    Merge pull request CocoaPods#10583 from knox/copy_dsyms

    [Installer] use relative paths in copy dsyms script

commit 4f4267d
Author: Mickey Knox <mickey@netfreaks.org>
Date:   Wed Apr 14 11:55:28 2021 +0200

    [Installer] use relative paths in copy dsyms script

commit d6c68be
Merge: aa23f48 afd2a18
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Fri Jul 2 18:55:16 2021 +0300

    Merge pull request CocoaPods#10207 from till0xff/1.9.3-skip-modulemap

    Added possibility to skip modulemap generation

commit afd2a18
Author: till0xff <till0xff@gmail.com>
Date:   Thu Nov 12 23:07:40 2020 +0300

    Added possibility to skip modulemap generation

commit aa23f48
Merge: 8b828cf 632b24a
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Fri Jul 2 17:05:52 2021 +0300

    Merge pull request CocoaPods#10751 from dnkoutso/use_open_uri

    Use `OpenURI.open_uri` instead

commit 632b24a
Author: Dimitris Koutsogiorgas <dimitris@squareup.com>
Date:   Fri Jul 2 16:09:49 2021 +0300

    Use `OpenURI.open_uri` instead

commit 8b828cf
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Fri Jul 2 15:59:05 2021 +0300

    Update changelog entry

commit 73dc485
Merge: addcf2d 77a362b
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Fri Jul 2 15:57:54 2021 +0300

    Merge pull request CocoaPods#10412 from igor-makarov/bump-to-ruby-2.6

    Update minimum Ruby to >= 2.6

commit 77a362b
Author: Igor Makarov <igormaka@gmail.com>
Date:   Fri Jul 2 15:44:05 2021 +0300

    add changelog entry

commit 768eab6
Author: Igor Makarov <igormaka@gmail.com>
Date:   Sun Feb 7 00:07:23 2021 +0200

    Update minimum Ruby to >= 2.6

commit addcf2d
Merge: 9461b34 94e2b72
Author: Dimitris Koutsogiorgas <dnkoutso@gmail.com>
Date:   Fri Jul 2 05:05:21 2021 +0300

    Merge pull request CocoaPods#10744 from revolter/patch-3

    Fix typo in method documentation

commit 94e2b72
Author: Iulian Onofrei <6d0847b9@opayq.com>
Date:   Wed Jun 30 17:33:27 2021 +0300

    Fix typo in method documentation
  • Loading branch information
zhuys committed Sep 17, 2021
1 parent 1c556c8 commit e1ec1b5
Show file tree
Hide file tree
Showing 140 changed files with 4,667 additions and 315 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/Lint.yml
Expand Up @@ -5,8 +5,8 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: [2.4]
os: [ubuntu-16.04]
ruby: [2.6]
os: [ubuntu-18.04]

name: Lint
runs-on: ${{ matrix.os }}
Expand All @@ -32,7 +32,6 @@ jobs:
gems@v1-${{ matrix.os }}-${{ env.ImageVersion }}-Ruby${{ matrix.ruby }}-
- name: Run bundle install
run: |
gem install bundler -v "~> 1.17"
bundle config path vendor/bundle
bundle install --jobs 4 --retry 3 --without debugging documentation
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/Specs.yml
Expand Up @@ -6,8 +6,8 @@ jobs:
fail-fast: false
matrix:
task: [SPECS]
ruby: [2.3.3, 2.4, 2.5, 2.6, 2.7]
os: [ubuntu-16.04]
ruby: [2.6, 2.7, 3.0]
os: [ubuntu-18.04]
include:
- task: SPECS
os: macos-10.15
Expand Down Expand Up @@ -70,4 +70,3 @@ on:
branches:
- master
- "*-stable"

2 changes: 2 additions & 0 deletions .rubocop_todo.yml
Expand Up @@ -238,6 +238,8 @@ Lint/UselessAccessModifier:
# Configuration parameters: CountComments, ExcludedMethods.
Metrics/BlockLength:
Max: 1493
Exclude:
- 'spec/unit/installer/xcode/pods_project_generator/pod_target_installer_spec.rb'

# Offense count: 7099
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
Expand Down
198 changes: 190 additions & 8 deletions CHANGELOG.md
Expand Up @@ -4,23 +4,140 @@ To install or update CocoaPods see this [guide](https://guides.cocoapods.org/usi

To install release candidates run `[sudo] gem install cocoapods --pre`

## 1.10.2 (2021-07-28)
## 1.11.2 (2021-09-13)

##### Enhancements

* None.

##### Bug Fixes

* Do not validate modular header dependencies for pre-built Swift pods.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#10912](https://github.com/CocoaPods/CocoaPods/issues/10912)


## 1.11.1 (2021-09-13)

##### Enhancements

* None.

##### Bug Fixes

* Handle spec repo urls with user info when determining if they are CDN.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#10941](https://github.com/CocoaPods/CocoaPods/issues/10941)

* Set `INFOPLIST_FILE` build setting to `$(SRCROOT)/App/App-Info.plist` during lint.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#10927](https://github.com/CocoaPods/CocoaPods/issues/10927)

* Set `PRODUCT_BUNDLE_IDENTIFIER` for generated app during lint.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#10933](https://github.com/CocoaPods/CocoaPods/issues/10933)


## 1.11.0 (2021-09-01)

##### Enhancements

* None.

##### Bug Fixes

* None.


## 1.11.0.rc.1 (2021-08-25)

##### Enhancements

* None.

##### Bug Fixes

* Correctly process multiple `xcframeworks` a pod provides.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#10378](https://github.com/CocoaPods/CocoaPods/issues/10378)


## 1.11.0.beta.2 (2021-08-11)

##### Enhancements

* Integrate ODR categories into projects.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#10855](https://github.com/CocoaPods/CocoaPods/pull/10855)

##### Bug Fixes

* Pass correct paths for `select_slice` method.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#10430](https://github.com/CocoaPods/CocoaPods/issues/10430)


## 1.11.0.beta.1 (2021-08-09)

##### Enhancements

* Add support for integrating on demand resources.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[JunyiXie](https://github.com/JunyiXie)
[#9606](https://github.com/CocoaPods/CocoaPods/issues/9606)
[#10845](https://github.com/CocoaPods/CocoaPods/pull/10845)

* Integrate `project_header_files` specified by specs.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#9820](https://github.com/CocoaPods/CocoaPods/issues/9820)

* Mark RealityComposer-projects (`.rcproject`) files defined in resources for compilation.
[Hendrik von Prince](https://github.com/parallaxe)
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#10793](https://github.com/CocoaPods/CocoaPods/pull/10793)

* Integrate test specs and app specs of pre-built pods.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#10795](https://github.com/CocoaPods/CocoaPods/pull/10795)

* Add support for `before_headers` and `after_headers` script phase DSL.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#10770](https://github.com/CocoaPods/CocoaPods/issues/10770)

* Fix touch on a missing directory for dSYM copy phase script.
[alvarollmenezes](https://github.com/alvarollmenezes)
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#10488](https://github.com/CocoaPods/CocoaPods/issues/10488)

* Check the podfile sources and plugin sources when printing warnings without explicitly using the master source.
[gonghonglou](https://github.com/gonghonglou)
[#10764](https://github.com/CocoaPods/CocoaPods/pull/10764)

* Use relative paths in copy dsyms script.
[Mickey Knox](https://github.com/knox)
[#10583](https://github.com/CocoaPods/CocoaPods/pull/10583)

* Use `OpenURI.open_uri` instead.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#10597](https://github.com/CocoaPods/CocoaPods/issues/10597)

* Set minimum supported Ruby version to 2.6.
[Igor Makarov](https://github.com/igor-makarov)
[#10412](https://github.com/CocoaPods/CocoaPods/pull/10412)

* Improve compatibility with ActiveSupport 6
[Jun Jiang](https://github.com/jasl)
[#10364](https://github.com/CocoaPods/CocoaPods/pull/10364)

* Add a post_integrate_hook API
* Add a `pre_integrate_hook` API
[dcvz](https://github.com/dcvz)
[#9935](https://github.com/CocoaPods/CocoaPods/pull/9935)

* Rewrite the only place dependent on `typhoeus`.
[Jun Jiang](https://github.com/jasl), [Igor Makarov](https://github.com/igor-makarov)
[#10346](https://github.com/CocoaPods/CocoaPods/pull/10346)

* Add a `--update-sources` option to `pod repo push` so one can ensure sources are up-to-date.
* Add a `--update-sources` option to `pod repo push` so one can ensure sources are up-to-date.
[Elton Gao](https://github.com/gyfelton)
[Justin Martin](https://github.com/justinseanmartin)

Expand All @@ -36,13 +153,69 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[cltnschlosser](https://github.com/cltnschlosser)
[#9916](https://github.com/CocoaPods/CocoaPods/pull/9916)

* Add possibility to skip modulemap generation
[till0xff](https://github.com/till0xff)
[#10235](https://github.com/CocoaPods/CocoaPods/issues/10235)

* Add a `--version` option to `pod spec cat` and `pod spec which` for listing the podspec of a specific version
[pietbrauer](https://github.com/pietbrauer)
[#10609](https://github.com/CocoaPods/CocoaPods/pull/10609)

##### Bug Fixes

* Respect `--configuration` option when analyzing via `pod lib lint --analyze`.
* Fix resource variant groups in static frameworks
[Igor Makarov](https://github.com/igor-makarov)
[#10834](https://github.com/CocoaPods/CocoaPods/pull/10834)
[#10605](https://github.com/CocoaPods/CocoaPods/issues/10605)

* Fix adding embed frameworks script phase to unit test targets if xcframeworks are present.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#10652](https://github.com/CocoaPods/CocoaPods/issues/10652)

* Remove unused `install_xcframework_library` code.
[Gio Lodi](https://github.com/mokagio)
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#10831](https://github.com/CocoaPods/CocoaPods/pull/10831)

* Validate vendored library names after they have been expanded.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#10832](https://github.com/CocoaPods/CocoaPods/pull/10832)

* Place frameworks from xcframeworks into a unique folder name to avoid duplicate outputs.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#10106](https://github.com/CocoaPods/CocoaPods/issues/10106)

* Update pod in Pods folder when changing the pod from branch to version in Podfie.
[gonghonglou](https://github.com/gonghonglou)
[#10825](https://github.com/CocoaPods/CocoaPods/pull/10825)

* Bump addressable dependency to 2.8.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#10802](https://github.com/CocoaPods/CocoaPods/issues/10802)

* Dedup bcsymbolmap paths found from multiple vendored frameworks.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#10373](https://github.com/CocoaPods/CocoaPods/issues/10373)

* Correctly filter dependencies for pod variants across different platforms.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#10777](https://github.com/CocoaPods/CocoaPods/issues/10777)

* Generate default `Info.plist` for consumer app during validation.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#8570](https://github.com/CocoaPods/CocoaPods/issues/8570)

* Fix lint subspec error when the name of subspec start with the pod name.
[XianpuMeng](https://github.com/XianpuMeng)
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#9906](https://github.com/CocoaPods/CocoaPods/issues/9906)

* Update `ruby-macho` gem version to support 1.x and 2.x.
[Eric Chamberlain](https://github.com/PeqNP)
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#10390](https://github.com/CocoaPods/CocoaPods/issues/10390)

* Respect `--configuration` option when analyzing via `pod lib lint --analyze`.
[Jenn Magder](https://github.com/jmagman)
[#10476](https://github.com/CocoaPods/CocoaPods/issues/10476)

Expand Down Expand Up @@ -73,6 +246,16 @@ To install release candidates run `[sudo] gem install cocoapods --pre`

* Serialize schemes that do not need to be rewritten by Xcode.
[Samuel Giddins](https://github.com/segiddins)


## 1.10.2 (2021-07-28)

##### Enhancements

* None.

##### Bug Fixes

* Fix errors when archiving a Catalyst app which depends on a pod which uses `header_mappings_dir`.
[Thomas Goyne](https://github.com/tgoyne)
[#10224](https://github.com/CocoaPods/CocoaPods/pull/10224)
Expand Down Expand Up @@ -199,20 +382,19 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Gereon Steffens](https://github.com/gereons)
[#9686](https://github.com/CocoaPods/CocoaPods/issues/9686)

* Add a post_integrate_hook API
* Add a `post_integrate_hook` API
[lucasmpaim](https://github.com/lucasmpaim)
[#7432](https://github.com/CocoaPods/CocoaPods/issues/7432)

* Set the `BUILD_LIBRARY_FOR_DISTRIBUTION` build setting if integrating with
a target that has the setting set to `YES` (directly or in an .xcconfig).
* Set the `BUILD_LIBRARY_FOR_DISTRIBUTION` build setting if integrating with a target that has the setting set to `YES`.
[Juanjo López](https://github.com/juanjonol)
[#9232](https://github.com/CocoaPods/CocoaPods/issues/9232)

* Option to lint a specified set of test_specs
[Paul Beusterien](https://github.com/paulb777)
[#9392](https://github.com/CocoaPods/CocoaPods/pull/9392)

* Add --use-static-frameworks lint option
* Add `--use-static-frameworks` lint option
[Paul Beusterien](https://github.com/paulb777)
[#9632](https://github.com/CocoaPods/CocoaPods/pull/9632)

Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Expand Up @@ -20,7 +20,7 @@ gemspec

group :development do
cp_gem 'claide', 'CLAide'
cp_gem 'cocoapods-core', 'Core'
cp_gem 'cocoapods-core', 'Core', '1-11-stable'
cp_gem 'cocoapods-deintegrate', 'cocoapods-deintegrate'
cp_gem 'cocoapods-downloader', 'cocoapods-downloader'
cp_gem 'cocoapods-plugins', 'cocoapods-plugins'
Expand Down Expand Up @@ -48,7 +48,7 @@ group :development do

# Integration tests
gem 'diffy'
gem 'clintegracon'
gem 'clintegracon', :git => 'https://github.com/mrackwitz/CLIntegracon.git'

# Code Quality
gem 'inch_by_inch'
Expand Down

0 comments on commit e1ec1b5

Please sign in to comment.