Update Mergeable

Kyle-Ye · Kyle-Ye · commit 4bdfa3fb020b · 2026-04-12T23:03:40.000+08:00
diff --git a/Sources/OpenGestures/Core/GestureTrait.swift b/Sources/OpenGestures/Core/GestureTrait.swift
@@ -209,9 +209,8 @@ extension GestureTraitCollection: NestedCustomStringConvertible {
 
 // MARK: - GestureTraitCollection + Mergeable
 
-@_spi(Private)
 extension GestureTraitCollection: Mergeable {
-    public mutating func merge(_ other: GestureTraitCollection) {
+    package mutating func merge(_ other: GestureTraitCollection) {
         _traits.merge(other._traits) { $1 }
     }
 }
diff --git a/Sources/OpenGestures/Util/Mergeable.swift b/Sources/OpenGestures/Util/Mergeable.swift
@@ -7,7 +7,6 @@
 
 // MARK: - Mergeable
 
-@_spi(Private)
-public protocol Mergeable {
+package protocol Mergeable {
     mutating func merge(_ other: Self)
 }

Original file line number	Diff line number	Diff line change
`@@ -209,9 +209,8 @@ extension GestureTraitCollection: NestedCustomStringConvertible {`
`209`	`209`
`210`	`210`	`// MARK: - GestureTraitCollection + Mergeable`
`211`	`211`
`212`		`-@_spi(Private)`
`213`	`212`	`extension GestureTraitCollection: Mergeable {`
`214`		`- public mutating func merge(_ other: GestureTraitCollection) {`
	`213`	`+ package mutating func merge(_ other: GestureTraitCollection) {`
`215`	`214`	`_traits.merge(other._traits) { $1 }`
`216`	`215`	`}`
`217`	`216`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`
`8`	`8`	`// MARK: - Mergeable`
`9`	`9`
`10`		`-@_spi(Private)`
`11`		`-public protocol Mergeable {`
	`10`	`+package protocol Mergeable {`
`12`	`11`	`mutating func merge(_ other: Self)`
`13`	`12`	`}`