openhab-scripting 5.45.0 → 5.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a6ff4c8c427bbcf314fb2226da8fcc4791ee9395394f404e88567a4417e1b4f
-  data.tar.gz: 254980e2b97d5cd3f3c44990ed5e1cd84e0c31d2a8a9490146d317e0c2f3d9a9
+  metadata.gz: e6351743424c867636542a49ecdb2ef2eca63824d2009ae517763d256f7fab20
+  data.tar.gz: 72d778a25df32f555763c38539c1bb7d34ae2f24c70120d069504d18e036eaac
 SHA512:
-  metadata.gz: 01b946e0402acf49358f2de450960fd716f654c668bd40f419a5c768672d2bd7272fa89d5bef1c0e7f61f57968156c2a9d9b2a47b01b0e6065432962df568a12
-  data.tar.gz: 6ef1bc5b35034eac211a4024586e04d27c8aeeba8f2e7d21ab6999ba32b6d72c567a29c81010b559685af51d2bd69d461ea32726149c044fe090a8aa757fd09f
+  metadata.gz: a6d35c4a0489003faeabf001e3215bb8f4e9e805cdffb69ba0b10d9261127f08f07f1c0e61cc072ff849eab6dc70c88d9b11003c9f830c53e93ff92ce5ae03ce
+  data.tar.gz: 0be0d9f6149485518eabb0b4c08bb4a73ce7fdf7c9d231e9c9ee590f132a74f647dcbb4c3e3d1087dd2be10a1f487736e45214af2037e2093f019de3d3aeadda

data/lib/openhab/core/actions/notification.rb

@@ -91,22 +91,19 @@ module OpenHAB
             tag ||= severity
             args.push(msg.to_s, icon&.to_s, tag&.to_s)
 
-            # @deprecated OH 4.1
-            if Core.version >= Core::V4_2
-              buttons ||= []
-              buttons = buttons.map { |button_title, action| "#{button_title}=#{action}" } if buttons.is_a?(Hash)
-              raise ArgumentError, "buttons must contain (0..3) elements." unless (0..3).cover?(buttons.size)
+            buttons ||= []
+            buttons = buttons.map { |button_title, action| "#{button_title}=#{action}" } if buttons.is_a?(Hash)
+            raise ArgumentError, "buttons must contain (0..3) elements." unless (0..3).cover?(buttons.size)
 
-              attachment = "item:#{attachment.name}" if attachment.is_a?(Item) && attachment.image_item?
+            attachment = "item:#{attachment.name}" if attachment.is_a?(Item) && attachment.image_item?
 
-              args.push(title&.to_s,
-                        id&.to_s,
-                        on_click&.to_s,
-                        attachment&.to_s,
-                        buttons[0]&.to_s,
-                        buttons[1]&.to_s,
-                        buttons[2]&.to_s)
-            end
+            args.push(title&.to_s,
+                      id&.to_s,
+                      on_click&.to_s,
+                      attachment&.to_s,
+                      buttons[0]&.to_s,
+                      buttons[1]&.to_s,
+                      buttons[2]&.to_s)
 
             NotificationAction.__send__(*args)
           end

data/lib/openhab/core/actions.rb

@@ -53,9 +53,9 @@ module OpenHAB
       # @!method notify(msg, email: nil, icon: nil, tag: nil, severity: nil, id: nil, title: nil, on_click: nil, attachment: nil, buttons: nil)
       # @deprecated Use {Notification.send Notification.send} instead.
       #
-      def notify(*args, **kwargs)
+      def notify(*, **)
         logger.warn("`notify` method is deprecated. Use `Notification.send` instead.")
-        Notification.send(*args, **kwargs)
+        Notification.send(*, **)
       end
     end
   end

data/lib/openhab/core/entity_lookup.rb

@@ -137,9 +137,9 @@ module OpenHAB
       end
 
       # @!visibility private
-      def instance_eval_with_dummy_items(&block)
+      def instance_eval_with_dummy_items(&)
         DSL::ThreadLocal.thread_local(openhab_create_dummy_items: self.class.create_dummy_items?) do
-          instance_eval(&block)
+          instance_eval(&)
         end
       end
 

data/lib/openhab/core/events/item_state_changed_event.rb

@@ -82,9 +82,8 @@ module OpenHAB
         def inspect
           s = "#<OpenHAB::Core::Events::ItemStateChangedEvent item=#{item_name} " \
               "state=#{item_state.inspect} was=#{old_item_state.inspect}"
-          # @deprecated OH4.3 remove respond_to? checks in the next two lines when dropping OH 4.3
-          s += " last_state_update=#{last_state_update}" if respond_to?(:last_state_update) && last_state_update
-          s += " last_state_change=#{last_state_change}" if respond_to?(:last_state_change) && last_state_change
+          s += " last_state_update=#{last_state_update}" if last_state_update
+          s += " last_state_change=#{last_state_change}" if last_state_change
           s += " source=#{source.inspect}" if source
           "#{s}>"
         end

data/lib/openhab/core/items/persistence.rb

@@ -670,15 +670,6 @@ module OpenHAB
         #   @since openHAB 4.2
         #
         def persist(*args)
