Add @_spi(TokamakCore) protection for EnvironmentValues.merge(_:)…

…/`.merging(_:)`
TokamakUI · Jan 2, 2022 · c6b7bd9 · c6b7bd9
1 parent 09c333b
commit c6b7bd9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Sources/TokamakCore/Environment/EnvironmentValues.swift b/Sources/TokamakCore/Environment/EnvironmentValues.swift
@@ -44,6 +44,7 @@ public struct EnvironmentValues: CustomStringConvertible {
     }
   }
 
+  @_spi(TokamakCore)
   public mutating func merge(_ other: Self?) {
     if let other = other {
       values.merge(other.values) { existing, new in
@@ -52,6 +53,7 @@ public struct EnvironmentValues: CustomStringConvertible {
     }
   }
 
+  @_spi(TokamakCore)
   public func merging(_ other: Self?) -> Self {
     var merged = self
     merged.merge(other)

diff --git a/Sources/TokamakGTK/GTKRenderer.swift b/Sources/TokamakGTK/GTKRenderer.swift
@@ -17,7 +17,7 @@
 
 import CGTK
 import Dispatch
-import TokamakCore
+@_spi(TokamakCore) import TokamakCore
 
 extension EnvironmentValues {
   /// Returns default settings for the GTK environment