Merge pull request #374 from envato/pv/sorted-set

Use sorted_set gem instead of relying on it existing in ruby's `set` library

Author: petervandoros

CHANGELOG.md

@@ -10,7 +10,16 @@ The format is based on [Keep a Changelog], and this project adheres to
 
 ## [Unreleased]
 
-[Unreleased]: https://github.com/envato/stack_master/compare/v2.13.3...HEAD
+[Unreleased]: https://github.com/envato/stack_master/compare/v2.13.4...HEAD
+
+## [2.13.4] - 2023-08-02
+
+### Fixed
+
+- Resolve SparkleFormation template error caused by `SortedSet` class being removed from the `set` library in Ruby 3 ([#374]).
+
+[2.13.3]: https://github.com/envato/stack_master/compare/v2.13.3...v2.13.4
+[#374]: https://github.com/envato/stack_master/pull/374
 
 ## [2.13.3] - 2023-02-01
 

Gemfile

@@ -2,9 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in stack_master.gemspec
 gemspec
-
-if RUBY_VERSION >= '3.0.0'
-  # SparkleFormation has an issue with Ruby 3 and the SortedSet class.
-  # Remove after merged: https://github.com/sparkleformation/sparkle_formation/pull/271
-  gem 'faux_sorted_set', require: false
-end

lib/stack_master/version.rb

@@ -1,3 +1,3 @@
 module StackMaster
-  VERSION = "2.13.3"
+  VERSION = "2.13.4"
 end

stack_master.gemspec

@@ -44,6 +44,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "aws-sdk-ssm", "~> 1"
   spec.add_dependency "aws-sdk-ecr", "~> 1"
   spec.add_dependency "aws-sdk-iam", "~> 1"
+  spec.add_dependency "sorted_set" # remove once new version of sparkle_formation released (> v3.0.40). See https://github.com/sparkleformation/sparkle_formation/pull/271.
   spec.add_dependency "diffy"
   spec.add_dependency "erubis"
   spec.add_dependency "rainbow"