-          # @deprecated OH 4.1 this if block content can be removed when dropping OH 4.1 support
-          if Core.version < Core::V4_2
-            raise ArgumentError, "wrong number of arguments (given #{args.size}, expected 0..1)" if args.size > 1
-
-            service = args.last || persistence_service
-            Actions::PersistenceExtensions.persist(self, service&.to_s)
-            return
-          end
-
           first_arg = args.first
           if first_arg.is_a?(TimeSeries)
             if args.size > 2
@@ -752,9 +743,6 @@ module OpenHAB
         #   @since openHAB 4.2
 
         %i[last_update next_update last_change next_change].each do |method|
-          # @deprecated OH 4.1 remove this guard when dropping OH 4.1
-          next unless Actions::PersistenceExtensions.respond_to?(method)
-
           class_eval <<~RUBY, __FILE__, __LINE__ + 1
             def #{method}(service = nil)                            # def last_update(service = nil)
               service ||= persistence_service                       #   service ||= persistence_service
@@ -794,9 +782,6 @@ module OpenHAB
         #   @since openHAB 4.2
 
         %i[previous_state next_state].each do |method|
-          # @deprecated OH 4.1 remove this guard when dropping OH 4.1
-          next unless Actions::PersistenceExtensions.respond_to?(method)
-
           class_eval <<~RUBY, __FILE__, __LINE__ + 1
             def #{method}(service = nil, skip_equal: false)       # def previous_state(service = nil, skip_equal: false)
               service ||= persistence_service                     #   service ||= persistence_service
@@ -819,10 +804,7 @@ module OpenHAB
 
             if riemann_param
               riemann_param = ", riemann_type: nil"
-              # @deprecated OH4.3 remove if guard when dropping OH 4.3
-              if Actions::PersistenceExtensions.const_defined?(:RiemannType)
-                riemann_arg = "to_riemann_type(riemann_type),"
-              end
+              riemann_arg = "to_riemann_type(riemann_type),"
             end
 
             class_eval <<~RUBY, __FILE__, __LINE__ + 1
@@ -846,17 +828,11 @@ module OpenHAB
             riemann_arg = nil
 
             def_persistence_method("#{method}_since#{suffix}", quantify:, riemann_param:)
-            # @deprecated OH 4.1 remove if guard, keeping the content, when dropping OH 4.1
-            if OpenHAB::Core.version >= OpenHAB::Core::V4_2
-              def_persistence_method("#{method}_until#{suffix}", quantify:, riemann_param:)
-            end
+            def_persistence_method("#{method}_until#{suffix}", quantify:, riemann_param:)
 
             if riemann_param
               riemann_param = ", riemann_type: nil"
-              # @deprecated OH4.3 remove if guard when dropping OH 4.3
-              if Actions::PersistenceExtensions.const_defined?(:RiemannType)
-                riemann_arg = "to_riemann_type(riemann_type),"
-              end
+              riemann_arg = "to_riemann_type(riemann_type),"
             end
 
             method = "#{method}_between"
@@ -889,7 +865,7 @@ module OpenHAB
 
         def_persistence_methods(:count_state_changes)
         alias_method :state_changes_since, :count_state_changes_since
-        alias_method :state_changes_until, :count_state_changes_until if OpenHAB::Core.version >= OpenHAB::Core::V4_2
+        alias_method :state_changes_until, :count_state_changes_until
         alias_method :state_changes_between, :count_state_changes_between
 
         def_persistence_methods(:delta, quantify: true)
@@ -900,27 +876,21 @@ module OpenHAB
 
         def_persistence_methods(:get_all_states, quantify: true)
         alias_method :all_states_since, :get_all_states_since
-        alias_method :all_states_until, :get_all_states_until if OpenHAB::Core.version >= OpenHAB::Core::V4_2
+        alias_method :all_states_until, :get_all_states_until
         alias_method :all_states_between, :get_all_states_between
 
         def_persistence_methods(:maximum, quantify: true)
         def_persistence_methods(:minimum, quantify: true)
-        def_persistence_methods(:median, quantify: true) if OpenHAB::Core.version >= OpenHAB::Core::V4_3
-        # @deprecated OH4.3 remove if guard when dropping OH 4.3
-        if Actions::PersistenceExtensions.const_defined?(:RiemannType)
-          # riemann_sum methods were added in OH 5.0 which already quantifies the result in core
-          def_persistence_methods(:riemann_sum, riemann_param: true)
-        end
+        def_persistence_methods(:median, quantify: true)
+        def_persistence_methods(:riemann_sum, riemann_param: true) # already quantified in core
         def_persistence_methods(:sum, quantify: true)
         def_persistence_methods(:updated?)
         def_persistence_methods(:variance, quantify: true, riemann_param: true)
 
-        if OpenHAB::Core.version >= OpenHAB::Core::V4_2
-          def_persistence_method(:persisted_state) # already quantified in core
+        def_persistence_method(:persisted_state) # already quantified in core
 
-          def_persistence_methods(:evolution_rate)
-          def_persistence_methods(:remove_all_states)
-        end
+        def_persistence_methods(:evolution_rate)
+        def_persistence_methods(:remove_all_states)
 
         # @deprecated OH 4.2 this method is deprecated in OH 4.2 and may be removed in a future version
         def evolution_rate(start, finish_or_service = nil, service = nil)

data/lib/openhab/core/items/registry.rb

@@ -52,9 +52,9 @@ module OpenHAB
         #
         # @see DSL::Items::Builder DSL::Items::Builder for more details and examples
         #
