From eb1013df6bef5d6181cc8647eb3a4ad7f2610425 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 16:13:36 -0700 Subject: [PATCH 1/2] Bump rexml from 3.2.6 to 3.2.8 (#1143) Bumps [rexml](https://github.com/ruby/rexml) from 3.2.6 to 3.2.8. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.2.6...v3.2.8) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 892756dba..287fe1da4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -97,7 +97,8 @@ GEM open4 (1.3.4) public_suffix (4.0.7) redcarpet (3.6.0) - rexml (3.2.6) + rexml (3.2.8) + strscan (>= 3.0.9) rouge (4.2.0) ruby-macho (2.5.1) ruby2_keywords (0.0.5) @@ -105,6 +106,7 @@ GEM ffi (~> 1.9) sqlite3 (1.6.9) mini_portile2 (~> 2.8.0) + strscan (3.1.0) typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) From 6ba9e680a1962a86510e9ea2c5c79fd43c5eeff4 Mon Sep 17 00:00:00 2001 From: Tomer HaCohen Date: Tue, 25 Jun 2024 20:26:20 +0300 Subject: [PATCH 2/2] BeLogical: fix retroactive conformance error. (#1149) --- Sources/Nimble/Matchers/BeLogical.swift | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Sources/Nimble/Matchers/BeLogical.swift b/Sources/Nimble/Matchers/BeLogical.swift index 5170299f7..ea04915e1 100644 --- a/Sources/Nimble/Matchers/BeLogical.swift +++ b/Sources/Nimble/Matchers/BeLogical.swift @@ -1,42 +1,42 @@ import Foundation -extension Int8: ExpressibleByBooleanLiteral { +extension Int8: Swift.ExpressibleByBooleanLiteral { public init(booleanLiteral value: Bool) { self = NSNumber(value: value).int8Value } } -extension UInt8: ExpressibleByBooleanLiteral { +extension UInt8: Swift.ExpressibleByBooleanLiteral { public init(booleanLiteral value: Bool) { self = NSNumber(value: value).uint8Value } } -extension Int16: ExpressibleByBooleanLiteral { +extension Int16: Swift.ExpressibleByBooleanLiteral { public init(booleanLiteral value: Bool) { self = NSNumber(value: value).int16Value } } -extension UInt16: ExpressibleByBooleanLiteral { +extension UInt16: Swift.ExpressibleByBooleanLiteral { public init(booleanLiteral value: Bool) { self = NSNumber(value: value).uint16Value } } -extension Int32: ExpressibleByBooleanLiteral { +extension Int32: Swift.ExpressibleByBooleanLiteral { public init(booleanLiteral value: Bool) { self = NSNumber(value: value).int32Value } } -extension UInt32: ExpressibleByBooleanLiteral { +extension UInt32: Swift.ExpressibleByBooleanLiteral { public init(booleanLiteral value: Bool) { self = NSNumber(value: value).uint32Value } } -extension Int64: ExpressibleByBooleanLiteral { +extension Int64: Swift.ExpressibleByBooleanLiteral { public init(booleanLiteral value: Bool) { self = NSNumber(value: value).int64Value }