Strip Additional Swift Symbols from Mangling

- With newer versions of Swift, it's symbols have altered slightly and new ones introduced. Therefore we have updated our regex patterns to ensure Swift symbols are not included in our Mangling config.
- Bumpe version to `1.1.1`

Author: Br1an-Boyle

.ruby-version

@@ -1 +1 @@
-2.6.5
+2.7.6

Gemfile.lock

@@ -1,78 +1,82 @@
 PATH
   remote: .
   specs:
-    cocoapods-mangle (1.1.0)
-      cocoapods (~> 1.0)
+    cocoapods-mangle (1.1.1)
+      cocoapods (~> 1.11.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.2)
-    activesupport (4.2.11.3)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    algoliasearch (1.27.3)
+    CFPropertyList (3.0.6)
+      rexml
+    activesupport (6.1.7.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.2)
+      public_suffix (>= 2.0.2, < 6.0)
+    algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
-    claide (1.0.3)
-    cocoapods (1.9.3)
-      activesupport (>= 4.0.2, < 5)
+    claide (1.1.0)
+    cocoapods (1.11.3)
+      addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.9.3)
+      cocoapods-core (= 1.11.3)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.2.2, < 2.0)
+      cocoapods-downloader (>= 1.4.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-stats (>= 1.0.0, < 2.0)
       cocoapods-trunk (>= 1.4.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
       fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.6.6)
+      molinillo (~> 0.8.0)
       nap (~> 1.0)
-      ruby-macho (~> 1.4)
-      xcodeproj (>= 1.14.0, < 2.0)
-    cocoapods-core (1.9.3)
-      activesupport (>= 4.0.2, < 6)
+      ruby-macho (>= 1.0, < 3.0)
+      xcodeproj (>= 1.21.0, < 2.0)
+    cocoapods-core (1.11.3)
+      activesupport (>= 5.0, < 7)
+      addressable (~> 2.8)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
       netrc (~> 0.11)
+      public_suffix (~> 4.0)
       typhoeus (~> 1.0)
-    cocoapods-deintegrate (1.0.4)
-    cocoapods-downloader (1.4.0)
+    cocoapods-deintegrate (1.0.5)
+    cocoapods-downloader (1.6.3)
     cocoapods-plugins (1.0.0)
       nap
-    cocoapods-search (1.0.0)
-    cocoapods-stats (1.1.0)
-    cocoapods-trunk (1.5.0)
+    cocoapods-search (1.0.1)
+    cocoapods-trunk (1.6.0)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     coderay (1.1.3)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.4.4)
     escape (0.0.4)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
-    ffi (1.13.1)
+    ethon (0.16.0)
+      ffi (>= 1.15.0)
+    ffi (1.15.5)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
-    i18n (0.9.5)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json (2.3.1)
+    json (2.6.3)
     method_source (1.0.0)
-    minitest (5.14.2)
-    molinillo (0.6.6)
+    minitest (5.18.0)
+    molinillo (0.8.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
@@ -82,6 +86,8 @@ GEM
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
+    public_suffix (4.0.7)
+    rexml (3.2.5)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -97,19 +103,20 @@ GEM
     rspec-support (3.9.3)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    ruby-macho (1.4.0)
+    ruby-macho (2.5.1)
     slop (3.6.0)
-    thread_safe (0.3.6)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    xcodeproj (1.18.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    xcodeproj (1.22.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   ruby

cocoapods-mangle.gemspec

@@ -17,5 +17,5 @@ Gem::Specification.new do |spec|
   spec.test_files       = Dir['spec/**/*.rb']
   spec.extra_rdoc_files = ['README.md', 'CHANGELOG.md']
   spec.require_paths    = ['lib']
-  spec.add_dependency 'cocoapods', '~> 1.0'
+  spec.add_dependency 'cocoapods', '~> 1.11.3'
 end

lib/cocoapods_mangle/defines.rb

@@ -121,22 +121,28 @@ def self.prefix_selectors(prefix, selectors)
     def self.swift_symbol?(symbol)
       # Swift binaries have many symbols starting with $s_ that should be excluded
       # e.g. '0000000000000258 S _$s9ManglePod9SomeClassCMF'
-      symbol[/ _\$s/] ||
+      symbol[/\$s/] ||
         # Internal Swift symbols starting with __swift or ___swift such as should not be mangled
         # e.g. '00000000000050ac S ___swift_reflection_version' 
         symbol[/ __(_)?swift/] ||
-        # Swift symbols starting with _symbolic should be ignored
-        # e.g. '0000000000000248 S _symbolic _____ 9ManglePod9SomeClassC'
-        symbol[/ _symbolic/] ||
+        # Swift symbols starting with symbolic should be ignored
+        # e.g. '0000000000000248 S symbolic _____ 9ManglePod9SomeClassC'
+        symbol[/symbolic /] ||
         # Swift symbol references to Objective-C symbols should not be mangled
         # e.g. '00000000000108ca S _associated conformance So26SCNetworkReachabilityFlagsVs10SetAlgebraSCSQ'
         symbol[/associated conformance/] ||
         # _globalinit symbols should be skipped
         # e.g. 0000000000000000 T _globalinit_33_A313450CFC1FC3D0CBEF4411412DB9E8_func0
-        symbol[/ _globalinit/] ||
+        symbol[/ globalinit/] ||
         # Swift classes inheriting from Objective-C classes should not be mangled
         # e.g. '0000000000000290 S _OBJC_CLASS_$__TtC9ManglePod19SomeFoundationClass'
-        symbol[/_OBJC_CLASS_\$__/]
+        symbol[/_OBJC_CLASS_\$__/] ||
+        # Swift symbols starting with ____ should be ignored
+        # e.g. ' ____ 6Lottie15AnimatedControlCC'
+        symbol[/____ /] ||
+        # _PROTOCOL symbols should be skipped
+        # e.g. 0000000000000000 _PROTOCOL_METHOD_TYPES_CAAction
+        symbol[/_PROTOCOL/]
     end
 
     def self.run_nm(binaries, flags)

lib/cocoapods_mangle/gem_version.rb

@@ -1,4 +1,4 @@
 module CocoapodsMangle
   NAME = 'cocoapods-mangle'
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

spec/integration/integration_spec.rb

@@ -52,14 +52,14 @@ def build_sample
           plugin 'cocoapods-mangle'
           target 'Mangle Integration' do
             pod 'ManglePod', path: '../pod'
-            pod 'Alamofire', '5.2.2'
+            pod 'lottie-ios'
           end
         PODFILE
       end
       let(:expected_defines) do
         %w[
           PodsDummy_ManglePod=Mangle_Integration_PodsDummy_ManglePod
-          PodsDummy_Alamofire=Mangle_Integration_PodsDummy_Alamofire
+          PodsDummy_lottie_ios=Mangle_Integration_PodsDummy_lottie_ios
         ]
       end