Update win32 dependency and lints

CHANGELOG.md

@@ -1,4 +1,8 @@
-## 2.0.0-nullsafety.0
+## 2.0.1
+
+- Upgrade win32 dependency
+
+## 2.0.0
 
 - Enable sound null safety
 

analysis_options.yaml

@@ -1,4 +1,4 @@
-include: package:lint/analysis_options_package.yaml
+include: package:lints/recommended.yaml
 
 analyzer:
   strong-mode:
@@ -7,27 +7,15 @@ analyzer:
 
 linter:
   rules:
-    # redundancy is good if it leads to better documentation
-    avoid_redundant_argument_values: false
-
     # print is useful for examples
     avoid_print: false
 
-    # disable for now per https://github.com/timsneath/win32/issues/87
-    avoid_private_typedef_functions: false
-
     # win32 parity requires SCREAMING_CAPS constants
     constant_identifier_names: false  
 
     # deliberately name generated files after their COM equivalents
     file_names: false
 
-    # seems to trigger false positives
-    invariant_booleans: false
-
-    # while(true) is useful for Win32 enumerations
-    literal_only_boolean_expressions: false
-
     # doesn't make sense if adjacent strings are not human language
     missing_whitespace_between_adjacent_strings: false
 

example/analysis_options.yaml

@@ -1,4 +1,4 @@
-include: package:lint/analysis_options_package.yaml
+include: package:lints/recommended.yaml
 
 analyzer:
   strong-mode:
@@ -7,36 +7,21 @@ analyzer:
 
 linter:
   rules:
-    # redundancy is good if it leads to better documentation
-    avoid_redundant_argument_values: false
-
     # print is useful for examples
     avoid_print: false
 
-    # disable for now per https://github.com/timsneath/win32/issues/87
-    avoid_private_typedef_functions: false
-
     # win32 parity requires SCREAMING_CAPS constants
     constant_identifier_names: false  
 
     # deliberately name generated files after their COM equivalents
     file_names: false
 
-    # seems to trigger false positives
-    invariant_booleans: false
-
-    # while(true) is useful for Win32 enumerations
-    literal_only_boolean_expressions: false
-
     # doesn't make sense if adjacent strings are not human language
     missing_whitespace_between_adjacent_strings: false
 
     # Win32 parity requires TitleCase method names
     non_constant_identifier_names: false
 
-    # Not compatible with sound null safety
-    use_key_in_widget_constructors: false
-
     # Some additional lints we want to enforce
     omit_local_variable_types: true
     prefer_expression_function_bodies: true

example/pubspec.lock

@@ -7,27 +7,27 @@ packages:
       name: ffi
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.2"
   filepicker_windows:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "2.0.0"
-  lint:
+    version: "2.0.1"
+  lints:
     dependency: "direct dev"
     description:
-      name: lint
+      name: lints
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.3"
+    version: "1.0.1"
   win32:
     dependency: "direct main"
     description:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.4"
+    version: "2.3.1"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=2.14.0 <3.0.0"

example/pubspec.yaml

@@ -10,7 +10,7 @@ environment:
 dependencies:
   filepicker_windows:
     path: ../
-  win32: ^2.0.1
+  win32: ^2.3.1
 
 dev_dependencies:
-  lint: ^1.5.3
+  lints: ^1.0.1

example/wallpaper/analysis_options.yaml

@@ -1,4 +1,4 @@
-include: package:lint/analysis_options_package.yaml
+include: package:lints/recommended.yaml
 
 analyzer:
   strong-mode:
@@ -7,36 +7,21 @@ analyzer:
 
 linter:
   rules:
-    # redundancy is good if it leads to better documentation
-    avoid_redundant_argument_values: false
-
     # print is useful for examples
     avoid_print: false
 
-    # disable for now per https://github.com/timsneath/win32/issues/87
-    avoid_private_typedef_functions: false
-
     # win32 parity requires SCREAMING_CAPS constants
     constant_identifier_names: false  
 
     # deliberately name generated files after their COM equivalents
     file_names: false
 
-    # seems to trigger false positives
-    invariant_booleans: false
-
-    # while(true) is useful for Win32 enumerations
-    literal_only_boolean_expressions: false
-
     # doesn't make sense if adjacent strings are not human language
     missing_whitespace_between_adjacent_strings: false
 
     # Win32 parity requires TitleCase method names
     non_constant_identifier_names: false
 
