cocoapods-catalyst-support 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d24bad78aba13983b06496e6ec0722803427d82c285232d614241411813a5480
-  data.tar.gz: 7d2c06169cff54b0d83023afaa37b30a6b6ab3c96df58e4211820b784baf5eea
+  metadata.gz: 1cb32cd2b15a408e4ba0ae33f5d5fe8c96050826cb88d14519d56f3e8a00826d
+  data.tar.gz: 84341a6cb844b3a85e8dec41111468f0e1d65df0b003b251f8b5c41156bf6844
 SHA512:
-  metadata.gz: 07f7d8eb27b4815f99408744ab500bef4f42d5ac4c967ff1a4a3026214c5a379cda4e24e440850790f02a10094e46be6704c1b258be4fd83fd63436c431a9dbd
-  data.tar.gz: '08ddd9ef1734036a728c5aa5739ad42b008ddb18f6a0377970fc7c57516a4c36a95180d85b75f269c9b98f4cb0c93de408b6d9fa00b4eb07843358526a385fbb'
+  metadata.gz: eaf8c09dbd7981169d39453db4485ae7011b502e66b61321ee03025ad632aea900e02dd2549b5baa66a00903a16c42fd5f9c030eb33fe842d8ce62e42f1e38f7
+  data.tar.gz: 64868bb8dd26932812c7653d55e429b602d24e40c5838b265b4721f0dc158b587301849c1d8acb5c0fe77aa5dc89cfbb6d54c02d3a0668449c8100eb3b4feb40

data/lib/cocoapods-catalyst-support/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsCatalystSupport
-  VERSION = "0.1.2"
+  VERSION = "0.2.1"
 end

data/lib/cocoapods-catalyst-support/pod/installer.rb

@@ -36,7 +36,7 @@ module Pod
       pod_names_to_keep = recursive_dependencies(pod_names_to_keep)
       pod_targets_to_keep = pod_targets.filter do |pod| pod_names_to_keep.include? pod.module_name end       # PodTarget
 
-      pod_names_to_remove = recursive_dependencies(pod_names_to_remove).filter do |name| !pod_names_to_keep.include? name end
+      pod_names_to_remove = recursive_dependencies(pod_names_to_remove).filter do |name| !pod_names_to_keep.include? name end.to_set.to_a
       pod_targets_to_remove = pod_targets.filter do |pod| pod_names_to_remove.include? pod.module_name end   # PodTarget
 
       loggs "\n#### Unsupported Libraries ####\n#{pod_names_to_remove}\n"
@@ -53,9 +53,7 @@ module Pod
       dependencies_to_remove = dependencies_to_remove + targets_to_remove.flat_map do |target| target.to_dependency end + pod_targets_to_remove.flat_map do |pod| pod.vendor_products + pod.frameworks end
       dependencies_to_remove = dependencies_to_remove.filter do |d|  !dependencies_to_keep.include? d end
 
-      ###### CATALYST NOT SUPPORTED LINKS ###### 
-      unsupported_links = dependencies_to_remove.map do |d| d.link end.to_set.to_a
-      
+      ###### CATALYST NOT SUPPORTED LINKS ######       
       loggs "\n#### Unsupported dependencies ####\n"
       loggs "#{dependencies_to_remove.map do |d| d.name end.to_set.to_a }\n\n"
 
@@ -71,7 +69,7 @@ module Pod
 
       ###### OTHER LINKER FLAGS -> to iphone* ###### 
       loggs "#### Flagging unsupported libraries ####"
-      pods_project.targets.filter do |target| target.platform_name == OSPlatform.ios.name end.each do |target| target.flag_libraries unsupported_links, keep_platform end
+      pods_project.targets.filter do |target| target.platform_name == OSPlatform.ios.name end.each do |target| target.flag_libraries dependencies_to_remove.to_set.to_a, keep_platform end
 
       ###### BUILD_PHASES AND DEPENDENCIES -> PLATFORM_FILTER 'ios' ###### 
       loggs "\n#### Filtering build phases ####"

data/lib/cocoapods-catalyst-support/xcodeproj/abstract_target.rb

@@ -14,27 +14,73 @@ module Xcodeproj::Project::Object
   
     ###### STEP 3 ######
     # If any unsupported library, then flag as platform-dependant for every build configuration
-    def flag_libraries libraries, platform
+    def flag_libraries dependencies, platform
       loggs "\tTarget: #{name}"
-      build_configurations.filter do |config| !config.base_configuration_reference.nil? 
+
+      build_configurations.filter do |config| 
+        !config.base_configuration_reference.nil? 
       end.each do |config|
         loggs "\t\tScheme: #{config.name}"
         xcconfig_path = config.base_configuration_reference.real_path
         xcconfig = File.read(xcconfig_path)