-        def build(preferred_provider = nil, update: true, &block)
+        def build(preferred_provider = nil, update: true, &)
           DSL::Items::BaseBuilderDSL.new(preferred_provider, update:)
-                                    .instance_eval_with_dummy_items(&block)
+                                    .instance_eval_with_dummy_items(&)
         end
 
         #

data/lib/openhab/core/items/semantics/enumerable.rb

@@ -97,16 +97,16 @@ module Enumerable
   # Send a command to every item in the collection
   # @return [self, nil] nil when `ensure` is in effect and all the items were already in the same state,
   #   otherwise self
-  def command(command, **kwargs)
-    self if count { |i| i.command(command, **kwargs) }.positive?
+  def command(command, **)
+    self if count { |i| i.command(command, **) }.positive?
   end
 
   # Send a command to every item in the collection, even when {OpenHAB::DSL.ensure_states! ensure_states!} is in effect.
   # @return [self]
-  def command!(command, **kwargs)
+  def command!(command, **)
     # We cannot alias this to #command above, otherwise it will call
     # DSL::Items::Ensure::Item#command which checks for ensure_states
-    each { |i| i.command!(command, **kwargs) }
+    each { |i| i.command!(command, **) }
     self
   end
 

data/lib/openhab/core/items/semantics.rb

@@ -174,12 +174,6 @@ module OpenHAB
         GroupItem.extend(Forwardable)
         GroupItem.def_delegators :members, :equipments, :locations
 
-        # This is a marker interface for all semantic tag classes.
-        # @interface
-        # @deprecated Since openHAB 4.0, {SemanticTag} is the interface that all tags implement.
-        #   Tags are simple instances, instead of another interface in a hierarchical structure.
-        Tag = org.openhab.core.semantics.Tag
-
         class << self
           # @!visibility private
           def service

data/lib/openhab/core/things/registry.rb

@@ -48,8 +48,8 @@ module OpenHAB
         # @raise [FrozenError] if `update` is true but the existing thing with the same uid
         #   wasn't created by the current provider.
         #
-        def build(preferred_provider = nil, update: true, &block)
-          DSL::Things::Builder.new(preferred_provider, update:).instance_eval(&block)
+        def build(preferred_provider = nil, update: true, &)
+          DSL::Things::Builder.new(preferred_provider, update:).instance_eval(&)
         end
 
         #

data/lib/openhab/core/types/date_time_type.rb

@@ -18,13 +18,7 @@ module OpenHAB
         remove_method :==
 
         extend Forwardable
-
-        # @deprecated OH 4.2 DateTimeType implements Java's Comparable interface in openHAB 4.3
-        if OpenHAB::Core.version >= OpenHAB::Core::V4_3
-          include ComparableType
-        else
-          include Comparable
-        end
+        include ComparableType
 
         class << self
           #
@@ -43,15 +37,8 @@ module OpenHAB
           end
         end
 
-        # @deprecated OH 4.2 Just call zoned_date_time(ZoneId.system_default) in OH 4.3
-        if OpenHAB::Core.version >= OpenHAB::Core::V4_3
-          def to_zoned_date_time(context = nil) # rubocop:disable Lint/UnusedMethodArgument
-            zoned_date_time(ZoneId.system_default)
-          end
-        else
-          def to_zoned_date_time(context = nil) # rubocop:disable Lint/UnusedMethodArgument
-            zoned_date_time
-          end
+        def to_zoned_date_time(context = nil) # rubocop:disable Lint/UnusedMethodArgument
+          zoned_date_time(ZoneId.system_default)
         end
 
         # @!method to_zoned_date_time(context = nil)
@@ -93,7 +80,7 @@ module OpenHAB
           if value.nil?
             super()
             return
-          elsif OpenHAB::Core.version >= OpenHAB::Core::V4_3 && value.respond_to?(:to_instant)
+          elsif value.respond_to?(:to_instant)
             super(value.to_instant)
             return
           elsif value.respond_to?(:to_zoned_date_time)
@@ -122,10 +109,7 @@ module OpenHAB
         def eql?(other)
           return false unless other.instance_of?(self.class)
 
-          # @deprecated OH 4.2 Call compare_to(other).zero? in OH 4.3 to avoid the deprecated getZonedDateTime()
-          return compare_to(other).zero? if OpenHAB::Core.version >= OpenHAB::Core::V4_3
-
-          zoned_date_time.compare_to(other.zoned_date_time).zero?
+          compare_to(other).zero?
         end
 
         #
@@ -141,10 +125,7 @@ module OpenHAB
         def <=>(other)
           logger.trace { "(#{self.class}) #{self} <=> #{other} (#{other.class})" }
           if other.is_a?(self.class)
-            # @deprecated OH 4.2 Call compare_to(other) in OH 4.3 to avoid the deprecated getZonedDateTime()
-            return compare_to(other) if OpenHAB::Core.version >= OpenHAB::Core::V4_3
-
-            zoned_date_time <=> other.zoned_date_time
+            compare_to(other)
           elsif other.respond_to?(:to_time)
             to_time <=> other.to_time
           elsif other.respond_to?(:coerce)
@@ -222,8 +203,7 @@ module OpenHAB
 
         # @!visibility private
         def respond_to_missing?(method, _include_private = false)
