openhab-scripting 5.44.1 → 5.46.0

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)
@@ -152,7 +152,7 @@ module OpenHAB
               item.metadata
                   .reject { |namespace, _| builder.metadata.key?(namespace) }
                   .each do |namespace, metadata|
-                item.metadata.delete(namespace) if metadata.provider == Core::Items::Metadata::Provider.current
+                    item.metadata.delete(namespace) if metadata.provider == Core::Items::Metadata::Provider.current
               end
             else
               item = builder.build
@@ -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.44.1"
+    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

@@ -201,7 +201,7 @@ module OpenHAB
           .split(File::PATH_SEPARATOR)
             .reject(&:empty?)
             .reject do |path|
-                             $LOAD_PATH.include?(path)
+              $LOAD_PATH.include?(path)
                            end)
 
         requires = jrubyscripting_config&.get("require") || ""
@@ -268,20 +268,18 @@ module OpenHAB
             OSGi.service_component_classes(bundle)
                 .select { |klass, _services| klass.ancestors.include?(ast.java_class) }
                 .each do |klass, services|
-              new_ast_klass = Class.new(ast)
-              new_ast_klass.become_java!
-              wrapped_storage_service = Mocks::AbstractStorageBasedTypeProviderWrappedStorageService
-                                        .new(storage_service,
-                                             new_ast_klass.java_class,
-                                             klass)
-              new_ast = new_ast_klass.new(wrapped_storage_service)
-
-              services -= [klass.name]
-              OSGi.register_service(new_ast, *services, bundle: ast_bundle)
+                  new_ast_klass = Class.new(ast)
+                  new_ast_klass.become_java!
+                  wrapped_storage_service = Mocks::AbstractStorageBasedTypeProviderWrappedStorageService
+                                            .new(storage_service,
+                                                 new_ast_klass.java_class,
+                                                 klass)
+                  new_ast = new_ast_klass.new(wrapped_storage_service)
+
+                  services -= [klass.name]
+                  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
@@ -786,7 +785,7 @@ module OpenHAB
 
               <blacklistedFeatures>
                 <feature>openhab-runtime-ui</feature>
-                <feature>openhab-core-ui*</feature>
+                <feature>openhab-core-ui</feature>
                 <feature>openhab-misc-*</feature>
                 <feature>openhab-persistence-*</feature>
                 <feature>openhab-package-standard</feature>
@@ -807,6 +806,7 @@ module OpenHAB
                     <f:feature>openhab-core-model-sitemap</f:feature>
                     <f:feature>openhab-core-model-thing</f:feature>
                     <f:feature>openhab-core-storage-json</f:feature>
+                    <f:feature>openhab-core-ui-icon</f:feature>
                     <f:feature>openhab-transport-http</f:feature>
                     <f:feature prerequisite="true">wrapper</f:feature>
                     <f:bundle>mvn:org.openhab.core.bundles/org.openhab.core.karaf/#{version}</f:bundle>

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