Merge pull request #262 from tungleduyxyz/issue_254

Issue 254 Upgrade Ruby version
killbill · Apr 10, 2024 · df29dd5 · df29dd5
2 parents 8ab468d + 391253e
commit df29dd5
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 12 deletions.
diff --git a/ansible/library/killbill_diagnostics b/ansible/library/killbill_diagnostics
@@ -4,7 +4,6 @@
 require 'json'
 require 'logger'
 require 'pathname'
-require 'set'
 require 'uri'
 require 'yaml'
 

diff --git a/ansible/library/killbill_facts b/ansible/library/killbill_facts
@@ -4,7 +4,6 @@
 require 'json'
 require 'logger'
 require 'pathname'
-require 'set'
 require 'yaml'
 
 data = {}

diff --git a/ansible/library/killbill_migrations b/ansible/library/killbill_migrations
@@ -4,7 +4,6 @@
 require 'json'
 require 'logger'
 require 'pathname'
-require 'set'
 require 'yaml'
 
 data = {}

diff --git a/kpm/kpm.gemspec b/kpm/kpm.gemspec
@@ -45,7 +45,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'killbill-client', '~> 3.2'
   s.add_dependency 'rubyzip', '>= 1.3', '< 2.4'
   s.add_dependency 'thor', '>= 0.19.1', '< 1.3.0'
-  s.add_dependency 'sorted_set', '~> 1.0', '>= 1.0.3'
 
   s.add_development_dependency 'gem-release', '~> 2.2'
   s.add_development_dependency 'rake', '~> 13.0'

diff --git a/kpm/lib/kpm/kaui_artifact.rb b/kpm/lib/kpm/kaui_artifact.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'rexml/document'
-require 'set'
 
 module KPM
   class KauiArtifact < BaseArtifact
@@ -11,9 +10,9 @@ def versions(overrides = {}, ssl_verify = true)
 
         coordinates = KPM::Coordinates.build_coordinates(coordinate_map)
         response    = REXML::Document.new nexus_remote(overrides, ssl_verify).search_for_artifacts(coordinates)
-        versions    = SortedSet.new
+        versions    = []
         response.elements.each('searchNGResponse/data/artifact/version') { |element| versions << element.text }
-        versions
+        versions.sort!.uniq
       end
     end
   end

diff --git a/kpm/lib/kpm/killbill_plugin_artifact.rb b/kpm/lib/kpm/killbill_plugin_artifact.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'rexml/document'
-require 'set'
 
 module KPM
   class KillbillPluginArtifact < BaseArtifact
@@ -20,8 +19,9 @@ def versions(overrides = {}, ssl_verify = true)
           response = REXML::Document.new nexus.search_for_artifacts(type_and_group_id[1])
           response.elements.each('searchNGResponse/data/artifact') do |element|
             artifact_id = element.elements['artifactId'].text
-            plugins[type_and_group_id[0]][artifact_id] ||= SortedSet.new
+            plugins[type_and_group_id[0]][artifact_id] ||= []
             plugins[type_and_group_id[0]][artifact_id] << element.elements['version'].text
+            plugins[type_and_group_id[0]][artifact_id].sort!.uniq!
           end
         end
 

diff --git a/kpm/lib/kpm/killbill_server_artifact.rb b/kpm/lib/kpm/killbill_server_artifact.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'rexml/document'
-require 'set'
 
 module KPM
   class KillbillServerArtifact < BaseArtifact
@@ -10,9 +9,9 @@ def versions(artifact_id, packaging = KPM::BaseArtifact::KILLBILL_PACKAGING, cla
         coordinate_map = { group_id: KPM::BaseArtifact::KILLBILL_GROUP_ID, artifact_id: artifact_id, packaging: packaging, classifier: classifier }
         coordinates = KPM::Coordinates.build_coordinates(coordinate_map)
         response    = REXML::Document.new nexus_remote(overrides, ssl_verify).search_for_artifacts(coordinates)
-        versions    = SortedSet.new
+        versions    = []
         response.elements.each('searchNGResponse/data/artifact/version') { |element| versions << element.text }
-        versions
+        versions.sort!.uniq
       end
 
       def info(version = 'LATEST', sha1_file = nil, force_download = false, verify_sha1 = true, overrides = {}, ssl_verify = true)