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

.github/workflows/Specs.yml

@@ -54,7 +54,7 @@ jobs:
       - uses: maxim-lobanov/[email protected]
         if: ${{ matrix.task == 'EXAMPLES' }}
         with:
-          xcode-version: 11.3.1
+          xcode-version: 12.1
 
       - name: Run Tests
         run: bundle exec rake spec:all

.rubocop_todo.yml

@@ -237,7 +237,7 @@ Lint/UselessAccessModifier:
 # Offense count: 373
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 1476
+  Max: 1493
   Exclude:
     - 'spec/unit/installer/xcode/pods_project_generator/pod_target_installer_spec.rb'
 

CHANGELOG.md

@@ -134,6 +134,27 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [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)
+
+* Fix missing `-ObjC` for static XCFrameworks - take 2  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#10459](https://github.com/CocoaPods/CocoaPods/issuess/10459)
+
+* Change URL validation failure to a note  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#10291](https://github.com/CocoaPods/CocoaPods/issues/10291)
+
+
 ## 1.10.1 (2021-01-07)
 
 ##### Enhancements

Gemfile.lock

@@ -7,10 +7,10 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/Core.git
-  revision: a74cd59171d0095369641e764e67e7b39ef105e7
+  revision: 397fa25c069afc7c75666b74ffc39b2d61e8130c
   branch: master
   specs:
-    cocoapods-core (1.10.1)
+    cocoapods-core (1.10.2)
       activesupport (>= 5.0, < 7)
       addressable (~> 2.6)
       algoliasearch (~> 1.0)
@@ -30,7 +30,7 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/Nanaimo.git
-  revision: 30bd8ecd80d7530c5f50029e1e67812170c91e96
+  revision: 1bf2e6e8781045fed99ca7020d5007234e715dc8
   branch: master
   specs:
     nanaimo (0.3.0)
@@ -57,14 +57,14 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/cocoapods-downloader.git
-  revision: 1afba7c3e26b55710317f69483c1446a60fbfb2e
+  revision: 55c2937c19baadbd3529bf9919f9626af4dea597
   branch: master
   specs:
     cocoapods-downloader (1.4.0)
 
 GIT
   remote: https://github.com/CocoaPods/cocoapods-plugins.git
-  revision: 89f05e5bbd847b82e46e5a9ee0f3953805877828
+  revision: 5fe129c3a803dd91fac58ddc5996eecb0ddb4703
   branch: master
   specs:
     cocoapods-plugins (1.0.0)
@@ -79,7 +79,7 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/cocoapods-trunk.git
-  revision: 00eca277d17d24c272adb6c7fa8d7c2c3fe8da3b
+  revision: d3ae92f6364ccc02439bf439df2abc07fa58f259
   branch: master
   specs:
     cocoapods-trunk (1.5.0)
@@ -102,10 +102,10 @@ GIT
 PATH
   remote: .
   specs:
-    cocoapods (1.10.1)
+    cocoapods (1.10.2)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.10.1)
+      cocoapods-core (= 1.10.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.4.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -125,7 +125,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (3.0.3)
-    activesupport (5.2.4.4)
+    activesupport (5.2.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -152,7 +152,7 @@ GEM
       pry (= 0.10.3)
     coderay (1.1.2)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.9)
     cork (0.3.0)
       colored2 (~> 3.1)
     crack (0.4.5)
@@ -172,21 +172,21 @@ GEM
     diffy (3.2.1)
     docile (1.1.5)
     escape (0.0.4)
-    ethon (0.13.0)
+    ethon (0.14.0)
       ffi (>= 1.15.0)
     faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (1.3.1)
       faraday (~> 0.8)
-    ffi (1.15.0)
+    ffi (1.15.3)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     git (1.7.0)
       rchardet (~> 1.8)
     hashdiff (1.0.1)
     httpclient (2.8.3)
-    i18n (1.8.7)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     inch (0.8.0)
       pry
@@ -207,7 +207,7 @@ GEM
       rb-kqueue (>= 0.2)
     metaclass (0.0.4)
     method_source (0.8.2)
-    minitest (5.14.3)
+    minitest (5.14.4)
     mocha (1.2.1)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.3)
@@ -242,7 +242,7 @@ GEM
     rb-kqueue (0.2.3)
       ffi (>= 0.5.0)
     rchardet (1.8.0)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rubocop (0.50.0)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)