-          # @deprecated OH 4.2 Remove version check when dropping OH 4.2
-          return true if OpenHAB::Core.version >= OpenHAB::Core::V4_3 && to_instant.respond_to?(method)
+          return true if to_instant.respond_to?(method)
           return true if zoned_date_time.respond_to?(method)
           return true if ::Time.method_defined?(method.to_sym)
 
@@ -235,11 +215,7 @@ module OpenHAB
         # object representing the same instant
         #
         def method_missing(method, ...)
-          # @deprecated OH 4.2 Remove version check when dropping OH 4.2
-          if OpenHAB::Core.version >= OpenHAB::Core::V4_3 && to_instant.respond_to?(method)
-            return to_instant.send(method, ...)
-          end
-
+          return to_instant.send(method, ...) if to_instant.respond_to?(method)
           return zoned_date_time.send(method, ...) if zoned_date_time.respond_to?(method)
           return to_time.send(method, ...) if ::Time.method_defined?(method.to_sym)
 

data/lib/openhab/core/types/hsb_type.rb

@@ -244,8 +244,8 @@ module OpenHAB
         # @see planckian?
         # @see https://en.wikipedia.org/wiki/Planckian_locus Planckian Locus
         # @since openHAB 4.3
-        def planckian_cct(range: nil, **kwargs)
-          return unless planckian?(**kwargs)
+        def planckian_cct(range: nil, **)
+          return unless planckian?(**)
 
           range = range.range if range.is_a?(NumberItem)
           cct = self.cct

data/lib/openhab/core.rb

@@ -42,7 +42,7 @@ module OpenHAB
       @full_version ||= Gem::Version.new(VERSION).freeze
     end
 
-    raise "`openhab-scripting` requires openHAB >= 4.1.0" unless version >= V4_1
+    raise "`openhab-scripting` requires openHAB >= 5.0.0" unless version >= V5_0
 
     # @return [Integer] Number of seconds to wait between checks for automation manager
     CHECK_DELAY = 10

data/lib/openhab/core_ext/java/list.rb

@@ -354,12 +354,12 @@ module Java::JavaUtil::List # rubocop:disable Style/ClassAndModuleChildren
     result
   end
 
-  def shuffle!(*args)
-    replace(shuffle(*args))
+  def shuffle!(*)
+    replace(shuffle(*))
   end
 
-  def slice(*args)
-    self[*args]
+  def slice(*)
+    self[*]
   end
 
   def slice!(*args)

data/lib/openhab/dsl/items/builder.rb

@@ -95,8 +95,8 @@ module OpenHAB
         # @param (see GroupItemBuilder#initialize)
         # @yieldparam [GroupItemBuilder] builder Item for further customization
         # @return [GroupItem]
-        def group_item(*args, **kwargs, &block)
-          item = GroupItemBuilder.new(*args, provider:, **kwargs)
+        def group_item(*, **, &block)
+          item = GroupItemBuilder.new(*, provider:, **)
           item.instance_eval(&block) if block
           result = provider.add(item)
           item.members.each do |i|
@@ -107,8 +107,8 @@ module OpenHAB
 
         private
 
-        def item(*args, **kwargs, &block)
-          item = ItemBuilder.new(*args, provider:, **kwargs)
+        def item(*, **, &block)
+          item = ItemBuilder.new(*, provider:, **)
           item.instance_eval(&block) if block
           r = provider.add(item)
           return Core::Items::Proxy.new(r) if r.is_a?(Item)
@@ -803,10 +803,10 @@ module OpenHAB
         # @param thing [Core::Things::ThingUID, Core::Things::Thing, String, nil]
         #        A Thing to be used as the base for the channel for any contained items.
         # @param (see ItemBuilder#initialize)
-        def initialize(*args, type: nil, function: nil, thing: nil, **kwargs)
+        def initialize(*, type: nil, function: nil, thing: nil, **)
           raise ArgumentError, "invalid function #{function}" if function && !function.match?(FUNCTION_REGEX)
 
-          super(type, *args, **kwargs)
+          super(type, *, **)
           @function = function
           @members = []
           @thing = thing

data/lib/openhab/dsl/items/timed_command.rb

@@ -149,9 +149,9 @@ module OpenHAB
         #     end
         #   end
         #
-        def command(command, for: nil, on_expire: nil, only_when_ensured: false, **kwargs, &block)
+        def command(command, for: nil, on_expire: nil, only_when_ensured: false, **, &block)
           duration = binding.local_variable_get(:for)
-          return super(command, **kwargs) unless duration
+          return super(command, **) unless duration
 
           on_expire = block if block
 
@@ -159,10 +159,10 @@ module OpenHAB
             on_expire ||= default_on_expire(command)
             if only_when_ensured
               DSL.ensure_states do
-                create_timed_command(command, duration:, on_expire:) if super(command, **kwargs)
+                create_timed_command(command, duration:, on_expire:) if super(command, **)
               end
             else
-              super(command, **kwargs)
+              super(command, **)
               create_timed_command(command, duration:, on_expire:)
             end
           end
@@ -185,7 +185,7 @@ module OpenHAB
                   timed_command_details.timer.reschedule(duration)
                   # disable the cancel rule while we send the new command
                   DSL.rules[timed_command_details.rule_uid].disable
-                  super(command, **kwargs) # This returns nil when "ensured"
+                  super(command, **) # This returns nil when "ensured"
                   DSL.rules[timed_command_details.rule_uid].enable
                   timed_command_details
                 end

data/lib/openhab/dsl/rules/triggers/conditions/duration.rb

@@ -31,16 +31,16 @@ module OpenHAB
             # Process rule
             # @param [Hash] inputs inputs from trigger
             #
-            def process(mod:, inputs:, &block)
+            def process(mod:, inputs:, &)
               timer = @timers[inputs["triggeringItem"]&.name]
               if timer&.active?
-                process_active_timer(timer, inputs, mod, &block)
+                process_active_timer(timer, inputs, mod, &)
               elsif @conditions.process(mod:, inputs:)
                 logger.trace { "Trigger Guards Matched for #{self}, delaying rule execution" }
                 # Add timer and attach timer to delay object, and also state being tracked to so
                 # timer can be cancelled if state changes
                 # Also another timer should not be created if changed to same value again but instead rescheduled
-                create_trigger_delay_timer(inputs, mod, &block)
+                create_trigger_delay_timer(inputs, mod, &)
               else
                 logger.trace { "Trigger Guards did not match for #{self}, ignoring trigger." }
               end

data/lib/openhab/dsl/sitemaps/builder.rb

@@ -48,8 +48,8 @@ module OpenHAB
         # @yield Block executed in the context of a {SitemapBuilder}
         # @return [SitemapBuilder]
         # @!visibility public
-        def sitemap(name, label: nil, icon: nil, &block)
-          sitemap = SitemapBuilder.new(name, @builder_proxy, label:, icon:, &block)
+        def sitemap(name, label: nil, icon: nil, &)
+          sitemap = SitemapBuilder.new(name, @builder_proxy, label:, icon:, &)
           sitemap = sitemap.build
           if @update && @provider.get(sitemap.uid)
             @provider.update(sitemap)
@@ -355,8 +355,8 @@ module OpenHAB
         # @!method initialize(item: nil, label: nil, icon: nil, static_icon: nil, mappings: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
         # @param mappings [Hash, Array, nil] Mappings from command to label (see {SwitchBuilder#mappings})
         # @!visibility private
-        def initialize(type, builder_proxy, mappings: nil, **kwargs, &block)
-          super(type, builder_proxy, **kwargs, &block)
+        def initialize(type, builder_proxy, mappings: nil, **, &)
+          super(type, builder_proxy, **, &)
 
           @mappings = mappings
         end
@@ -370,8 +370,7 @@ module OpenHAB
             mapping.cmd = cmd.to_s
             mapping.release_cmd = release_cmd.to_s unless release_cmd.nil?
             mapping.label = label&.to_s || cmd.to_s
-            # @deprecated OH 4.1 the if check is not needed in OH4.1+
-            mapping.icon = icon if icon
+            mapping.icon = icon
             widget.mappings.add(mapping)
           end
           widget
@@ -400,8 +399,8 @@ module OpenHAB
         # @param range [Range, nil] Allowed range of the value (see {SetpointBuilder#range})
         # @param step [Numeric,nil] How far the value will change with each button press (see {SetpointBuilder#step})
         # @!visibility private
-        def initialize(type, builder_proxy, range: nil, step: nil, **kwargs, &block)
-          super(type, builder_proxy, **kwargs, &block)
+        def initialize(type, builder_proxy, range: nil, step: nil, **, &)
+          super(type, builder_proxy, **, &)
 
           @range = range
           @step = step
@@ -441,8 +440,8 @@ module OpenHAB
         # @param release_only [true, false, nil]
         #   Only send the command when the slider is released (see {SliderBuilder#release_only=})
         # @!visibility private
-        def initialize(type, builder_proxy, switch: nil, frequency: nil, release_only: nil, **kwargs, &block)
-          super(type, builder_proxy, **kwargs, &block)
+        def initialize(type, builder_proxy, switch: nil, frequency: nil, release_only: nil, **, &)
+          super(type, builder_proxy, **, &)
 
           @switch = switch
           @frequency = frequency
@@ -464,8 +463,7 @@ module OpenHAB
           widget = super
           widget.switch_enabled = switch? unless @switch.nil?
           widget.send_frequency = (frequency * 1000).to_i if frequency
-          # @deprecated OH 4.1 remove the version check when dropping OH 4.1 support
-          widget.release_only = release_only? if OpenHAB::Core.version >= OpenHAB::Core::V4_2 && !@release_only.nil?
+          widget.release_only = release_only? unless @release_only.nil?
           widget
         end
       end
@@ -487,8 +485,8 @@ module OpenHAB
         # @param [String, nil] url (see {VideoBuilder#url})
         # @param [:mjpeg, :hls, nil] encoding (see {VideoBuilder#encoding})
         # @!visibility private
-        def initialize(type, builder_proxy, url: nil, encoding: nil, **kwargs, &block)
-          super(type, builder_proxy, **kwargs, &block)
+        def initialize(type, builder_proxy, url: nil, encoding: nil, **, &)
+          super(type, builder_proxy, **, &)
 
           @url = url
           self.encoding = encoding
@@ -563,9 +561,9 @@ module OpenHAB
                        legend: nil,
                        group: nil,
                        y_axis_pattern: nil,
