Skip to content

Commit 072c11e

Browse files
committed
[Sessions] Migrate to import access modifiers
1 parent 5003be4 commit 072c11e

17 files changed

+37
-36
lines changed

.github/workflows/sessions.yml

+8-7
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
target: [ios, tvos, macos, watchos]
2727
build-env:
2828
- os: macos-14
29-
xcode: Xcode_15.3
29+
xcode: Xcode_16.2
3030
tests:
3131
# Flaky tests on CI
3232
- os: macos-15
@@ -51,11 +51,13 @@ jobs:
5151
spm-package-resolved:
5252
env:
5353
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
54-
runs-on: macos-14
54+
runs-on: macos-15
5555
outputs:
5656
cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
5757
steps:
5858
- uses: actions/checkout@v4
59+
- name: Xcode
60+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
5961
- name: Generate Swift Package.resolved
6062
id: swift_package_resolve
6163
run: |
@@ -78,11 +80,8 @@ jobs:
7880
strategy:
7981
matrix:
8082
include:
81-
- os: macos-13
82-
xcode: Xcode_15.2
83-
target: iOS
8483
- os: macos-14
85-
xcode: Xcode_15.4
84+
xcode: Xcode_16.2
8685
target: iOS
8786
- os: macos-15
8887
xcode: Xcode_16.2
@@ -128,12 +127,14 @@ jobs:
128127
# Don't run on private repo unless it is a PR.
129128
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
130129

131-
runs-on: macos-14
130+
runs-on: macos-15
132131
steps:
133132
- uses: actions/checkout@v4
134133
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
135134
with:
136135
cache_key: catalyst${{ matrix.os }}
136+
- name: Xcode
137+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
137138
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
138139
- name: Setup Bundler
139140
run: scripts/setup_bundler.sh

FirebaseSessions/Sources/ApplicationInfo.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515

1616
import Foundation
1717

18-
@_implementationOnly import FirebaseCore
18+
internal import FirebaseCore
1919

2020
#if SWIFT_PACKAGE
2121
import FirebaseSessionsObjC
2222
#endif // SWIFT_PACKAGE
2323

2424
#if SWIFT_PACKAGE
25-
@_implementationOnly import GoogleUtilities_Environment
25+
internal import GoogleUtilities_Environment
2626
#else
27-
@_implementationOnly import GoogleUtilities
27+
internal import GoogleUtilities
2828
#endif // SWIFT_PACKAGE
2929

3030
/// Development environment for the application.

FirebaseSessions/Sources/EventGDTLogger.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
import Foundation
1717

18-
@_implementationOnly import GoogleDataTransport
18+
internal import GoogleDataTransport
1919

