Skip to content

feat: update dependencies to latest + remove discontinued pubspec #398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 13, 2025
Merged

feat: update dependencies to latest + remove discontinued pubspec #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67ae173
feat: update dependencies to latest + rm discontinued pubspec
russellwheatley Jun 12, 2025
a87eae6
Merge branch 'main' into bump-dependencies
russellwheatley Jun 13, 2025
e354dc8
chore: rm pubspec package from CLI
russellwheatley Jun 13, 2025
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
25 changes: 7 additions & 18 deletions packages/flutterfire_cli/lib/src/common/package.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import 'dart:io';

import 'package:pubspec/pubspec.dart';
import 'package:pubspec_parse/pubspec_parse.dart';

import 'strings.dart';
import 'utils.dart';
Expand Down Expand Up @@ -46,14 +46,16 @@ class Package {
}

final String path;
final PubSpec pubSpec;
final Pubspec pubSpec;

/// Loads the package located in the [projectDirectory]
static Future<Package> load(Directory projectDirectory) async {
if (!File(pubspecPathForDirectory(projectDirectory)).existsSync()) {
final pubspecFile = File(pubspecPathForDirectory(projectDirectory));
if (!pubspecFile.existsSync()) {
throw FlutterAppRequiredException();
}
final pubSpec = await PubSpec.load(projectDirectory);
final pubspecContent = await pubspecFile.readAsString();
final pubSpec = Pubspec.parse(pubspecContent);
return Package(
path: projectDirectory.path,
pubSpec: pubSpec,
Expand Down Expand Up @@ -90,18 +92,5 @@ class Package {

/// Returns whether this package is a Flutter plugin.
/// This is determined by whether the pubspec contains a flutter.plugin definition.
bool get isFlutterPlugin => pubSpec.flutter?.isPlugin ?? false;
}

extension on PubSpec {
Flutter? get flutter =>
(unParsedYaml?['flutter'] as Map<Object?, Object?>?).let(Flutter.new);
}

class Flutter {
Flutter(this._flutter);

final Map<Object?, Object?> _flutter;

bool get isPlugin => _flutter['plugin'] != null;
bool get isFlutterPlugin => pubSpec.flutter?.containsKey('plugin') ?? false;
}
2 changes: 1 addition & 1 deletion packages/flutterfire_cli/lib/src/firebase/firebase_android_options.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ extension FirebaseAndroidOptions on FirebaseOptions {
);
final firebaseApp = await firebase.findOrCreateFirebaseApp(
packageNameOrBundleIdentifier: selectedAndroidApplicationId,
displayName: flutterApp.package.pubSpec.name ?? 'flutterfire_app',
displayName: flutterApp.package.pubSpec.name,
platform: kAndroid,
project: firebaseProjectId,
account: firebaseAccount,
Expand Down
6 changes: 3 additions & 3 deletions packages/flutterfire_cli/lib/src/firebase/firebase_android_writes.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import 'dart:io';
import 'package:cli_util/cli_logging.dart';
import 'package:collection/collection.dart';
import 'package:path/path.dart' as path;
import 'package:pubspec/pubspec.dart';
import 'package:yaml/yaml.dart';
import '../common/strings.dart';
import '../common/utils.dart';
Expand Down Expand Up @@ -1104,8 +1103,9 @@ Future<FirebasePubSpecModel> getFirebaseCorePubSpec() async {

final firebaseCorePubspecFile =
pubspecPathForDirectory(firebaseCoreDirectory);
final pubSpec = await PubSpec.loadFile(firebaseCorePubspecFile);
final unparsedJson = pubSpec.unParsedYaml?['firebase'] as YamlMap?;
final content = await File(firebaseCorePubspecFile).readAsString();
final yamlMap = loadYaml(content) as YamlMap;
final unparsedJson = yamlMap['firebase'] as YamlMap?;
if (unparsedJson != null) {
return FirebasePubSpecModel.fromJson(
unparsedJson.cast<String, dynamic>(),
Expand Down
2 changes: 1 addition & 1 deletion packages/flutterfire_cli/lib/src/firebase/firebase_apple_options.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ extension FirebaseAppleOptions on FirebaseOptions {
);
final firebaseApp = await firebase.findOrCreateFirebaseApp(
packageNameOrBundleIdentifier: selectedAppleBundleId,
displayName: flutterApp.package.pubSpec.name ?? 'flutterfire_app',
displayName: flutterApp.package.pubSpec.name,
platform: platformIdentifier,
project: firebaseProjectId,
account: firebaseAccount,
Expand Down
2 changes: 1 addition & 1 deletion packages/flutterfire_cli/lib/src/firebase/firebase_dart_options.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ extension FirebaseDartOptions on FirebaseOptions {
required String? serviceAccount,
}) async {
final firebaseApp = await firebase.findOrCreateFirebaseApp(
displayName: flutterApp.package.pubSpec.name ?? 'flutterfire_app',
displayName: flutterApp.package.pubSpec.name,
platform: platform,
project: firebaseProjectId,
account: firebaseAccount,
Expand Down
14 changes: 7 additions & 7 deletions packages/flutterfire_cli/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@ environment:

dependencies:
ansi_styles: ^0.3.2+1
args: ^2.3.0
args: ^2.7.0
ci: ^0.1.0
cli_util: ^0.4.0
collection: ^1.18.0
deep_pick: ^1.0.0
file: ^7.0.0
http: ^1.2.1
http: ^1.4.0
interact: ^2.2.0
meta: ^1.7.0
meta: ^1.17.0
path: ^1.8.0
platform: ^3.0.2
pub_updater: ^0.4.0
pubspec: ^2.1.0
pub_updater: ^0.5.0
pubspec_parse: ^1.5.0
xml: ^6.1.0
yaml: ^3.1.2

dev_dependencies:
googleapis_auth: ^1.4.0
test: ^1.24.3
googleapis_auth: ^2.0.0
test: ^1.26.2
executables:
flutterfire:

Expand Down
27 changes: 16 additions & 11 deletions packages/flutterfire_cli/test/install_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'dart:io';

import 'package:path/path.dart' as p;
import 'package:pubspec/pubspec.dart';
import 'package:pubspec_parse/pubspec_parse.dart';
import 'package:test/test.dart';

import 'test_utils.dart';
Expand Down Expand Up @@ -34,8 +34,9 @@ void main() {
fail(result.stderr as String);
}

final parsedPubspec =
await PubSpec.loadFile(p.join(projectPath!, 'pubspec.yaml'));
final parsedPubspec = Pubspec.parse(
await File(p.join(projectPath!, 'pubspec.yaml')).readAsString(),
);

expect(parsedPubspec.dependencies['firebase_auth'], isNotNull);
expect(parsedPubspec.dependencies['firebase_core'], isNotNull);
Expand Down Expand Up @@ -91,8 +92,9 @@ void main() {
fail(result.stderr as String);
}

final parsedPubspec =
await PubSpec.loadFile(p.join(projectPath!, 'pubspec.yaml'));
final parsedPubspec = Pubspec.parse(
await File(p.join(projectPath!, 'pubspec.yaml')).readAsString(),
);

expect(parsedPubspec.dependencies['firebase_auth'], isNotNull);
expect(parsedPubspec.dependencies['firebase_core'], isNotNull);
Expand All @@ -115,8 +117,9 @@ void main() {
fail(result2.stderr as String);
}

final parsedPubspec2 =
await PubSpec.loadFile(p.join(projectPath!, 'pubspec.yaml'));
final parsedPubspec2 = Pubspec.parse(
await File(p.join(projectPath!, 'pubspec.yaml')).readAsString(),
);

expect(parsedPubspec2.dependencies['firebase_auth'], isNull);
expect(parsedPubspec2.dependencies['firebase_core'], isNotNull);
Expand Down Expand Up @@ -147,8 +150,9 @@ void main() {
fail(result.stderr as String);
}

final parsedPubspec =
await PubSpec.loadFile(p.join(projectPath!, 'pubspec.yaml'));
final parsedPubspec = Pubspec.parse(
await File(p.join(projectPath!, 'pubspec.yaml')).readAsString(),
);

expect(parsedPubspec.dependencies['firebase_auth'], isNotNull);
expect(parsedPubspec.dependencies['firebase_core'], isNotNull);
Expand All @@ -171,8 +175,9 @@ void main() {
fail(result2.stderr as String);
}

final parsedPubspec2 =
await PubSpec.loadFile(p.join(projectPath!, 'pubspec.yaml'));
final parsedPubspec2 = Pubspec.parse(
await File(p.join(projectPath!, 'pubspec.yaml')).readAsString(),
);

expect(parsedPubspec2.dependencies['firebase_auth'], isNotNull);
expect(parsedPubspec2.dependencies['firebase_core'], isNotNull);
Expand Down
Loading