diff --git a/.rubocop.yml b/.rubocop.yml index 9828fc31..67bb54b3 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -8,7 +8,7 @@ AllCops: SuggestExtensions: false TargetRubyVersion: 2.6 -#- Pending Cops as of 1.66.1 ---------------------------------------------# +#- Pending Cops as of 1.67.0 ---------------------------------------------# Gemspec/AddRuntimeDependency: # new in 1.65 Enabled: true @@ -40,6 +40,8 @@ Lint/DuplicateMatchPattern: # new in 1.50 Enabled: true Lint/DuplicateRegexpCharacterClassElement: # (new in 1.1) Enabled: true +Lint/DuplicateSetElement: # new in 1.67 + Enabled: true Lint/EmptyBlock: # (new in 1.1) Enabled: true Lint/EmptyClass: # (new in 1.3) diff --git a/CHANGELOG.md b/CHANGELOG.md index aac9e22f..4bc410a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## Master +## 0.15.3 ##### Breaking @@ -10,8 +10,8 @@ ##### Bug Fixes -* Don't crash when the Swift 6 compiler reports educational - notes. +* Don't crash in SourceKitten when the Swift 6 compiler reports + educational notes. [John Fairhurst](https://github.com/johnfairh) [#1399](https://github.com/realm/jazzy/issues/1399) diff --git a/Gemfile.lock b/Gemfile.lock index b464235a..9543cb79 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,7 +9,7 @@ GIT PATH remote: . specs: - jazzy (0.15.2) + jazzy (0.15.3) cocoapods (~> 1.5) mustache (~> 1.1) open4 (~> 1.3) @@ -27,7 +27,7 @@ GEM base64 nkf rexml - activesupport (7.2.1) + activesupport (7.2.1.1) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) @@ -156,7 +156,7 @@ GEM uri netrc (0.11.0) nkf (0.2.0) - octokit (9.1.0) + octokit (9.2.0) faraday (>= 1, < 3) sawyer (~> 0.9) open4 (1.3.4) @@ -173,9 +173,9 @@ GEM rchardet (1.8.0) redcarpet (3.6.0) regexp_parser (2.9.2) - rexml (3.3.7) + rexml (3.3.8) rouge (4.4.0) - rubocop (1.66.1) + rubocop (1.67.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -206,19 +206,19 @@ GEM concurrent-ruby (~> 1.0) unicode-display_width (2.6.0) uri (0.13.1) - webmock (3.23.1) + webmock (3.24.0) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) xcinvoke (0.3.0) liferaft (~> 0.0.6) - xcodeproj (1.25.0) + xcodeproj (1.25.1) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) nanaimo (~> 0.3.0) - rexml (>= 3.3.2, < 4.0) + rexml (>= 3.3.6, < 4.0) PLATFORMS ruby diff --git a/lib/jazzy/gem_version.rb b/lib/jazzy/gem_version.rb index 30b1eb49..86a6e4e6 100644 --- a/lib/jazzy/gem_version.rb +++ b/lib/jazzy/gem_version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Jazzy - VERSION = '0.15.2' unless defined? Jazzy::VERSION + VERSION = '0.15.3' unless defined? Jazzy::VERSION end diff --git a/lib/jazzy/source_declaration.rb b/lib/jazzy/source_declaration.rb index 4fe2c720..2074f6f1 100644 --- a/lib/jazzy/source_declaration.rb +++ b/lib/jazzy/source_declaration.rb @@ -98,7 +98,7 @@ def objc_category_name end def swift_objc_extension? - type.swift_extension? && usr && usr.start_with?('c:objc') + type.swift_extension? && usr&.start_with?('c:objc') end def swift_extension_objc_name diff --git a/lib/jazzy/sourcekitten.rb b/lib/jazzy/sourcekitten.rb index 608dd610..11a060de 100644 --- a/lib/jazzy/sourcekitten.rb +++ b/lib/jazzy/sourcekitten.rb @@ -826,8 +826,7 @@ def self.reject_inaccessible_extensions(typedecl, extensions) # type itself, the type must be private and the extensions # should be rejected. if !typedecl && - wanted_exts.first && - wanted_exts.first.type_from_doc_module? + wanted_exts.first&.type_from_doc_module? unwanted_exts += wanted_exts wanted_exts = [] end