2020
protocol EventGDTLoggerProtocol {
2121
func logEvent(event: SessionStartEvent, completion: @escaping (Result<Void, Error>) -> Void)

FirebaseSessions/Sources/FirebaseSessions.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
import Foundation
1616

1717
// Avoids exposing internal FirebaseCore APIs to Swift users.
18-
@_implementationOnly import FirebaseCoreExtension
19-
@_implementationOnly import FirebaseInstallations
20-
@_implementationOnly import GoogleDataTransport
18+
internal import FirebaseCoreExtension
19+
internal import FirebaseInstallations
20+
internal import GoogleDataTransport
2121

2222
#if swift(>=6.0)
2323
internal import Promises
2424
#elseif swift(>=5.10)
2525
import Promises
2626
#else
27-
@_implementationOnly import Promises
27+
internal import Promises
2828
#endif
2929

3030
private enum GoogleDataTransportConfig {

FirebaseSessions/Sources/GoogleDataTransport+GoogleDataTransportProtocol.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
import Foundation
1717

18-
@_implementationOnly import GoogleDataTransport
18+
internal import GoogleDataTransport
1919

2020
enum GoogleDataTransportProtocolErrors: Error {
2121
case writeFailure

FirebaseSessions/Sources/Installations+InstallationsProtocol.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
import Foundation
1717

18-
@_implementationOnly import FirebaseInstallations
18+
internal import FirebaseInstallations
1919

2020
protocol InstallationsProtocol {
2121
var installationsWaitTimeInSecond: Int { get }

FirebaseSessions/Sources/Logger.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
import Foundation
1717

18-
@_implementationOnly import FirebaseCoreExtension
18+
internal import FirebaseCoreExtension
1919

2020
///
2121
/// Logger is responsible for printing console logs

FirebaseSessions/Sources/NetworkInfo.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import Foundation
2020
#endif // SWIFT_PACKAGE
2121

2222
#if SWIFT_PACKAGE
23-
@_implementationOnly import GoogleUtilities_Environment
23+
internal import GoogleUtilities_Environment
2424
#else
25-
@_implementationOnly import GoogleUtilities
25+
internal import GoogleUtilities
2626
#endif // SWIFT_PACKAGE
2727

2828
protocol NetworkInfoProtocol {

FirebaseSessions/Sources/SessionGenerator.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
import Foundation
1717

18-
@_implementationOnly import FirebaseInstallations
18+
internal import FirebaseInstallations
1919

2020
struct SessionInfo {
2121
let sessionId: String

FirebaseSessions/Sources/SessionStartEvent.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515

1616
import Foundation
1717

18-
@_implementationOnly import GoogleDataTransport
18+
internal import GoogleDataTransport
1919

2020
#if SWIFT_PACKAGE
2121
import FirebaseSessionsObjC
2222
#endif // SWIFT_PACKAGE
2323

2424
#if SWIFT_PACKAGE
25-
@_implementationOnly import GoogleUtilities_Environment
25+
internal import GoogleUtilities_Environment
2626
#else
27-
@_implementationOnly import GoogleUtilities
27+
internal import GoogleUtilities
2828
#endif // SWIFT_PACKAGE
2929

3030
///

FirebaseSessions/Sources/Settings/SettingsCacheClient.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
import Foundation
1717

1818
#if SWIFT_PACKAGE
19-
@_implementationOnly import GoogleUtilities_UserDefaults
19+
internal import GoogleUtilities_UserDefaults
2020
#else
21-
@_implementationOnly import GoogleUtilities
21+
internal import GoogleUtilities
2222
#endif // SWIFT_PACKAGE
2323

2424
/// CacheKey is like a "key" to a "safe". It provides necessary metadata about the current cache to

FirebaseSessions/Sources/Settings/SettingsDownloadClient.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
import Foundation
1717

1818
#if SWIFT_PACKAGE
19-
@_implementationOnly import GoogleUtilities_Environment
19+
internal import GoogleUtilities_Environment
2020
#else
21-
@_implementationOnly import GoogleUtilities
21+
internal import GoogleUtilities
2222
#endif // SWIFT_PACKAGE
2323

2424
protocol SettingsDownloadClient {

FirebaseSessions/Tests/TestApp/Shared/MockSubscriberSDK.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import FirebaseSessions
1717
import Foundation
1818

1919
// Avoids exposing internal FirebaseCore APIs to Swift users.
20-
@_implementationOnly import FirebaseCoreExtension
20+
internal import FirebaseCoreExtension
2121

2222
@objc(FIRMockSubscriberSDKProtocol)
2323
protocol MockSubscriberSDKProtocol {

FirebaseSessions/Tests/Unit/Mocks/MockApplicationInfo.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
import Foundation
1717

1818
#if SWIFT_PACKAGE
19-
@_implementationOnly import GoogleUtilities_Environment
19+
internal import GoogleUtilities_Environment
2020
#else
21-
@_implementationOnly import GoogleUtilities
21+
internal import GoogleUtilities
2222
#endif // SWIFT_PACKAGE
2323

2424
@testable import FirebaseSessions

FirebaseSessions/Tests/Unit/Mocks/MockInstallationsProtocol.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// See the License for the specific language governing permissions and
1414
// limitations under the License.
1515

16-
@_implementationOnly import FirebaseInstallations
16+
internal import FirebaseInstallations
1717

1818
@testable import FirebaseSessions
1919

FirebaseSessions/Tests/Unit/Mocks/MockNetworkInfo.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
import Foundation
1717

1818
#if SWIFT_PACKAGE
19-
@_implementationOnly import GoogleUtilities_Environment
19+
internal import GoogleUtilities_Environment
2020
#else
21-
@_implementationOnly import GoogleUtilities
21+
internal import GoogleUtilities
2222
#endif // SWIFT_PACKAGE
2323

2424
@testable import FirebaseSessions

FirebaseSessions/Tests/Unit/SessionStartEventTests.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import XCTest
2020
#endif // SWIFT_PACKAGE
2121

2222
#if SWIFT_PACKAGE
23-
@_implementationOnly import GoogleUtilities_Environment
23+
internal import GoogleUtilities_Environment
2424
#else
25-
@_implementationOnly import GoogleUtilities
25+
internal import GoogleUtilities
2626
#endif // SWIFT_PACKAGE
2727

2828
@testable import FirebaseSessions

0 commit comments

Comments
 (0)