-                       **kwargs,
-                       &block)
-          super(type, builder_proxy, **kwargs, &block)
+                       **,
+                       &)
+          super(type, builder_proxy, **, &)
 
           @service = service
           self.refresh = refresh
@@ -615,8 +613,8 @@ module OpenHAB
         # @!method initialize(item: nil, label: nil, icon: nil, static_icon: nil, height: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
         # @param height [Integer] The number of element rows to fill (see {DefaultBuilder#height})
         # @!visibility private
-        def initialize(type, builder_proxy, height: nil, **kwargs, &block)
-          super(type, builder_proxy, **kwargs, &block)
+        def initialize(type, builder_proxy, height: nil, **, &)
+          super(type, builder_proxy, **, &)
 
           @height = height
         end
@@ -640,8 +638,8 @@ module OpenHAB
         # @!method initialize(item: nil, label: nil, icon: nil, static_icon: nil, url: nil, height: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
         # @param url [String, nil] (see {WebviewBuilder#url})
         # @!visibility private
-        def initialize(type, builder_proxy, url: nil, **kwargs, &block)
-          super(type, builder_proxy, **kwargs, &block)
+        def initialize(type, builder_proxy, url: nil, **, &)
+          super(type, builder_proxy, **, &)
 
           @url = url
         end
@@ -666,8 +664,8 @@ module OpenHAB
         # @!method initialize(item: nil, label: nil, icon: nil, static_icon: nil, frequency: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
         # @param frequency [Numeric, nil] How often to send requests (see {ColorpickerBuilder#frequency})
         # @!visibility private
-        def initialize(type, builder_proxy, frequency: nil, **kwargs, &block)
-          super(type, builder_proxy, **kwargs, &block)
+        def initialize(type, builder_proxy, frequency: nil, **, &)
+          super(type, builder_proxy, **, &)
 
           @frequency = frequency
         end
@@ -692,8 +690,8 @@ module OpenHAB
         # @!method initialize(item: nil, label: nil, icon: nil, static_icon: nil, range: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
         # @param range [Range, nil] Allowed range of the value (see {ColortemperaturepickerBuilder#range})
         # @!visibility private
-        def initialize(type, builder_proxy, range: nil, **kwargs, &block)
-          super(type, builder_proxy, **kwargs, &block)
+        def initialize(type, builder_proxy, range: nil, **, &)
+          super(type, builder_proxy, **, &)
 
           @range = range
         end
@@ -729,8 +727,8 @@ module OpenHAB
         # @param [:text, :number, :date, :time, :datetime, nil] hint
         #   Gives a hint to the user interface to use a widget adapted to a specific use (see {InputBuilder#hint})
         # @!visibility private
-        def initialize(type, builder_proxy, hint: nil, **kwargs, &block)
-          super(type, builder_proxy, **kwargs, &block)
+        def initialize(type, builder_proxy, hint: nil, **, &)
+          super(type, builder_proxy, **, &)
 
           self.hint = hint
         end
@@ -798,9 +796,9 @@ module OpenHAB
                        click:,
                        release: nil,
                        stateless: nil,
-                       **kwargs,
-                       &block)
-          super(:button, builder_proxy, **kwargs, &block)
+                       **,
+                       &)
+          super(:button, builder_proxy, **, &)
 
           @row = row
           @column = column
@@ -816,24 +814,12 @@ module OpenHAB
 
         # @!visibility private
         def build
-          if Core.version >= Core::V4_2
-            super.tap do |widget|
-              widget.row = row
-              widget.column = column
-              widget.cmd = click.to_s
-              widget.release_cmd = release.to_s unless release.nil?
-              widget.stateless = stateless? unless @stateless.nil?
-            end
-          else
-            # @deprecated OH 4.1
-            # in OH 4.1, the button is a property of the Buttongrid, not a widget
-            SitemapBuilder.factory.create_button.tap do |button|
-              button.row = row
-              button.column = column
-              button.cmd = click.to_s
-              button.label = label
-              button.icon = icon if icon
-            end
+          super.tap do |widget|
+            widget.row = row
+            widget.column = column
+            widget.cmd = click.to_s
+            widget.release_cmd = release.to_s unless release.nil?
+            widget.stateless = stateless? unless @stateless.nil?
           end
         end
       end
@@ -1220,8 +1206,8 @@ module OpenHAB
         # @param url [String, nil] The URL for the image (see {ImageBuilder#url})
         # @param refresh [Numeric, nil] How often to refresh the image (see {ImageBuilder#refresh})
         # @!visibility private
-        def initialize(type, builder_proxy, url: nil, refresh: nil, **kwargs, &block)
-          super(type, builder_proxy, **kwargs, &block)
+        def initialize(type, builder_proxy, url: nil, refresh: nil, **, &)
+          super(type, builder_proxy, **, &)
 
           @url = url
           @refresh = refresh
@@ -1250,17 +1236,6 @@ module OpenHAB
         REQUIRED_BUTTON_ARGS = %i[row column click].freeze
         private_constant :REQUIRED_BUTTON_ARGS
 