-    # Not compatible with sound null safety
-    use_key_in_widget_constructors: false
-
     # Some additional lints we want to enforce
     omit_local_variable_types: true
     prefer_expression_function_bodies: true

example/wallpaper/lib/main.dart

@@ -1,7 +1,7 @@
 import 'dart:io';
 
-import 'package:flutter/material.dart';
 import 'package:filepicker_windows/filepicker_windows.dart' as picker;
+import 'package:flutter/material.dart';
 
 import 'wallpaper.dart';
 

example/wallpaper/pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   collection:
     dependency: transitive
     description:
@@ -21,33 +21,40 @@ packages:
       name: ffi
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.2"
   filepicker_windows:
     dependency: "direct main"
     description:
       path: "../.."
       relative: true
     source: path
-    version: "2.0.0"
+    version: "2.0.1"
   flutter:
     dependency: "direct main"
     description: flutter
     source: sdk
     version: "0.0.0"
-  lint:
+  lints:
     dependency: "direct dev"
     description:
-      name: lint
+      name: lints
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.3"
+    version: "1.0.1"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.2"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -66,13 +73,13 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   win32:
     dependency: transitive
     description:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.4"
+    version: "2.3.1"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=2.14.0 <3.0.0"

example/wallpaper/pubspec.yaml

@@ -24,4 +24,4 @@ flutter:
   uses-material-design: true
 
 dev_dependencies:
-  lint: ^1.5.3
+  lints: ^1.0.1

example/wallpaper/windows/flutter/generated_plugin_registrant.cc

@@ -2,6 +2,8 @@
 //  Generated file. Do not edit.
 //
 
+// clang-format off
+
 #include "generated_plugin_registrant.h"
 
 

example/wallpaper/windows/flutter/generated_plugin_registrant.h

@@ -2,6 +2,8 @@
 //  Generated file. Do not edit.
 //
 
+// clang-format off
+
 #ifndef GENERATED_PLUGIN_REGISTRANT_
 #define GENERATED_PLUGIN_REGISTRANT_
 

lib/src/directorydialog.dart

@@ -13,7 +13,9 @@ class DirectoryPicker extends FileDialog {
     late String path;
 
     var hr = CoInitializeEx(
-        nullptr, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
+      nullptr,
+      COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE,
+    );
     if (FAILED(hr)) throw WindowsException(hr);
 
     final dialog = FileOpenDialog.createInstance();

lib/src/filedialog.dart

@@ -130,7 +130,7 @@ abstract class FileDialog {
     final knownFolderManager = KnownFolderManager.createInstance();
     final publicMusicFolder = calloc<GUID>()..ref.setGUID(folderGUID);
 
-    final ppkf = calloc<Pointer>();
+    final ppkf = calloc<Pointer<COMObject>>();
     hr = knownFolderManager.GetFolder(publicMusicFolder, ppkf);
     if (FAILED(hr)) throw WindowsException(hr);
     final knownFolder = IKnownFolder(ppkf.cast());

lib/src/opendialog.dart

@@ -112,7 +112,7 @@ class OpenFilePicker extends FileDialog {
         throw WindowsException(hr);
       }
     } else {
-      final ppsi = calloc<Pointer>();
+      final ppsi = calloc<Pointer<COMObject>>();
       hr = fileDialog.GetResult(ppsi);
       if (FAILED(hr)) throw WindowsException(hr);
 

lib/src/savedialog.dart

@@ -81,7 +81,7 @@ class SaveFilePicker extends FileDialog {
         throw WindowsException(hr);
       }
     } else {
-      final ppsi = calloc<Pointer>();
+      final ppsi = calloc<Pointer<COMObject>>();
       hr = fileDialog.GetResult(ppsi);
       if (!SUCCEEDED(hr)) throw WindowsException(hr);
 

pubspec.lock

@@ -7,20 +7,20 @@ packages:
       name: ffi
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
-  lint:
+    version: "1.1.2"
+  lints:
     dependency: "direct dev"
     description:
-      name: lint
+      name: lints
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.3"
+    version: "1.0.1"
   win32:
     dependency: "direct main"
     description:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.4"
+    version: "2.3.1"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=2.14.0 <3.0.0"