From 1496e78aa7dd8ad90ba7efbd3956acb8b3c6e6a9 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Mon, 30 Oct 2023 13:09:28 -0700 Subject: [PATCH 1/2] fix(package_info_plus): migrate web to pkg:web --- .../package_info_plus/lib/src/file_version_info.dart | 2 +- .../package_info_plus/lib/src/package_info_plus_web.dart | 6 +++--- packages/package_info_plus/package_info_plus/pubspec.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/package_info_plus/package_info_plus/lib/src/file_version_info.dart b/packages/package_info_plus/package_info_plus/lib/src/file_version_info.dart index ab5c4b4bf0..3e383a8da9 100644 --- a/packages/package_info_plus/package_info_plus/lib/src/file_version_info.dart +++ b/packages/package_info_plus/package_info_plus/lib/src/file_version_info.dart @@ -12,7 +12,7 @@ import 'dart:io'; import 'package:ffi/ffi.dart'; import 'package:win32/win32.dart'; -class LANGANDCODEPAGE extends Struct { +base class LANGANDCODEPAGE extends Struct { @WORD() external int wLanguage; diff --git a/packages/package_info_plus/package_info_plus/lib/src/package_info_plus_web.dart b/packages/package_info_plus/package_info_plus/lib/src/package_info_plus_web.dart index 21a4a3b793..bda9a39f66 100644 --- a/packages/package_info_plus/package_info_plus/lib/src/package_info_plus_web.dart +++ b/packages/package_info_plus/package_info_plus/lib/src/package_info_plus_web.dart @@ -1,10 +1,10 @@ import 'dart:convert'; -import 'dart:html'; import 'package:flutter_web_plugins/flutter_web_plugins.dart'; import 'package:http/http.dart'; import 'package:package_info_plus_platform_interface/package_info_data.dart'; import 'package:package_info_plus_platform_interface/package_info_platform_interface.dart'; +import 'package:web/helpers.dart' as web; /// The web implementation of [PackageInfoPlatform]. /// @@ -51,8 +51,8 @@ class PackageInfoPlusWebPlugin extends PackageInfoPlatform { @override Future getAll() async { final cacheBuster = DateTime.now().millisecondsSinceEpoch; - final url = versionJsonUrl(window.document.baseUri!, cacheBuster); - final response = _client == null ? await get(url) : await _client!.get(url); + final url = versionJsonUrl(web.window.document.baseURI, cacheBuster); + final response = _client == null ? await get(url) : await _client.get(url); final versionMap = _getVersionMap(response); return PackageInfoData( diff --git a/packages/package_info_plus/package_info_plus/pubspec.yaml b/packages/package_info_plus/package_info_plus/pubspec.yaml index ed1f416a0f..b069e47df2 100644 --- a/packages/package_info_plus/package_info_plus/pubspec.yaml +++ b/packages/package_info_plus/package_info_plus/pubspec.yaml @@ -33,6 +33,7 @@ dependencies: meta: ^1.8.0 path: ^1.8.2 package_info_plus_platform_interface: ^2.0.1 + web: '>=0.3.0 <0.5.0' # win32 is compatible across v4 and v5 for Win32 only (not COM) win32: ">=4.0.0 <6.0.0" @@ -44,5 +45,4 @@ dev_dependencies: test: ^1.22.0 environment: - sdk: ">=2.18.0 <4.0.0" - flutter: ">=3.3.0" + sdk: ^3.2.0 From 9031791def7d2e84c8f58621afc1d840923d4daa Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Fri, 17 Nov 2023 09:55:27 -0800 Subject: [PATCH 2/2] Update pubspec.yaml --- packages/package_info_plus/package_info_plus/pubspec.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/package_info_plus/package_info_plus/pubspec.yaml b/packages/package_info_plus/package_info_plus/pubspec.yaml index b069e47df2..45f56e1a82 100644 --- a/packages/package_info_plus/package_info_plus/pubspec.yaml +++ b/packages/package_info_plus/package_info_plus/pubspec.yaml @@ -46,3 +46,4 @@ dev_dependencies: environment: sdk: ^3.2.0 + flutter: '>=3.6.0'