-        # @deprecated OH 4.1 in OH 4.1, Buttongrid is not a LinkableWidget.
-        # Pretend that the buttons property is its children so we can add to it in LinkableWidgetBuilder#build
-        if (Core::V4_1...Core::V4_2).cover?(Core.version)
-          java_import org.openhab.core.model.sitemap.sitemap.Buttongrid
-          module Buttongrid
-            def children
-              buttons
-            end
-          end
-        end
-
         # (see WidgetBuilder#initialize)
         # @!method initialize(item: nil, label: nil, icon: nil, static_icon: nil, buttons: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
         # @param [Array<Array<int, int, Command, String, String>>] buttons An array of buttons to display.
@@ -1315,8 +1290,8 @@ module OpenHAB
         #
         # @see https://www.openhab.org/docs/ui/sitemaps.html#element-type-buttongrid
         # @!visibility private
-        def initialize(type, builder_proxy, buttons: [], **kwargs, &block)
-          super(type, builder_proxy, **kwargs, &block)
+        def initialize(type, builder_proxy, buttons: [], **, &)
+          super(type, builder_proxy, **, &)
 
           # Put the buttons given in the constructor before those added in the block
           # We can't do this before calling the super constructor because `children` is initialized there
@@ -1423,7 +1398,7 @@ module OpenHAB
         #     end
         #   end
         #
-        def button(row = nil, column = nil, click = nil, label = nil, icon = nil, **kwargs, &block)
+        def button(row = nil, column = nil, click = nil, label = nil, icon = nil, **kwargs, &)
           args = [row, column, click, label, icon].compact
 
           args = args.first if args.first.is_a?(Array)
@@ -1439,7 +1414,7 @@ module OpenHAB
           kwargs[:item] ||= item if item # default to the buttongrid's item
           kwargs[:label] ||= kwargs[:click].to_s
 
-          ButtonBuilder.new(@builder_proxy, **kwargs, &block).tap do |b|
+          ButtonBuilder.new(@builder_proxy, **kwargs, &).tap do |b|
             children << b
           end
         end

data/lib/openhab/dsl/things/builder.rb

@@ -89,8 +89,8 @@ module OpenHAB
 
         private
 
-        def build(klass, *args, **kwargs, &block)
-          builder = klass.new(*args, **kwargs)
+        def build(klass, *, **, &block)
+          builder = klass.new(*, **)
           builder.parent_builder = self if builder.respond_to?(:parent_builder=)
           builder.instance_eval(&block) if block
           thing = builder.build
@@ -227,8 +227,8 @@ module OpenHAB
         # Add an explicitly configured channel to this item
         # @see ChannelBuilder#initialize
         # @return [Core::Things::Channel]
-        def channel(*args, **kwargs, &block)
-          channel = ChannelBuilder.new(*args, thing: self, **kwargs)
+        def channel(*, **, &block)
+          channel = ChannelBuilder.new(*, thing: self, **)
           channel.instance_eval(&block) if block
           channel.build.tap { |c| @channels << c }
         end
@@ -287,14 +287,14 @@ module OpenHAB
 
         # Create a new Bridge with this Bridge as its Bridge
         # @see BridgeBuilder#initialize
-        def bridge(*args, **kwargs, &)
-          parent_builder.bridge(*args, bridge: self, **kwargs, &)
+        def bridge(*, **, &)
+          parent_builder.bridge(*, bridge: self, **, &)
         end
 
         # Create a new Thing with this Bridge as its Bridge
         # @see ThingBuilder#initialize
-        def thing(*args, **kwargs, &)
-          parent_builder.thing(*args, bridge: self, **kwargs, &)
+        def thing(*, **, &)
+          parent_builder.thing(*, bridge: self, **, &)
         end
       end
 

data/lib/openhab/dsl/timer_manager.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
 require "singleton"
 
 module OpenHAB

data/lib/openhab/dsl/version.rb

@@ -4,6 +4,6 @@ module OpenHAB
   module DSL
     # Version of openHAB helper libraries
     # @return [String]
-    VERSION = "5.45.0"
+    VERSION = "5.46.0"
   end
 end

data/lib/openhab/dsl.rb

@@ -86,39 +86,39 @@ module OpenHAB
     # @!group Rule Creation
 
     # (see Rules::Builder#rule)
-    def rule(name = nil, id: nil, **kwargs, &block)
-      rules.build { rule(name, id:, **kwargs, &block) }
+    def rule(name = nil, id: nil, **, &)
+      rules.build { rule(name, id:, **, &) }
     end
 
     # Creates a rule that will remove existing rules with the same id, even when the id has been inferred.
     # @see rule
-    def rule!(name = nil, id: nil, **kwargs, &block)
-      rules.build { rule(name, id:, replace: true, **kwargs, &block) }
+    def rule!(name = nil, id: nil, **, &)
+      rules.build { rule(name, id:, replace: true, **, &) }
     end
 
     # (see Rules::Builder#scene)
-    def scene(name = nil, description: nil, id: nil, tag: nil, tags: nil, **kwargs, &block)
-      rules.build { scene(name, description:, id:, tag:, tags:, **kwargs, &block) }
+    def scene(name = nil, description: nil, id: nil, tag: nil, tags: nil, **, &)
+      rules.build { scene(name, description:, id:, tag:, tags:, **, &) }
     end
 
     # Creates a scene that will remove existing rules/scenes with the same id, even when the id has been inferred.
     # @see scene
-    def scene!(name = nil, description: nil, id: nil, tag: nil, tags: nil, **kwargs, &block)
+    def scene!(name = nil, description: nil, id: nil, tag: nil, tags: nil, **, &)
       rules.build do
