Skip to content

Commit ec5925b

Browse files
committed
[Infra] Move 'mlmodeldownloader' workflow to Xcode 16
1 parent 2cace8c commit ec5925b

8 files changed

+23
-20
lines changed

.github/workflows/mlmodeldownloader.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
target: [ios, tvos, macos, watchos]
2626
build-env:
2727
- os: macos-14
28-
xcode: Xcode_15.2
28+
xcode: Xcode_16.2
2929
- os: macos-15
3030
xcode: Xcode_16.2
3131
runs-on: ${{ matrix.build-env.os }}
@@ -48,7 +48,7 @@ jobs:
4848

4949
mlmodeldownloader-cron-only:
5050
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
51-
runs-on: macos-14
51+
runs-on: macos-15
5252
env:
5353
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
5454
strategy:
@@ -58,6 +58,8 @@ jobs:
5858
steps:
5959
- uses: actions/checkout@v4
6060
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
61+
- name: Xcode
62+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
6163
- name: Setup Bundler
6264
run: scripts/setup_bundler.sh
6365
- name: Configure test keychain
@@ -78,6 +80,8 @@ jobs:
7880
cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
7981
steps:
8082
- uses: actions/checkout@v4
83+
- name: Xcode
84+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
8185
- name: Generate Swift Package.resolved
8286
id: swift_package_resolve
8387
run: |
@@ -99,11 +103,8 @@ jobs:
99103
strategy:
100104
matrix:
101105
include:
102-
- os: macos-13
103-
xcode: Xcode_15.2
104-
target: iOS
105106
- os: macos-14
106-
xcode: Xcode_15.4
107+
xcode: Xcode_16.2
107108
target: iOS
108109
- os: macos-15
109110
xcode: Xcode_16.2
@@ -161,13 +162,15 @@ jobs:
161162
if: github.repository == 'Firebase/firebase-ios-sdk' && (github.event_name == 'schedule' || github.event_name == 'pull_request')
162163
env:
163164
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
164-
runs-on: macos-14
165+
runs-on: macos-15
165166
steps:
166167
- uses: actions/checkout@v4
167168
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
168169
with:
169170
cache_key: build-test${{ matrix.os }}
170171
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
172+
- name: Xcode
173+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
171174
- name: Setup Bundler
172175
run: scripts/setup_bundler.sh
173176
- name: Install GoogleService-Info.plist

FirebaseMLModelDownloader/Sources/DeviceLogger.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import Foundation
1616

17-
@_implementationOnly import FirebaseCoreExtension
17+
internal import FirebaseCoreExtension
1818

1919
/// Enum of log messages.
2020
enum LoggerMessageCode: Int {

FirebaseMLModelDownloader/Sources/DownloaderUserDefaults.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
import Foundation
1616
#if SWIFT_PACKAGE
17-
@_implementationOnly import GoogleUtilities_UserDefaults
17+
internal import GoogleUtilities_UserDefaults
1818
#else
19-
@_implementationOnly import GoogleUtilities
19+
internal import GoogleUtilities
2020
#endif // SWIFT_PACKAGE
2121

2222
/// Protocol to save or delete model info in user defaults.

FirebaseMLModelDownloader/Sources/LocalModelInfo.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
import Foundation
1616
#if SWIFT_PACKAGE
17-
@_implementationOnly import GoogleUtilities_UserDefaults
17+
internal import GoogleUtilities_UserDefaults
1818
#else
19-
@_implementationOnly import GoogleUtilities
19+
internal import GoogleUtilities
2020
#endif // SWIFT_PACKAGE
2121

2222
/// Model info object with details about downloaded and locally available model.

FirebaseMLModelDownloader/Sources/ModelDownloadTask.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
import Foundation
1616
#if SWIFT_PACKAGE
17-
@_implementationOnly import GoogleUtilities_UserDefaults
17+
internal import GoogleUtilities_UserDefaults
1818
#else
19-
@_implementationOnly import GoogleUtilities
19+
internal import GoogleUtilities
2020
#endif // SWIFT_PACKAGE
2121

2222
/// Task to download model file to device.

FirebaseMLModelDownloader/Sources/ModelDownloader.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import FirebaseCore
1616
import FirebaseInstallations
1717
import Foundation
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
/// Possible ways to get a custom model.

FirebaseMLModelDownloader/Tests/Integration/ModelDownloaderIntegrationTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
@testable import FirebaseMLModelDownloader
2424
import XCTest
2525
#if SWIFT_PACKAGE
26-
@_implementationOnly import GoogleUtilities_UserDefaults
26+
internal import GoogleUtilities_UserDefaults
2727
#else
28-
@_implementationOnly import GoogleUtilities
28+
internal import GoogleUtilities
2929
#endif // SWIFT_PACKAGE
3030

3131
extension GULUserDefaults {

FirebaseMLModelDownloader/Tests/Unit/ModelDownloaderUnitTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
@testable import FirebaseMLModelDownloader
2424
import XCTest
2525
#if SWIFT_PACKAGE
26-
@_implementationOnly import GoogleUtilities_UserDefaults
26+
internal import GoogleUtilities_UserDefaults
2727
#else
28-
@_implementationOnly import GoogleUtilities
28+
internal import GoogleUtilities
2929
#endif // SWIFT_PACKAGE
3030

3131
/// Mock options to configure default Firebase app.

0 commit comments

Comments
 (0)