Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
script: flutter test integration_test/firebase_ui_test.dart --dart-define=CI=true -d emulator-5554

ios:
runs-on: macos-latest
runs-on: macos-15
timeout-minutes: 45
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
Expand Down Expand Up @@ -126,8 +126,8 @@ jobs:
id: pods-cache
with:
path: tests/ios/Pods
key: ${{ runner.os }}-pods-v3-${{ hashFiles('tests/ios/Podfile.lock') }}
restore-keys: ${{ runner.os }}-ios-pods-v2
key: ${{ runner.os }}-pods-v4-${{ hashFiles('tests/ios/Podfile.lock') }}
restore-keys: ${{ runner.os }}-ios-pods-v3
- name: "Install Tools"
run: sudo npm i -g firebase-tools
- name: Firebase Emulator Cache
Expand Down Expand Up @@ -172,7 +172,7 @@ jobs:
id: simulator
with:
# List of available simulators: https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md#installed-simulators
model: "iPhone 15"
model: "iPhone 16"
- name: "E2E Tests"
working-directory: tests
env:
Expand All @@ -183,7 +183,7 @@ jobs:
flutter test ./integration_test/firebase_ui_test.dart -d "$SIMULATOR" --dart-define=CI=true

macos:
runs-on: macos-latest
runs-on: macos-15
timeout-minutes: 45
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
Expand All @@ -205,8 +205,8 @@ jobs:
id: pods-cache
with:
path: tests/macos/Pods
key: ${{ runner.os }}-pods-v2-${{ hashFiles('tests/macos/Podfile.lock') }}
restore-keys: ${{ runner.os }}-macos-pods-v1
key: ${{ runner.os }}-pods-v4-${{ hashFiles('tests/macos/Podfile.lock') }}
restore-keys: ${{ runner.os }}-macos-pods-v3
- name: "Install Tools"
run: sudo npm i -g firebase-tools
- name: Cache Firebase Emulator
Expand Down
4 changes: 2 additions & 2 deletions packages/firebase_ui_auth/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ environment:

dependencies:
cupertino_icons: ^1.0.6
firebase_auth: ^5.6.0
firebase_core: ^3.14.0
firebase_auth: ^5.7.0
firebase_core: ^3.15.2
flutter:
sdk: flutter
flutter_localizations:
Expand Down
6 changes: 3 additions & 3 deletions packages/firebase_ui_auth/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ environment:

dependencies:
email_validator: ^2.1.17
firebase_auth: ^5.6.0
firebase_core: ^3.14.0
firebase_dynamic_links: ^6.1.7
firebase_auth: ^5.7.0
firebase_core: ^3.15.2
firebase_dynamic_links: ^6.1.10
firebase_ui_localizations: ^1.14.0
firebase_ui_oauth: ^1.7.0
firebase_ui_shared: ^1.4.1
Expand Down
4 changes: 2 additions & 2 deletions packages/firebase_ui_database/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ dependencies:
# The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^1.0.6
firebase_core: ^3.14.0
firebase_database: ^11.3.7
firebase_core: ^3.15.2
firebase_database: ^11.3.10
dev_dependencies:
drive: ^1.0.0-1.0.nullsafety.5
flutter_test:
Expand Down
2 changes: 1 addition & 1 deletion packages/firebase_ui_database/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ environment:

dependencies:
collection: ^1.18.0
firebase_database: ^11.3.7
firebase_database: ^11.3.10
firebase_ui_localizations: ^1.14.0
flutter:
sdk: flutter
Expand Down
4 changes: 2 additions & 2 deletions packages/firebase_ui_firestore/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ dependencies:
flutter:
sdk: flutter
firebase_ui_firestore: ^1.7.2
cloud_firestore: ^5.6.9
cloud_firestore: ^5.6.12
cupertino_icons: ^1.0.6
firebase_core: ^3.14.0
firebase_core: ^3.15.2
dev_dependencies:
drive: ^1.0.0-1.0.nullsafety.5
flutter_test:
Expand Down
2 changes: 1 addition & 1 deletion packages/firebase_ui_firestore/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ environment:
flutter: ">=3.3.0"

dependencies:
cloud_firestore: ^5.6.9
cloud_firestore: ^5.6.12
firebase_ui_localizations: ^1.14.0
firebase_ui_shared: ^1.4.1
flutter:
Expand Down
2 changes: 1 addition & 1 deletion packages/firebase_ui_localizations/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ environment:
dependencies:
cupertino_icons: ^1.0.6

firebase_core: ^3.14.0
firebase_core: ^3.15.2
firebase_ui_auth: ^1.17.0
firebase_ui_localizations: ^1.14.0
flutter:
Expand Down
4 changes: 2 additions & 2 deletions packages/firebase_ui_oauth/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ dependencies:
# The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^1.0.6
firebase_auth: ^5.6.0
firebase_core: ^3.14.0
firebase_auth: ^5.7.0
firebase_core: ^3.15.2
firebase_ui_oauth: ^1.7.0
firebase_ui_oauth_apple: ^1.3.2
firebase_ui_oauth_facebook: ^1.3.2
Expand Down
2 changes: 1 addition & 1 deletion packages/firebase_ui_oauth/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ environment:

dependencies:
desktop_webview_auth: ^0.0.14
firebase_auth: ^5.6.0
firebase_auth: ^5.7.0
firebase_ui_auth: ^1.17.0
firebase_ui_shared: ^1.4.1
flutter_svg: ^2.0.9
Expand Down
2 changes: 1 addition & 1 deletion packages/firebase_ui_oauth_apple/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ environment:
flutter: ">=3.3.0"

dependencies:
firebase_auth: ^5.6.0
firebase_auth: ^5.7.0
firebase_ui_oauth: ^1.7.0
flutter:
sdk: flutter
Expand Down
2 changes: 1 addition & 1 deletion packages/firebase_ui_oauth_facebook/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ environment:
flutter: ">=3.3.0"

dependencies:
firebase_auth: ^5.6.0
firebase_auth: ^5.7.0
firebase_ui_oauth: ^1.7.0
flutter:
sdk: flutter
Expand Down
2 changes: 1 addition & 1 deletion packages/firebase_ui_oauth_google/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ environment:
flutter: ">=3.3.0"

dependencies:
firebase_auth: ^5.6.0
firebase_auth: ^5.7.0
firebase_ui_oauth: ^1.7.0
flutter:
sdk: flutter
Expand Down
2 changes: 1 addition & 1 deletion packages/firebase_ui_oauth_twitter/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ environment:
dependencies:
flutter:
sdk: flutter
firebase_auth: ^5.6.0
firebase_auth: ^5.7.0
firebase_ui_oauth: ^1.7.0
twitter_login: ^4.4.2

Expand Down
4 changes: 2 additions & 2 deletions packages/firebase_ui_storage/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ environment:
dependencies:
cupertino_icons: ^1.0.6
file_picker: ^6.1.1
firebase_core: ^3.14.0
firebase_storage: ^12.4.7
firebase_core: ^3.15.2
firebase_storage: ^12.4.10
firebase_ui_storage: ^2.1.2
firebase_ui_shared: ^1.4.1

Expand Down
2 changes: 1 addition & 1 deletion packages/firebase_ui_storage/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ false_secrets:
dependencies:
flutter:
sdk: flutter
firebase_storage: ^12.4.7
firebase_storage: ^12.4.10
firebase_ui_localizations: ^1.14.0
firebase_ui_shared: ^1.4.1
path: ^1.8.3
Expand Down
2 changes: 2 additions & 0 deletions tests/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
*.swp
.DS_Store
.atom/
.build/
.buildlog/
.history
.svn/
.swiftpm/
migrate_working_dir/

# IntelliJ related
Expand Down
2 changes: 1 addition & 1 deletion tests/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ flutter_ios_podfile_setup
target 'Runner' do
use_frameworks!
use_modular_headers!
pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '11.13.0'
pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '11.15.0'

flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
target 'RunnerTests' do
Expand Down
8 changes: 7 additions & 1 deletion tests/macos/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ target 'Runner' do
use_frameworks!
use_modular_headers!

pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '11.13.0'
pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '11.15.0'

flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
target 'RunnerTests' do
Expand All @@ -41,5 +41,11 @@ end
post_install do |installer|
installer.pods_project.targets.each do |target|
flutter_additional_macos_build_settings(target)

target.build_configurations.each do |config|
if config.build_settings['MACOSX_DEPLOYMENT_TARGET'].to_f < 10.13
config.build_settings['MACOSX_DEPLOYMENT_TARGET'] = '10.13'
end
end
end
end
2 changes: 1 addition & 1 deletion tests/macos/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0920;
LastUpgradeCheck = 1430;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
331C80D4294CF70F00263BE5 = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1430"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -59,6 +59,7 @@
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
enableGPUValidationMode = "1"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand Down
6 changes: 5 additions & 1 deletion tests/macos/Runner/AppDelegate.swift
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import Cocoa
import FlutterMacOS

@NSApplicationMain
@main
class AppDelegate: FlutterAppDelegate {
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
return true
}

override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
return true
}
}
9 changes: 5 additions & 4 deletions tests/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ dependencies:
flutter:
sdk: flutter
cupertino_icons: ^1.0.6
firebase_auth: ^5.6.0
firebase_core: ^3.14.0
firebase_auth: ^5.7.0
firebase_core: ^3.15.2
firebase_ui_auth: ^1.17.0
firebase_ui_localizations: ^1.14.0
firebase_ui_oauth_apple: ^1.3.2
Expand All @@ -21,12 +21,12 @@ dependencies:
flutter_facebook_auth: ^6.0.3
twitter_login: ^4.4.2
firebase_ui_oauth_twitter: ^1.3.2
cloud_firestore: ^5.6.9
cloud_firestore: ^5.6.12
firebase_ui_firestore: ^1.7.2
http: ^1.1.2
google_sign_in: ^6.2.1
firebase_ui_shared: ^1.4.1
firebase_database: ^11.3.7
firebase_database: ^11.3.10
firebase_ui_database: ^1.5.2

dev_dependencies:
Expand All @@ -39,3 +39,4 @@ dev_dependencies:

flutter:
uses-material-design: true
disable-swift-package-manager: true
Loading