[maps-ios] Replace @_implementationOnly with internal import (#13597)

OdNairy · claude · github-actions[bot] · commit af6a3af5e858 · 2026-05-21T12:17:30.000Z
The @_implementationOnly attribute is deprecated and emits warnings without library evolution enabled. SE-0409 (Swift 6.0+) provides `internal import` as the stable replacement; the minimum supported Xcode for maps-ios is 16, so no swiftSettings flag is needed. Links: - [Access-level modifiers on import declarations](https://github.com/swiftlang/swift-evolution/blob/main/proposals/0409-access-level-on-imports.md) Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> GitOrigin-RevId: 4467419c55db65edb7429b2cf5cc272a332b564f
diff --git a/Sources/MapboxMaps/Annotations/OffsetGeometryCalculator.swift b/Sources/MapboxMaps/Annotations/OffsetGeometryCalculator.swift
@@ -1,5 +1,5 @@
 import UIKit
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 protocol OffsetGeometryCalculator {
     associatedtype GeometryType: GeometryConvertible
diff --git a/Sources/MapboxMaps/Annotations/ViewAnnotationManager.swift b/Sources/MapboxMaps/Annotations/ViewAnnotationManager.swift
@@ -1,6 +1,6 @@
 // swiftlint:disable file_length
 import UIKit
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 import Turf
 
 public struct ViewAnnotationManagerError: Error, Equatable, Sendable {
diff --git a/Sources/MapboxMaps/Attribution/AttributionMenu.swift b/Sources/MapboxMaps/Attribution/AttributionMenu.swift
@@ -1,6 +1,6 @@
 import Foundation
 import UIKit
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 /// API for attribution menu configuration
 /// Restricted API. Please contact Mapbox to discuss your use case if you intend to use this property.
diff --git a/Sources/MapboxMaps/Camera/CameraAnimationsManagerImpl.swift b/Sources/MapboxMaps/Camera/CameraAnimationsManagerImpl.swift
@@ -1,5 +1,5 @@
 import UIKit
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 internal protocol CameraAnimationsManagerProtocol: AnyObject {
 
diff --git a/Sources/MapboxMaps/Camera/SimpleCameraAnimator.swift b/Sources/MapboxMaps/Camera/SimpleCameraAnimator.swift
@@ -1,4 +1,4 @@
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 import UIKit
 
 internal protocol SimpleCameraAnimatorProtocol: CameraAnimatorProtocol {
diff --git a/Sources/MapboxMaps/ContentBuilders/MapContent/MapContentUniqueProperties.swift b/Sources/MapboxMaps/ContentBuilders/MapContent/MapContentUniqueProperties.swift
@@ -1,4 +1,4 @@
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 import os
 
 /// The style properties that can be applied once in the whole style.
diff --git a/Sources/MapboxMaps/ContentBuilders/Tree/MapContentMountedComponent.swift b/Sources/MapboxMaps/ContentBuilders/Tree/MapContentMountedComponent.swift
@@ -1,5 +1,5 @@
 import os
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 protocol MapContentMountedComponent {
     func mount(with context: MapContentNodeContext) throws
diff --git a/Sources/MapboxMaps/Foundation/CoreAliases.swift b/Sources/MapboxMaps/Foundation/CoreAliases.swift
@@ -1,5 +1,5 @@
-@_implementationOnly import MapboxCoreMaps_Private
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCoreMaps_Private
+internal import MapboxCommon_Private
 @_spi(Internal) import MapboxCoreMaps
 
 typealias CoreCameraOptions = MapboxCoreMaps_Private.__CameraOptions
diff --git a/Sources/MapboxMaps/Foundation/Events/EventsManager.swift b/Sources/MapboxMaps/Foundation/Events/EventsManager.swift
@@ -1,5 +1,5 @@
 import UIKit
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 extension UserDefaults {
     // dynamic var's name has to be the same as corresponding key in UserDefaults
diff --git a/Sources/MapboxMaps/Foundation/Extensions/Core/RenderedQueryOptions.swift b/Sources/MapboxMaps/Foundation/Extensions/Core/RenderedQueryOptions.swift
@@ -1,5 +1,5 @@
 import Foundation
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 extension RenderedQueryOptions {
 
diff --git a/Sources/MapboxMaps/Foundation/Extensions/CoreGraphics.swift b/Sources/MapboxMaps/Foundation/Extensions/CoreGraphics.swift
@@ -2,7 +2,7 @@ import Foundation
 import CoreLocation
 import CoreGraphics
 import MapboxCoreMaps
-@_implementationOnly import MapboxCoreMaps_Private
+internal import MapboxCoreMaps_Private
 
 // MARK: - CGPoint
 extension CGPoint {
diff --git a/Sources/MapboxMaps/Foundation/Logger.swift b/Sources/MapboxMaps/Foundation/Logger.swift
@@ -1,5 +1,5 @@
 import Foundation
-@_implementationOnly import MapboxCommon_Private.MBXLog_Internal
+internal import MapboxCommon_Private.MBXLog_Internal
 @_spi(Logging) import MapboxCommon
 
 /// A logging utility with MapboxCommon backend by default.
diff --git a/Sources/MapboxMaps/Foundation/MapInitOptions.swift b/Sources/MapboxMaps/Foundation/MapInitOptions.swift
@@ -1,5 +1,5 @@
 import Foundation
-@_implementationOnly import MapboxCoreMaps_Private
+internal import MapboxCoreMaps_Private
 
 /// A protocol used to provide ``MapInitOptions`` when initializing a ``MapView`` with a Storyboard or
 /// a nib.
diff --git a/Sources/MapboxMaps/Foundation/MapView+Attribution.swift b/Sources/MapboxMaps/Foundation/MapView+Attribution.swift
@@ -1,4 +1,4 @@
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 import UIKit
 
 extension MapView: AttributionDialogManagerDelegate {
diff --git a/Sources/MapboxMaps/Foundation/MapView+Snapshot.swift b/Sources/MapboxMaps/Foundation/MapView+Snapshot.swift
@@ -1,4 +1,4 @@
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 import UIKit
 
 extension MapView {
diff --git a/Sources/MapboxMaps/Foundation/MapView.swift b/Sources/MapboxMaps/Foundation/MapView.swift
@@ -1,5 +1,5 @@
 // swiftlint:disable file_length
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 import UIKit
 import os
 import MetalKit
diff --git a/Sources/MapboxMaps/Foundation/MapboxMap.swift b/Sources/MapboxMaps/Foundation/MapboxMap.swift
@@ -1,7 +1,7 @@
 // swiftlint:disable file_length
 import UIKit
 @_spi(Internal) @_spi(Marshalling) @_spi(Experimental) import MapboxCoreMaps
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 import Turf
 
 protocol MapboxMapProtocol: AnyObject {
diff --git a/Sources/MapboxMaps/Foundation/MapboxMapsOptions.swift b/Sources/MapboxMaps/Foundation/MapboxMapsOptions.swift
@@ -1,5 +1,5 @@
 import Foundation
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 /// Configurations for the external resources that are used by Maps API object,
 /// such as maps data directory and base URL.
diff --git a/Sources/MapboxMaps/Gestures/GestureHandlers/PinchGestureHandler.swift b/Sources/MapboxMaps/Gestures/GestureHandlers/PinchGestureHandler.swift
@@ -1,5 +1,5 @@
 import UIKit
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 internal protocol PinchGestureHandlerProtocol: FocusableGestureHandlerProtocol {
     var zoomEnabled: Bool { get set }
diff --git a/Sources/MapboxMaps/Location/Puck/Puck2DRenderer.swift b/Sources/MapboxMaps/Location/Puck/Puck2DRenderer.swift
@@ -1,4 +1,4 @@
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 import CoreGraphics
 import UIKit
 import os
diff --git a/Sources/MapboxMaps/Location/Puck/Puck3DRenderer.swift b/Sources/MapboxMaps/Location/Puck/Puck3DRenderer.swift
@@ -1,4 +1,4 @@
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 final class Puck3DRenderer: PuckRenderer {
     var state: PuckRendererState<Puck3DConfiguration>? {
diff --git a/Sources/MapboxMaps/Offline/OfflineCallbacks.swift b/Sources/MapboxMaps/Offline/OfflineCallbacks.swift
@@ -1,5 +1,5 @@
 import Foundation
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 /// Returns a closure suitable for the OfflineManager and TileStore callback based
 /// APIs, that converts the expected type into a Swift Result type.
diff --git a/Sources/MapboxMaps/Offline/OfflineManager+MapboxMaps.swift b/Sources/MapboxMaps/Offline/OfflineManager+MapboxMaps.swift
@@ -1,5 +1,5 @@
 import Foundation
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 extension OfflineManager {
 
diff --git a/Sources/MapboxMaps/Offline/TileStore+MapboxMaps.swift b/Sources/MapboxMaps/Offline/TileStore+MapboxMaps.swift
@@ -1,5 +1,5 @@
 import Foundation
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 internal protocol TileStoreProtocol: AnyObject {
     func __removeObserver(for observer: MapboxCommon_Private.TileStoreObserver)
diff --git a/Sources/MapboxMaps/Offline/TileStoreObserverCancelable.swift b/Sources/MapboxMaps/Offline/TileStoreObserverCancelable.swift
@@ -1,4 +1,4 @@
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 internal final class TileStoreObserverCancelable: Cancelable {
     private weak var observer: MapboxCommon_Private.TileStoreObserver?
diff --git a/Sources/MapboxMaps/Offline/TileStoreObserverWrapper.swift b/Sources/MapboxMaps/Offline/TileStoreObserverWrapper.swift
@@ -1,4 +1,4 @@
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 internal class TileStoreObserverWrapper: MapboxCommon_Private.TileStoreObserver {
     private let observer: TileStoreObserver
diff --git a/Sources/MapboxMaps/Ornaments/InfoButtonOrnament.swift b/Sources/MapboxMaps/Ornaments/InfoButtonOrnament.swift
@@ -1,5 +1,5 @@
 import UIKit
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 internal protocol InfoButtonOrnamentDelegate: AnyObject {
     func didTap(_ infoButtonOrnament: InfoButtonOrnament)
diff --git a/Sources/MapboxMaps/Ornaments/LogoView.swift b/Sources/MapboxMaps/Ornaments/LogoView.swift
@@ -1,5 +1,5 @@
 import UIKit
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 // swiftlint:disable:next type_body_length
 internal class LogoView: UIView {
diff --git a/Sources/MapboxMaps/Snapshot/Snapshotter.swift b/Sources/MapboxMaps/Snapshot/Snapshotter.swift
@@ -3,7 +3,7 @@ import UIKit
 import CoreLocation
 import CoreImage.CIFilterBuiltins
 @_spi(Marshalling) import MapboxCoreMaps
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 internal protocol MapSnapshotterProtocol: StyleManagerProtocol {
     func setSizeFor(_ size: Size)
diff --git a/Sources/MapboxMaps/Style/Attribution.swift b/Sources/MapboxMaps/Style/Attribution.swift
@@ -1,6 +1,6 @@
 import Foundation
 import WebKit
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 struct Attribution: Hashable {
 
diff --git a/Sources/MapboxMaps/Style/AttributionDialogManager.swift b/Sources/MapboxMaps/Style/AttributionDialogManager.swift
@@ -1,6 +1,6 @@
 import UIKit
 import Foundation
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 protocol AttributionDataSource: AnyObject {
     func loadAttributions(completion: @escaping ([Attribution]) -> Void)
diff --git a/Sources/MapboxMaps/Style/CustomSources/CustomRasterSourceTileData+Extensions.swift b/Sources/MapboxMaps/Style/CustomSources/CustomRasterSourceTileData+Extensions.swift
@@ -1,4 +1,4 @@
-@_implementationOnly import MapboxCoreMaps_Private
+internal import MapboxCoreMaps_Private
 @_spi(Marshalling) @_spi(Internal) import MapboxCoreMaps
 import UIKit
 
diff --git a/Sources/MapboxMaps/Style/Style+Localization.swift b/Sources/MapboxMaps/Style/Style+Localization.swift
@@ -1,4 +1,4 @@
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 /// Support for localization of labels
 extension StyleManager {
diff --git a/Sources/MapboxMaps/Style/StyleManager.swift b/Sources/MapboxMaps/Style/StyleManager.swift
@@ -1,5 +1,5 @@
 // swiftlint:disable file_length
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 import UIKit
 @_spi(Marshalling) @_spi(Internal) import MapboxCoreMaps
 
diff --git a/Sources/MapboxMaps/Style/StyleManagerProtocol.swift b/Sources/MapboxMaps/Style/StyleManagerProtocol.swift
@@ -1,6 +1,6 @@
 import Foundation
-@_implementationOnly import MapboxCommon_Private
-@_implementationOnly import MapboxCoreMaps_Private
+internal import MapboxCommon_Private
+internal import MapboxCoreMaps_Private
 @_spi(Marshalling) import MapboxCoreMaps
 
 struct RuntimeStylingCallbacks {
diff --git a/Sources/MapboxMaps/Style/StyleSourceManager.swift b/Sources/MapboxMaps/Style/StyleSourceManager.swift
@@ -1,5 +1,5 @@
 import Foundation
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 @_spi(Marshalling) import MapboxCoreMaps
 
 internal protocol StyleSourceManagerProtocol: AnyObject {
diff --git a/Sources/MapboxMaps/Style/Types/ExpressionArgumentBuilder.swift b/Sources/MapboxMaps/Style/Types/ExpressionArgumentBuilder.swift
@@ -1,6 +1,6 @@
 import Foundation
 import UIKit
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 /// :nodoc:
 /// This API enables the Expressions DSL syntax and is not designed to be called directly.
diff --git a/Tests/MapboxMapsTests/Foundation/Events/EventsManagerTests.swift b/Tests/MapboxMapsTests/Foundation/Events/EventsManagerTests.swift
@@ -1,6 +1,6 @@
 import XCTest
 @testable import MapboxMaps
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 final class EventsManagerTests: XCTestCase {
 
diff --git a/Tests/MapboxMapsTests/Foundation/Mocks/MockStyleManager.swift b/Tests/MapboxMapsTests/Foundation/Mocks/MockStyleManager.swift
@@ -1,6 +1,6 @@
 import Foundation
 @testable @_spi(Marshalling) import MapboxMaps
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 class MockStyleManager: StyleManagerProtocol {
     struct ImportColorThemeParameters {
diff --git a/Tests/MapboxMapsTests/Foundation/Style/StyleSourceManagerTests.swift b/Tests/MapboxMapsTests/Foundation/Style/StyleSourceManagerTests.swift
@@ -1,7 +1,7 @@
 import Foundation
 import XCTest
 @testable import MapboxMaps
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 final class StyleSourceManagerTests: XCTestCase {
     var sourceManager: StyleSourceManager!
diff --git a/Tests/MapboxMapsTests/Foundation/Style/StyleTests.swift b/Tests/MapboxMapsTests/Foundation/Style/StyleTests.swift
@@ -1,7 +1,7 @@
 import Foundation
 import XCTest
 @testable @_spi(Experimental) @_spi(Marshalling) import MapboxMaps
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 final class StyleManagerTests: XCTestCase {
     var style: MapboxMaps.StyleManager!
diff --git a/Tests/MapboxMapsTests/Foundation/Tracing.test.swift b/Tests/MapboxMapsTests/Foundation/Tracing.test.swift
@@ -1,7 +1,7 @@
 import XCTest
 import os
 @_spi(Experimental) @testable import MapboxMaps
-@_implementationOnly import MapboxCoreMaps_Private.Tracing_Internal
+internal import MapboxCoreMaps_Private.Tracing_Internal
 
 final class TracingTests: XCTestCase {
     static var defaultTracing: TracingBackendType?
diff --git a/Tests/MapboxMapsTests/Offline/Mocks/MockMapboxCommonTileStoreObserver.swift b/Tests/MapboxMapsTests/Offline/Mocks/MockMapboxCommonTileStoreObserver.swift
@@ -1,4 +1,4 @@
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 final class MockMapboxCommonTileStoreObserver: MapboxCommon_Private.TileStoreObserver {
     func onRegionLoadProgress(forId id: String, progress: TileRegionLoadProgress) {
diff --git a/Tests/MapboxMapsTests/Offline/Mocks/MockTileStore.swift b/Tests/MapboxMapsTests/Offline/Mocks/MockTileStore.swift
@@ -1,5 +1,5 @@
 @testable import MapboxMaps
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 final class MockTileStore: TileStoreProtocol {
     let __removeObserverStub = Stub<MapboxCommon_Private.TileStoreObserver, Void>()
diff --git a/Tests/MapboxMapsTests/Offline/TileStoreObserverWrapperTests.swift b/Tests/MapboxMapsTests/Offline/TileStoreObserverWrapperTests.swift
@@ -1,5 +1,5 @@
 import XCTest
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 @testable import MapboxMaps
 
 final class TileStoreObserverWrapperTests: XCTestCase {
diff --git a/Tests/MapboxMapsTests/Snapshot/Mocks/MockMapSnapshotter.swift b/Tests/MapboxMapsTests/Snapshot/Mocks/MockMapSnapshotter.swift
@@ -1,5 +1,5 @@
 @testable @_spi(Marshalling) import MapboxMaps
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 
 final class MockMapSnapshotter: MockStyleManager, MapSnapshotterProtocol {
 
diff --git a/Tests/MapboxMapsTests/Snapshot/SnapshotterTests.swift b/Tests/MapboxMapsTests/Snapshot/SnapshotterTests.swift
@@ -1,6 +1,6 @@
 import XCTest
 @_spi(Experimental) @_spi(Marshalling) @testable import MapboxMaps
-@_implementationOnly import MapboxCommon_Private
+internal import MapboxCommon_Private
 import CoreLocation
 
 final class SnapshotterTests: XCTestCase {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@_implementationOnly import MapboxCommon_Private`
	`1`	`+internal import MapboxCommon_Private`
`2`	`2`	`import UIKit`
`3`	`3`
`4`	`4`	`internal protocol SimpleCameraAnimatorProtocol: CameraAnimatorProtocol {`