lib/cocoapods-fy-bin/native/resolver.rb in cocoapods-fy-bin-0.2.6 vs lib/cocoapods-fy-bin/native/resolver.rb in cocoapods-fy-bin-0.2.7

@@ -64,18 +64,22 @@
         return true if podfile.allow_prerelease?
 
         old_valid_possibility_version_for_root_name?(requirement, activated, spec)
       end
 
-      # alias old_requirement_satisfied_by? requirement_satisfied_by?
-      # def requirement_satisfied_by?(requirement, activated, spec)
-      #   podfile = Pod::Config.instance.podfile
-      #   # 如果没有使用全局二进制字段 则进入局部二进制判断
-      #   if !podfile.use_binaries_selector.nil? && !podfile.use_binaries_selector.call(spec) && spec.spec_source.url == @sources_manager.binary_source.url && !podfile.use_binaries?
-      #     return false
-      #   end
-      #   old_requirement_satisfied_by?(requirement, activated, spec)
-      # end
+      alias old_requirement_satisfied_by? requirement_satisfied_by?
+      def requirement_satisfied_by?(requirement, activated, spec)
+        podfile = Pod::Config.instance.podfile
+        # 如果没有使用全局二进制字段 则进入局部二进制判断 删除framework文件夹 二进制源码之间切换时候用到
+        begin
+          if !podfile.use_binaries_selector.nil? && !podfile.use_binaries_selector.call(spec) && spec.spec_source.url == @sources_manager.binary_source.url && !podfile.use_binaries?
+            return false
+          end
+        rescue
+          puts spec
+        end
+        old_requirement_satisfied_by?(requirement, activated, spec)
+      end
 
     elsif Pod.match_version?('~> 1.4')
       def requirement_satisfied_by?(requirement, activated, spec)
         version = spec.version
         return false unless requirement.requirement.satisfied_by?(version)