From 1c1b0ef902b4c1b2557e330d667fc7037b5f70ba Mon Sep 17 00:00:00 2001 From: russellwheatley Date: Thu, 7 Nov 2024 10:48:41 +0000 Subject: [PATCH 1/3] fix(core, ios): ensure iOS SDK can be found from Package.swift --- .../firebase_core/ios/firebase_core/Package.swift | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/firebase_core/firebase_core/ios/firebase_core/Package.swift b/packages/firebase_core/firebase_core/ios/firebase_core/Package.swift index 5d4cd0f52b5f..b183c3ad6e3b 100644 --- a/packages/firebase_core/firebase_core/ios/firebase_core/Package.swift +++ b/packages/firebase_core/firebase_core/ios/firebase_core/Package.swift @@ -14,11 +14,11 @@ enum ConfigurationError: Error { case invalidFormat(String) } -let iosRootDirectory = String(URL(string: #file)!.deletingLastPathComponent().absoluteString +let firebaseCoreDirectory = String(URL(string: #file)!.deletingLastPathComponent().absoluteString .dropLast()) func loadPubspecVersion() throws -> String { - let pubspecPath = NSString.path(withComponents: [iosRootDirectory, "..", "..", "pubspec.yaml"]) + let pubspecPath = NSString.path(withComponents: [firebaseCoreDirectory, "..", "..", "pubspec.yaml"]) do { let yamlString = try String(contentsOfFile: pubspecPath, encoding: .utf8) if let versionLine = yamlString.split(separator: "\n") @@ -35,12 +35,8 @@ func loadPubspecVersion() throws -> String { func loadFirebaseSDKVersion() throws -> String { let firebaseCoreScriptPath = NSString.path(withComponents: [ - iosRootDirectory, + firebaseCoreDirectory, "..", - "..", - "..", - "firebase_core", - "ios", "firebase_sdk_version.rb", ]) do { From d51202a2d207a7590be76ddd40757436c049740f Mon Sep 17 00:00:00 2001 From: russellwheatley Date: Thu, 7 Nov 2024 10:49:00 +0000 Subject: [PATCH 2/3] test: increase time of swift integration --- .github/workflows/all_plugins.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/all_plugins.yaml b/.github/workflows/all_plugins.yaml index 19d75336427e..9b04276ad40d 100644 --- a/.github/workflows/all_plugins.yaml +++ b/.github/workflows/all_plugins.yaml @@ -124,7 +124,7 @@ jobs: "flutter build web" swift-integration: runs-on: macos-latest - timeout-minutes: 10 + timeout-minutes: 30 steps: - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225 @@ -135,10 +135,10 @@ jobs: with: melos-version: '5.3.0' - name: 'Swift Integration Setup' - run: flutter config --enable-swift-package-manager + run: flutter config --enable-swift-package-manager - name: 'Build Apps with Swift Package Manager' run: ./.github/workflows/scripts/swift-integration.sh - + test: runs-on: ubuntu-latest timeout-minutes: 30 From a7c9c48dbae7defee578643ab6a0164dc82128c5 Mon Sep 17 00:00:00 2001 From: russellwheatley Date: Thu, 7 Nov 2024 11:00:57 +0000 Subject: [PATCH 3/3] chore: format --- .../firebase_core/ios/firebase_core/Package.swift | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/firebase_core/firebase_core/ios/firebase_core/Package.swift b/packages/firebase_core/firebase_core/ios/firebase_core/Package.swift index b183c3ad6e3b..1e555687d7c1 100644 --- a/packages/firebase_core/firebase_core/ios/firebase_core/Package.swift +++ b/packages/firebase_core/firebase_core/ios/firebase_core/Package.swift @@ -18,7 +18,12 @@ let firebaseCoreDirectory = String(URL(string: #file)!.deletingLastPathComponent .dropLast()) func loadPubspecVersion() throws -> String { - let pubspecPath = NSString.path(withComponents: [firebaseCoreDirectory, "..", "..", "pubspec.yaml"]) + let pubspecPath = NSString.path(withComponents: [ + firebaseCoreDirectory, + "..", + "..", + "pubspec.yaml", + ]) do { let yamlString = try String(contentsOfFile: pubspecPath, encoding: .utf8) if let versionLine = yamlString.split(separator: "\n")