-  
+
+        other_ldflags = xcconfig.filter_lines do |line| line.include? 'OTHER_LDFLAGS = ' end.first || ''
+        header_search_paths = xcconfig.filter_lines do |line| line.include? 'HEADER_SEARCH_PATHS = ' end.first  || ''
+        framework_search_paths = xcconfig.filter_lines do |line| line.include? 'FRAMEWORK_SEARCH_PATHS = ' end.first  || ''
+        other_swift_flags = xcconfig.filter_lines do |line| line.include? 'OTHER_SWIFT_FLAGS = ' end.first || ''
+        
+        new_other_ldflags = "OTHER_LDFLAGS[sdk=#{platform.sdk}] = $(inherited) -ObjC"
+        new_header_search_paths = "HEADER_SEARCH_PATHS[sdk=#{platform.sdk}] = $(inherited)"
+        new_framework_search_paths = "FRAMEWORK_SEARCH_PATHS[sdk=#{platform.sdk}] = $(inherited)"
+        new_other_swift_flags = "OTHER_SWIFT_FLAGS[sdk=#{platform.sdk}] = $(inherited) -D COCOAPODS"
+        new_xcconfig = xcconfig.gsub!(other_ldflags, '').gsub!(header_search_paths, '').gsub!(other_swift_flags, '').gsub!(framework_search_paths, '')
+
         changed = false
-        libraries.each do |framework|
-          if xcconfig.include? framework
-            xcconfig.gsub!(framework, '')
-            unless xcconfig.include? "OTHER_LDFLAGS[sdk=#{platform.sdk}]"
-              changed = true
-              xcconfig += "\nOTHER_LDFLAGS[sdk=#{platform.sdk}] = $(inherited) -ObjC "
+        dependencies.each do |dependency|
+          if other_ldflags.include? dependency.link
+            other_ldflags.gsub! dependency.link, ''
+            changed = true
+            new_other_ldflags += " #{dependency.link}"
+          end
+          
+          regex = /(?<=[\s])([\"]*[\S]*#{Regexp.escape(dependency.name)}[\S]*[\"]*)(?=[\s]?)/
+          if header_search_paths.match? regex
+            to_replace = header_search_paths.scan(regex).flat_map do |m| m end.filter do |m| !m.nil? && !m.empty? end.each do |to_replace|
+              header_search_paths.gsub! to_replace, ''
+              new_header_search_paths += " #{to_replace}"
+            end
+            changed = true
+          end
+
+          regex = /(?<=[\s])([\"][\S]*#{Regexp.escape(dependency.name)}[\S]*\")(?=[\s]?)/
+          if framework_search_paths.match? regex
+            to_replace = framework_search_paths.scan(regex).flat_map do |m| m end.filter do |m| !m.nil? && !m.empty? end.each do |to_replace|
+              framework_search_paths.gsub! to_replace, ''
+              new_framework_search_paths += " #{to_replace}"
             end
-            xcconfig += framework + ' '
+            changed = true
+          end
+
+          regex = /(?<=[\s])(-Xcc -[\S]*#{Regexp.escape(dependency.name)}[\S]*\")(?=[\s]?)/
+          if other_swift_flags.match? regex
+            to_replace = other_swift_flags.scan(regex).flat_map do |m| m end.filter do |m| !m.nil? && !m.empty? end.each do |to_replace|
+              other_swift_flags.gsub! to_replace, ''
+              new_other_swift_flags += " #{to_replace}"
+            end
+            changed = true
           end
         end
   
-        File.open(xcconfig_path, "w") { |file| file << xcconfig }
+        if changed
+          new_xcconfig += "\n#{other_ldflags}\n#{framework_search_paths}\n#{header_search_paths}"
+          new_xcconfig += "\n#{new_other_ldflags}\n#{new_framework_search_paths}\n#{new_header_search_paths}"
+          if !other_swift_flags.empty?
+            new_xcconfig += "\n#{other_swift_flags}\n#{new_other_swift_flags}"
+          end
+          new_xcconfig.gsub! /\n+/, "\n"
+          new_xcconfig.gsub! /[ ]+/, " "
+          File.open(xcconfig_path, "w") { |file| file << new_xcconfig }
+        end
         loggs "\t\t\t#{changed ? "Succeded" : "Nothing to flag"}"
       end
     end
@@ -47,11 +93,9 @@ module Xcodeproj::Project::Object
     # Dependencies contained in Other Linker Flags
     def other_linker_flags_dependencies
       config = build_configurations.filter do |config| not config.base_configuration_reference.nil? end.first
+      return [] if config.nil?
       other_ldflags = config.resolve_build_setting 'OTHER_LDFLAGS'
-      
-      if other_ldflags.nil? 
-        return [] 
-      end
+      return [] if other_ldflags.nil? 
   
       if other_ldflags.class == String
         other_ldflags = other_ldflags.split ' '

data/lib/cocoapods-catalyst-support/xcodeproj/native_target.rb

@@ -44,7 +44,7 @@ module Xcodeproj::Project::Object
         new_snippet = snippet.clone
         should_uninstall = configurations.map do |string| snippet.include? string end.reduce(false) do |total, condition| total = total || condition end
         keys.each do |key|
-          lines_to_replace = snippet.filter_lines do |line| line.include? "#{key}" end.to_set.to_a
+          lines_to_replace = snippet.filter_lines do |line| line.match "\/#{key}" end.to_set.to_a
           unless lines_to_replace.empty?
             changed = true
             lines_to_replace.each do |line|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-catalyst-support
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - fermoya
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2022-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ homepage: https://github.com/fermoya/cocoapods-catalyst-support
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -111,8 +111,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.27
+signing_key:
 specification_version: 4
 summary: Many libraries you may use for iOS won't compile for your macCatalyst App,
   thus, making porting your App to the Mac world more difficult than initially expected.