cocoapods-byte-panglem-beta 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fda9dfbc61ec32bf412f10f36a7bb5cc3effd14ca177dcc2d5fec9945873f4d9
-  data.tar.gz: 28a9ddaef15ff49c04cef432212f003b7e421178c65d495319063dcc61918541
+  metadata.gz: 8aa1be8bb86023e285512b86b90b95139338f2361cec0fbd43ad4148e5cd8340
+  data.tar.gz: 0d6cf13cfb6530cee7dbe61d4b14db595cab8659c5ed3786adcf3c1db07334a4
 SHA512:
-  metadata.gz: 37ee9e27276cb8ea1e8e0149748f20763529bd2f560ddc62ddb198ca114ae8e9e0fc27ecec55a4a8f547cddfdc6b02ccd195b2c5397755daae64b4354d5f27c3
-  data.tar.gz: 92679a2da95280dcbe0bae11a7fdc8142820919414fcf96aa36cadf8df6c2044376c1d921342a43a3ca637ff5ecc07d47d003b914aa3531a3598c6ad72e7b099
+  metadata.gz: 99571044b39a588e4d0714cdc3f9c4c43189399b00afb92712c3f4d55a884058e8d824674f07645fcf352c55e8dddee99b71a049a7ced2a65874f2a83cfc6db4
+  data.tar.gz: cc0dc9d7392e8ed8c568b5522d4527bc972909e325ad653ad58b4eb141485974034ae8c80dfc94f35ff544e33e1928795fd74ae8dd78234ecef84541e95e42d9

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'cocoapods'
+  gem 'cocoapods',"1.13.0"
 
   gem 'mocha'
   gem 'bacon'

data/lib/cocoapods-byte-panglem-beta/analyzer.rb

@@ -95,9 +95,9 @@ module PM
         } if pm_spec
       end
       specs.map do |spec|
-        if PM::MapRelations.is_sdk?(spec.spec.name)
+        if PM::MapRelations.is_sdk?(Pod::Specification.root_name(spec.spec.name))
           sdk_spec = spec
-        elsif  PM::MapRelations.is_adapter?(spec.spec.name)
+        elsif  PM::MapRelations.is_adapter?(Pod::Specification.root_name(spec.spec.name))
           map = {}
           map["adapter"] = PM::MapRelations.get_adapter_from_adn_abbreviation(spec.spec.name)
           map["adapter_version"] = spec.spec.version.version
@@ -130,6 +130,7 @@ module PM
           }
 
           if result.is_rely_update
+
             specs.delete_if{|spec|
               Pod::Specification.root_name(spec.spec.name) == result.rely_name && spec.spec.version.version == result.rely_original_version
             }
@@ -139,7 +140,7 @@ module PM
           end
           specs.sort_by!{|spec| spec.spec.name}
           is_update_finish  = true
-          request_track result.sdk_original_version, result.sdk_target_version, result.sdk_target_version, response_data["code"], response_data["message"]
+          # request_track result.sdk_original_version, result.sdk_target_version, result.sdk_target_version, response_data["code"], response_data["message"]
 
         else
           wish_info = {"no_auto_update"=>true,"timestamp" =>Time.now.to_i}

data/lib/cocoapods-byte-panglem-beta/gem_version.rb

@@ -2,7 +2,7 @@
 ##SPDX-License-Identifier: MIT
 
 module CocoapodsBytePanglem
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
   class Version
     def self.version
       VERSION

data/lib/cocoapods-byte-panglem-beta/panglem.rb

@@ -66,6 +66,40 @@ end
 
 class Pod::Installer::Analyzer
 
+  alias_method :original_dependencies_for_specs, :dependencies_for_specs
+  def dependencies_for_specs(specs, platform, all_specs)
+    dependent_specs = {
+      :debug => Set.new,
+      :release => Set.new,
+    }
+
+    if !specs.empty? && !all_specs.empty?
+      specs.each do |s|
+        s.dependencies(platform).each do |dep|
+          temp_name =  dep.name
+          if !temp_name.include?("Ads-Global/")
+            all_specs[dep.name].each do |spec|
+              if spec.non_library_specification?
+                if s.test_specification? && spec.name == s.consumer(platform).app_host_name && spec.app_specification?
+                  # This needs to be handled separately, since we _don't_ want to treat this as a "normal" dependency
+                  next
+                end
+                raise Informative, "`#{s}` depends upon `#{spec}`, which is a `#{spec.spec_type}` spec."
+              end
+
+              dependent_specs.each do |config, set|
+                next unless s.dependency_whitelisted_for_configuration?(dep, config)
+                set << spec
+              end
+            end
+          end
+        end
+      end
+    end
+
+    Hash[dependent_specs.map { |k, v| [k, (v - specs).group_by(&:root)] }].freeze
+  end
+
   alias_method :original_resolve_dependencies, :resolve_dependencies
   def resolve_dependencies(locked_dependencies)
     resolver_specs_by_target = original_resolve_dependencies(locked_dependencies)
@@ -78,7 +112,6 @@ class Pod::Installer::Analyzer
           #   PM::Analyzer.delete_invalid_adapters target, specs
           # end if PM::Recorder.instance.get_global_note.auto_load
 
-
           if PM::Recorder.instance.is_release
             Pod::UserInterface.section "[cocoapods-byte-panglem-beta][info] start trying to update the sdk version (when is_release is yes) " do
               PM::Analyzer.resolve_release_target target, specs

data/lib/cocoapods-byte-panglem-beta/recorder.rb

@@ -44,11 +44,19 @@ module Pod
     def get_rely_version
       hash = @attributes_hash
       subs = @subspecs
-      subs
+      name = hash["name"]
+      ## 聚合拿的是adsglobal的subspec
+      if name.include?("Dep_Accurate") or name.include?("Dep_Compatible")
+        parent = @parent
+        version = parent.get_rely_version
+        return version
+      end
       dep_accurate_sperc = @subspecs.select do |spec|
         spec.name.include?("/Dep_Accurate")
       end.first
-      dep_accurate_sperc.dependencies.first.get_requirment
+      version = dep_accurate_sperc.dependencies.first.get_requirment
+      version
+
     end
   end
 
@@ -436,7 +444,7 @@ module PM
         Pod::Specification.root_name(spec.name) == sdk_name && spec.version.version == target_sdk_version
       end
       if target_sdk_root_spec == nil
-        raise "[cocoapods-byte-panglem][error] pangle sdk version:#{target_sdk_version} not found, please try use `pod install --repo-update`"
+        raise "[cocoapods-byte-panglem-beta][error] pangle sdk(beta) version:#{target_sdk_version} not found, please try use `pod install --repo-update`"
       end
       if target_sdk_root_spec.version.version != original_sdk_spec.spec.version.version
 
@@ -446,6 +454,7 @@ module PM
         result.sdk_target_version = target_sdk_root_spec.version.version
         PM::Recorder.instance.sdk_original_version = result.sdk_original_version
         PM::Recorder.instance.sdk_target_version = result.sdk_target_version
+        ss_temp =  original_sdk_spec.spec
         target_rely_version = target_sdk_root_spec.get_rely_version
         original_rely_version = original_sdk_spec.spec.get_rely_version
         # target_rely_version = "0.2.0.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-byte-panglem-beta
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - zhangtianhao.1230@bytedance.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-19 00:00:00.000000000 Z
+date: 2024-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods