Merge branch 'master' into fix-installation-subclass

.github/workflows/cocoapods-lint.yml

@@ -52,8 +52,8 @@ jobs:
         with:
           ruby-version: 3.0
 
-      - name: Install CocoaPods
-        run: sudo gem install cocoapods
+      - name: Install Ruby Gems
+        run: sudo bundle install
 
       - name: Use Latest Stable Xcode
         uses: maxim-lobanov/setup-xcode@v1

.github/workflows/release.yml

@@ -19,8 +19,8 @@ jobs:
         with:
           ruby-version: '3.0'
 
-      - name: Install CocoaPods
-        run: gem install cocoapods
+      - name: Install Ruby Gems
+        run: sudo bundle install
 
       - name: Use Latest Stable Xcode
         uses: maxim-lobanov/setup-xcode@v1

.gitignore

@@ -26,6 +26,8 @@ Carthage/Build
 .build
 .swiftpm/xcode/xcuserdata
 .swiftpm/package.xcworkspace/xcuserdata
+### Ruby ###
+Gemfile.lock
 ### Samples ###
 /Samples/Common/.swiftpm
 /Samples/**/Derived

Gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+ruby ">= 3.0.0"
+
+# '!= 1.16.0': https://github.com/CocoaPods/CocoaPods/issues/12664
+gem 'cocoapods', '>= 1.15.2', '!= 1.16.0'
+
+# '!= 1.26.0': https://github.com/CocoaPods/Xcodeproj/issues/989
+gem 'xcodeproj', '!= 1.26.0'

Sources/KSCrashDemangleFilter/swift/Basic/STLExtras.h

@@ -537,8 +537,9 @@ namespace swift {
         typename std::iterator_traits<Iterator>::reference;
 
         using ResultReference =
-        typename std::result_of<OptionalTransform(UnderlyingReference)>::type;
-
+        // The line below is manually patched
+        decltype((std::declval<UnderlyingReference>()->*std::declval<OptionalTransform>())());
+
     public:
         /// Used to indicate when the current iterator has already been
         /// "primed", meaning that it's at the end or points to a value that