From caf1a600cfde28b3f4a0d6ba6a83baaee873e488 Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Fri, 1 Oct 2021 09:17:56 +0200 Subject: [PATCH 1/3] ci: upgrade flutter from 2.2.1 to 2.5.2 --- .github/workflows/all_plugins.yaml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/all_plugins.yaml b/.github/workflows/all_plugins.yaml index 459db4f615..4cdf704632 100644 --- a/.github/workflows/all_plugins.yaml +++ b/.github/workflows/all_plugins.yaml @@ -20,7 +20,7 @@ jobs: - name: "Install Flutter" uses: subosito/flutter-action@v1 with: - flutter-version: "2.2.1" + flutter-version: "2.5.2" - name: "Install Tools" run: | flutter pub global activate melos @@ -33,7 +33,6 @@ jobs: - name: "Pub Check" run: | melos run lint:pub - format: runs-on: ubuntu-latest timeout-minutes: 30 @@ -45,13 +44,13 @@ jobs: - name: "Install Flutter" uses: subosito/flutter-action@v1 with: - flutter-version: "2.2.1" + flutter-version: "2.5.2" - name: "Install Tools" run: | sudo apt update sudo apt install -y clang-format flutter pub global activate melos - pub global activate flutter_plugin_tools 0.1.4 + pub global activate flutter_plugin_tools 0.7.1 - name: "Bootstrap Workspace" run: melos bootstrap - name: "Melos Format" @@ -59,7 +58,6 @@ jobs: - name: "Validate Formatting" run: | ./.github/workflows/scripts/validate-formatting.sh - build_examples_dart: timeout-minutes: 15 runs-on: ubuntu-latest @@ -71,7 +69,7 @@ jobs: - name: "Install Flutter" uses: subosito/flutter-action@v1 with: - flutter-version: "2.2.1" + flutter-version: "2.5.2" - name: "Install Tools" run: flutter pub global activate melos - name: "Bootstrap Workspace" @@ -79,7 +77,6 @@ jobs: - name: "Build Example Snapshots" run: | melos run build:examples:bundle - test: runs-on: ${{matrix.os}} strategy: @@ -95,7 +92,7 @@ jobs: - name: "Install Flutter" uses: subosito/flutter-action@v1 with: - flutter-version: "2.2.1" + flutter-version: "2.5.2" - name: "Install Tools" run: flutter pub global activate melos - name: "Bootstrap Workspace" From 5097fe7f227ab4108c084b96026d409e895674d0 Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Fri, 1 Oct 2021 22:18:55 +0200 Subject: [PATCH 2/3] imp: update tests, annotate int with external for package_info_plus_windows and bump version --- .../package_info_plus/package_info_plus_windows/CHANGELOG.md | 3 +++ .../package_info_plus_windows/lib/src/file_version_info.dart | 4 ++-- .../package_info_plus/package_info_plus_windows/pubspec.yaml | 2 +- packages/sensors_plus/sensors_plus/test/sensors_test.dart | 1 + .../test/sensors_plus_platform_interface_test.dart | 1 + .../test/share_plus_platform_interface_test.dart | 1 + 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/package_info_plus/package_info_plus_windows/CHANGELOG.md b/packages/package_info_plus/package_info_plus_windows/CHANGELOG.md index fe3bc0f898..24c033dc05 100644 --- a/packages/package_info_plus/package_info_plus_windows/CHANGELOG.md +++ b/packages/package_info_plus/package_info_plus_windows/CHANGELOG.md @@ -1,3 +1,6 @@ +## 1.0.4 +- Annotate int with external. + ## 1.0.3 - Add `buildSignature` to Android package info to retrieve the signing certifiate SHA1 at runtime. diff --git a/packages/package_info_plus/package_info_plus_windows/lib/src/file_version_info.dart b/packages/package_info_plus/package_info_plus_windows/lib/src/file_version_info.dart index ccc85a1368..d863fdfe61 100644 --- a/packages/package_info_plus/package_info_plus_windows/lib/src/file_version_info.dart +++ b/packages/package_info_plus/package_info_plus_windows/lib/src/file_version_info.dart @@ -10,10 +10,10 @@ part of package_info_plus_windows; class _LANGANDCODEPAGE extends Struct { @Uint16() - int? wLanguage; + external int? wLanguage; @Uint16() - int? wCodePage; + external int? wCodePage; } final _kernel32 = DynamicLibrary.open('kernel32.dll'); diff --git a/packages/package_info_plus/package_info_plus_windows/pubspec.yaml b/packages/package_info_plus/package_info_plus_windows/pubspec.yaml index 18c4125309..04240684fe 100644 --- a/packages/package_info_plus/package_info_plus_windows/pubspec.yaml +++ b/packages/package_info_plus/package_info_plus_windows/pubspec.yaml @@ -1,6 +1,6 @@ name: package_info_plus_windows description: Windows implementation of the package_info_plus plugin -version: 1.0.3 +version: 1.0.4 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ diff --git a/packages/sensors_plus/sensors_plus/test/sensors_test.dart b/packages/sensors_plus/sensors_plus/test/sensors_test.dart index 2a98c1d9fc..3817f5ee2f 100644 --- a/packages/sensors_plus/sensors_plus/test/sensors_test.dart +++ b/packages/sensors_plus/sensors_plus/test/sensors_test.dart @@ -6,6 +6,7 @@ import 'dart:typed_data'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart' show TestWidgetsFlutterBinding; +import 'package:flutter_test/src/deprecated.dart'; import 'package:sensors_plus/sensors_plus.dart'; import 'package:test/test.dart'; diff --git a/packages/sensors_plus/sensors_plus_platform_interface/test/sensors_plus_platform_interface_test.dart b/packages/sensors_plus/sensors_plus_platform_interface/test/sensors_plus_platform_interface_test.dart index b7bff2dbf4..d2aac35906 100644 --- a/packages/sensors_plus/sensors_plus_platform_interface/test/sensors_plus_platform_interface_test.dart +++ b/packages/sensors_plus/sensors_plus_platform_interface/test/sensors_plus_platform_interface_test.dart @@ -6,6 +6,7 @@ import 'dart:typed_data'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart' show TestWidgetsFlutterBinding; +import 'package:flutter_test/src/deprecated.dart'; import 'package:sensors_plus_platform_interface/sensors_plus_platform_interface.dart'; import 'package:sensors_plus_platform_interface/src/method_channel_sensors.dart'; import 'package:test/test.dart'; diff --git a/packages/share_plus/share_plus_platform_interface/test/share_plus_platform_interface_test.dart b/packages/share_plus/share_plus_platform_interface/test/share_plus_platform_interface_test.dart index 68de78e751..26cd5dc79c 100644 --- a/packages/share_plus/share_plus_platform_interface/test/share_plus_platform_interface_test.dart +++ b/packages/share_plus/share_plus_platform_interface/test/share_plus_platform_interface_test.dart @@ -6,6 +6,7 @@ import 'dart:io'; import 'dart:ui'; import 'package:flutter_test/flutter_test.dart' show TestWidgetsFlutterBinding; +import 'package:flutter_test/src/deprecated.dart'; import 'package:mockito/mockito.dart'; import 'package:share_plus_platform_interface/share_plus_platform_interface.dart'; import 'package:share_plus_platform_interface/method_channel/method_channel_share.dart'; From eb57f7a784da2021da91c19ed8af3b5cf72f9f4a Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Sat, 2 Oct 2021 19:28:41 +0200 Subject: [PATCH 3/3] bug: revert changes. See #491 --- .../package_info_plus/package_info_plus_windows/CHANGELOG.md | 3 --- .../package_info_plus_windows/lib/src/file_version_info.dart | 4 ++-- .../package_info_plus/package_info_plus_windows/pubspec.yaml | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/package_info_plus/package_info_plus_windows/CHANGELOG.md b/packages/package_info_plus/package_info_plus_windows/CHANGELOG.md index 24c033dc05..fe3bc0f898 100644 --- a/packages/package_info_plus/package_info_plus_windows/CHANGELOG.md +++ b/packages/package_info_plus/package_info_plus_windows/CHANGELOG.md @@ -1,6 +1,3 @@ -## 1.0.4 -- Annotate int with external. - ## 1.0.3 - Add `buildSignature` to Android package info to retrieve the signing certifiate SHA1 at runtime. diff --git a/packages/package_info_plus/package_info_plus_windows/lib/src/file_version_info.dart b/packages/package_info_plus/package_info_plus_windows/lib/src/file_version_info.dart index d863fdfe61..ccc85a1368 100644 --- a/packages/package_info_plus/package_info_plus_windows/lib/src/file_version_info.dart +++ b/packages/package_info_plus/package_info_plus_windows/lib/src/file_version_info.dart @@ -10,10 +10,10 @@ part of package_info_plus_windows; class _LANGANDCODEPAGE extends Struct { @Uint16() - external int? wLanguage; + int? wLanguage; @Uint16() - external int? wCodePage; + int? wCodePage; } final _kernel32 = DynamicLibrary.open('kernel32.dll'); diff --git a/packages/package_info_plus/package_info_plus_windows/pubspec.yaml b/packages/package_info_plus/package_info_plus_windows/pubspec.yaml index 04240684fe..18c4125309 100644 --- a/packages/package_info_plus/package_info_plus_windows/pubspec.yaml +++ b/packages/package_info_plus/package_info_plus_windows/pubspec.yaml @@ -1,6 +1,6 @@ name: package_info_plus_windows description: Windows implementation of the package_info_plus plugin -version: 1.0.4 +version: 1.0.3 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/