From 00336946a8003fb5de787c75fc3a81d6e5f3450a Mon Sep 17 00:00:00 2001 From: Maneesh Tewani Date: Thu, 24 Apr 2025 10:31:44 -0700 Subject: [PATCH 1/4] Included platform detection changes --- .../lib/src/common/common_library.dart | 6 +++++- .../test/src/common/common_library_test.dart | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/common/common_library.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/common/common_library.dart index c44dbf6eb97c..0ec372a60afb 100644 --- a/packages/firebase_data_connect/firebase_data_connect/lib/src/common/common_library.dart +++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/common/common_library.dart @@ -16,6 +16,10 @@ import 'dart:convert'; import 'package:firebase_app_check/firebase_app_check.dart'; +import 'dart:io' show Platform; + +import 'package:flutter/foundation.dart'; + part 'dataconnect_error.dart'; part 'dataconnect_options.dart'; @@ -26,7 +30,7 @@ String getGoogApiVal(CallerSDKType sdkType, String packageVersion) { if (sdkType == CallerSDKType.generated) { apiClientValue += ' dart/gen'; } - return apiClientValue; + return '$apiClientValue ${kIsWeb ? ' web' : Platform.operatingSystem}'; } String getFirebaseClientVal(String packageVersion) { diff --git a/packages/firebase_data_connect/firebase_data_connect/test/src/common/common_library_test.dart b/packages/firebase_data_connect/firebase_data_connect/test/src/common/common_library_test.dart index d87e02fd8ef3..b9f90e2f8b97 100644 --- a/packages/firebase_data_connect/firebase_data_connect/test/src/common/common_library_test.dart +++ b/packages/firebase_data_connect/firebase_data_connect/test/src/common/common_library_test.dart @@ -17,6 +17,7 @@ import 'package:firebase_data_connect/firebase_data_connect.dart'; import 'package:firebase_data_connect/src/common/common_library.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; +import 'dart:io' show Platform; // Mock classes for Firebase dependencies @@ -28,14 +29,14 @@ void main() { const packageVersion = '1.0.0'; expect( getGoogApiVal(CallerSDKType.core, packageVersion), - 'gl-dart/$packageVersion fire/$packageVersion', + 'gl-dart/$packageVersion fire/$packageVersion ${Platform.operatingSystem}', ); }); test('should return codegen suffix if using gen sdk', () { const packageVersion = '1.0.0'; expect( getGoogApiVal(CallerSDKType.generated, packageVersion), - 'gl-dart/$packageVersion fire/$packageVersion dart/gen', + 'gl-dart/$packageVersion fire/$packageVersion dart/gen ${Platform.operatingSystem}', ); }); }); From 673f90bdda23b5b68443153754568bd1a23d716e Mon Sep 17 00:00:00 2001 From: Maneesh Tewani Date: Thu, 1 May 2025 16:34:53 -0700 Subject: [PATCH 2/4] Addressed comments --- .../firebase_data_connect/lib/src/common/common_library.dart | 2 +- .../test/src/common/common_library_test.dart | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/common/common_library.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/common/common_library.dart index 0ec372a60afb..f35d722e69f0 100644 --- a/packages/firebase_data_connect/firebase_data_connect/lib/src/common/common_library.dart +++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/common/common_library.dart @@ -30,7 +30,7 @@ String getGoogApiVal(CallerSDKType sdkType, String packageVersion) { if (sdkType == CallerSDKType.generated) { apiClientValue += ' dart/gen'; } - return '$apiClientValue ${kIsWeb ? ' web' : Platform.operatingSystem}'; + return '$apiClientValue platform/${kIsWeb ? ' web' : Platform.operatingSystem}'; } String getFirebaseClientVal(String packageVersion) { diff --git a/packages/firebase_data_connect/firebase_data_connect/test/src/common/common_library_test.dart b/packages/firebase_data_connect/firebase_data_connect/test/src/common/common_library_test.dart index b9f90e2f8b97..e0b42c0cc87f 100644 --- a/packages/firebase_data_connect/firebase_data_connect/test/src/common/common_library_test.dart +++ b/packages/firebase_data_connect/firebase_data_connect/test/src/common/common_library_test.dart @@ -29,14 +29,14 @@ void main() { const packageVersion = '1.0.0'; expect( getGoogApiVal(CallerSDKType.core, packageVersion), - 'gl-dart/$packageVersion fire/$packageVersion ${Platform.operatingSystem}', + 'gl-dart/$packageVersion fire/$packageVersion platform/${Platform.operatingSystem}', ); }); test('should return codegen suffix if using gen sdk', () { const packageVersion = '1.0.0'; expect( getGoogApiVal(CallerSDKType.generated, packageVersion), - 'gl-dart/$packageVersion fire/$packageVersion dart/gen ${Platform.operatingSystem}', + 'gl-dart/$packageVersion fire/$packageVersion dart/gen platform/${Platform.operatingSystem}', ); }); }); From 3a4c2ec4ada23b6f9502835cbaff17ba472f6ce4 Mon Sep 17 00:00:00 2001 From: Maneesh Tewani Date: Fri, 2 May 2025 13:15:11 -0700 Subject: [PATCH 3/4] Fixed test --- .../firebase_data_connect/lib/src/common/common_library.dart | 2 +- .../test/src/common/common_library_test.dart | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/common/common_library.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/common/common_library.dart index f35d722e69f0..72e1af52fdb9 100644 --- a/packages/firebase_data_connect/firebase_data_connect/lib/src/common/common_library.dart +++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/common/common_library.dart @@ -30,7 +30,7 @@ String getGoogApiVal(CallerSDKType sdkType, String packageVersion) { if (sdkType == CallerSDKType.generated) { apiClientValue += ' dart/gen'; } - return '$apiClientValue platform/${kIsWeb ? ' web' : Platform.operatingSystem}'; + return '$apiClientValue gl-${kIsWeb ? ' web' : Platform.operatingSystem}'; } String getFirebaseClientVal(String packageVersion) { diff --git a/packages/firebase_data_connect/firebase_data_connect/test/src/common/common_library_test.dart b/packages/firebase_data_connect/firebase_data_connect/test/src/common/common_library_test.dart index e0b42c0cc87f..5ab20c284909 100644 --- a/packages/firebase_data_connect/firebase_data_connect/test/src/common/common_library_test.dart +++ b/packages/firebase_data_connect/firebase_data_connect/test/src/common/common_library_test.dart @@ -29,14 +29,14 @@ void main() { const packageVersion = '1.0.0'; expect( getGoogApiVal(CallerSDKType.core, packageVersion), - 'gl-dart/$packageVersion fire/$packageVersion platform/${Platform.operatingSystem}', + 'gl-dart/$packageVersion fire/$packageVersion gl-${Platform.operatingSystem}', ); }); test('should return codegen suffix if using gen sdk', () { const packageVersion = '1.0.0'; expect( getGoogApiVal(CallerSDKType.generated, packageVersion), - 'gl-dart/$packageVersion fire/$packageVersion dart/gen platform/${Platform.operatingSystem}', + 'gl-dart/$packageVersion fire/$packageVersion dart/gen gl-${Platform.operatingSystem}', ); }); }); From fdfaf0785bad7fa0a06ec9fe6bd2869dfb5a9914 Mon Sep 17 00:00:00 2001 From: Maneesh Tewani Date: Mon, 5 May 2025 10:29:05 -0700 Subject: [PATCH 4/4] Removed space for web --- .../firebase_data_connect/lib/src/common/common_library.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/common/common_library.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/common/common_library.dart index 72e1af52fdb9..72d30afc87c0 100644 --- a/packages/firebase_data_connect/firebase_data_connect/lib/src/common/common_library.dart +++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/common/common_library.dart @@ -30,7 +30,7 @@ String getGoogApiVal(CallerSDKType sdkType, String packageVersion) { if (sdkType == CallerSDKType.generated) { apiClientValue += ' dart/gen'; } - return '$apiClientValue gl-${kIsWeb ? ' web' : Platform.operatingSystem}'; + return '$apiClientValue gl-${kIsWeb ? 'web' : Platform.operatingSystem}'; } String getFirebaseClientVal(String packageVersion) {