From c2bddf703801ce191a8719f21e4d858daac007a1 Mon Sep 17 00:00:00 2001
From: Nikolay Volosatov <code@bamx23.com>
Date: Tue, 29 Oct 2024 14:41:12 +0000
Subject: [PATCH] Fix CocoaPods lint (#585)

* Extend CocoaPods lint timeout

* Fix no result_of error

* Force CocoaPods 1.25.1

* Use Gemfile

* Revert "Extend CocoaPods lint timeout"

This reverts commit 51f192d6f387ffcc7d2d6952bf8e7f92c3920ad8.

* Exclude CocoaPods 1.16.0
---
 .github/workflows/cocoapods-lint.yml                  | 4 ++--
 .github/workflows/release.yml                         | 4 ++--
 .gitignore                                            | 2 ++
 Gemfile                                               | 8 ++++++++
 Sources/KSCrashDemangleFilter/swift/Basic/STLExtras.h | 5 +++--
 5 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 Gemfile

diff --git a/.github/workflows/cocoapods-lint.yml b/.github/workflows/cocoapods-lint.yml
index fd0eb68c9..cf125d574 100644
--- a/.github/workflows/cocoapods-lint.yml
+++ b/.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
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2f5377fad..86c4ebddf 100644
--- a/.github/workflows/release.yml
+++ b/.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
diff --git a/.gitignore b/.gitignore
index ec9ee0b8d..be5dc57dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,8 @@ Carthage/Build
 .build
 .swiftpm/xcode/xcuserdata
 .swiftpm/package.xcworkspace/xcuserdata
+### Ruby ###
+Gemfile.lock
 ### Samples ###
 /Samples/Common/.swiftpm
 /Samples/**/Derived
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 000000000..a6fb20c80
--- /dev/null
+++ b/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'
diff --git a/Sources/KSCrashDemangleFilter/swift/Basic/STLExtras.h b/Sources/KSCrashDemangleFilter/swift/Basic/STLExtras.h
index 5b741a7d7..c162db5c1 100644
--- a/Sources/KSCrashDemangleFilter/swift/Basic/STLExtras.h
+++ b/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