-        scene(name, description:, id:, tag:, tags:, replace: true, **kwargs, &block)
+        scene(name, description:, id:, tag:, tags:, replace: true, **, &)
       end
     end
 
     # (see Rules::Builder#script)
-    def script(name = nil, description: nil, id: nil, tag: nil, tags: nil, **kwargs, &block)
-      rules.build { script(name, description:, id:, tag:, tags:, **kwargs, &block) }
+    def script(name = nil, description: nil, id: nil, tag: nil, tags: nil, **, &)
+      rules.build { script(name, description:, id:, tag:, tags:, **, &) }
     end
 
     # Creates a script that will remove existing rules/scripts with the same id, even when the id has been inferred.
     # @see script
-    def script!(name = nil, description: nil, id: nil, tag: nil, tags: nil, **kwargs, &block)
+    def script!(name = nil, description: nil, id: nil, tag: nil, tags: nil, **, &)
       rules.build do
-        script(name, description:, id:, tag:, tags:, replace: true, **kwargs, &block)
+        script(name, description:, id:, tag:, tags:, replace: true, **, &)
       end
     end
 
@@ -519,7 +519,7 @@ module OpenHAB
     #
     # @param (see Rules::BuilderDSL#debounce_for)
     # @param [Object] id ID to associate with this call.
-    # @param [Block] block The block to be debounced.
+    # @yield The block to be debounced.
     #
     # @return [void]
     #
@@ -536,9 +536,9 @@ module OpenHAB
     #
     # @see Rules::BuilderDSL#debounce_for Rule builder's debounce_for for a detailed description
     #
-    def debounce_for(debounce_time, id: nil, &block)
+    def debounce_for(debounce_time, id: nil, &)
       idle_time = debounce_time.is_a?(Range) ? debounce_time.begin : debounce_time
-      debounce(for: debounce_time, idle_time:, id:, &block)
+      debounce(for: debounce_time, idle_time:, id:, &)
     end
 
     #
@@ -562,15 +562,15 @@ module OpenHAB
     #
     # @param (see Rules::BuilderDSL#throttle_for)
     # @param [Object] id ID to associate with this call.
-    # @param [Block] block The block to be throttled.
+    # @yield The block to be throttled.
     #
     # @return [void]
     #
     # @see Rules::BuilderDSL#debounce_for Rule builder's debounce_for for a detailed description
     # @see Rules::BuilderDSL#throttle_for
     #
-    def throttle_for(duration, id: nil, &block)
-      debounce(for: duration, id:, &block)
+    def throttle_for(duration, id: nil, &)
+      debounce(for: duration, id:, &)
     end
 
     # (see Core::Actions::Transformation.transform)
@@ -587,7 +587,7 @@ module OpenHAB
     #
     # @param (see Rules::BuilderDSL#only_every)
     # @param [Object] id ID to associate with this call.
-    # @param [Block] block The block to be throttled.
+    # @yield The block to be throttled.
     #
     # @return [void]
     #
@@ -599,9 +599,9 @@ module OpenHAB
     # @see Rules::BuilderDSL#debounce_for Rule builder's debounce_for for a detailed description
     # @see Rules::BuilderDSL#only_every
     #
-    def only_every(interval, id: nil, &block)
+    def only_every(interval, id: nil, &)
       interval = 1.send(interval) if %i[second minute hour day].include?(interval)
-      debounce(for: interval, leading: true, id:, &block)
+      debounce(for: interval, leading: true, id:, &)
     end
 
     #

data/lib/openhab/rspec/helpers.rb

@@ -280,8 +280,6 @@ module OpenHAB
                   OSGi.register_service(new_ast, *services, bundle: ast_bundle)
             end
           end
-        rescue NameError
-          # @deprecated OH 4.0
         end
 
         # RSpec additions

data/lib/openhab/rspec/karaf.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "fileutils"
-require "set"
 require "shellwords"
 require "time"
 
@@ -160,11 +159,11 @@ module OpenHAB
                                                             :karafEtc,
                                                             :defaultStartLevel
         klass.class_eval do
-          def send_private(method_name, *args)
+          def send_private(method_name, *)
             method_name = method_name.to_s
             method = self.class.java_class.declared_methods.find { |m| m.name == method_name }
             method.accessible = true
-            method.invoke(self, *args)
+            method.invoke(self, *)
           end
 
           def launch_simple

data/lib/openhab/rspec/mocks/timer.rb

@@ -99,9 +99,9 @@ module OpenHAB
         # @!visibility private
         module ClassMethods
           # @!visibility private
-          def new(*args, **kwargs)
+          def new(*, **)
             return super if self == Timer
-            return Timer.new(*args, **kwargs) if Timer.mock_timers?
+            return Timer.new(*, **) if Timer.mock_timers?
 
             super
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openhab-scripting
 version: !ruby/object:Gem::Version
-  version: 5.45.0
+  version: 5.46.0
 platform: ruby
 authors:
 - Brian O'Connell
@@ -15,16 +15,22 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: marcel
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +65,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.3'
@@ -69,7 +75,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.3'
@@ -341,14 +347,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.4
+      version: 3.4.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: JRuby Helper Libraries for openHAB Scripting
 test_files: []