Merge branch 'main' into pkg_web_wip

fluttercommunity · Nov 17, 2023 · e16b221 · e16b221
2 parents 0c3fcf2 + 64b9931
commit e16b221
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 13 deletions.
diff --git a/packages/android_alarm_manager_plus/example/pubspec.yaml b/packages/android_alarm_manager_plus/example/pubspec.yaml
@@ -18,7 +18,7 @@ dev_dependencies:
     sdk: flutter
   integration_test:
     sdk: flutter
-  flutter_lints: ^2.0.1
+  flutter_lints: ^3.0.1
 
 flutter:
   uses-material-design: true
diff --git a/packages/android_alarm_manager_plus/pubspec.yaml b/packages/android_alarm_manager_plus/pubspec.yaml
@@ -17,7 +17,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^2.0.1
+  flutter_lints: ">=2.0.1 <4.0.0"
 
 flutter:
   plugin:

diff --git a/packages/android_intent_plus/example/pubspec.yaml b/packages/android_intent_plus/example/pubspec.yaml
@@ -18,7 +18,7 @@ dev_dependencies:
     sdk: flutter
   flutter_test:
     sdk: flutter
-  flutter_lints: ^2.0.1
+  flutter_lints: ^3.0.1
 
 # The following section is specific to Flutter.
 flutter:

diff --git a/packages/battery_plus/battery_plus/example/pubspec.yaml b/packages/battery_plus/battery_plus/example/pubspec.yaml
@@ -16,7 +16,7 @@ dev_dependencies:
     sdk: flutter
   integration_test:
     sdk: flutter
-  flutter_lints: ^2.0.1
+  flutter_lints: ^3.0.1
 
 flutter:
   uses-material-design: true
diff --git a/packages/connectivity_plus/connectivity_plus/example/pubspec.yaml b/packages/connectivity_plus/connectivity_plus/example/pubspec.yaml
@@ -17,7 +17,7 @@ dev_dependencies:
   integration_test:
     sdk: flutter
   test: ^1.16.4
-  flutter_lints: ^2.0.1
+  flutter_lints: ^3.0.1
 
 flutter:
   uses-material-design: true
diff --git a/packages/device_info_plus/device_info_plus/example/pubspec.yaml b/packages/device_info_plus/device_info_plus/example/pubspec.yaml
@@ -13,7 +13,7 @@ dev_dependencies:
     sdk: flutter
   integration_test:
     sdk: flutter
-  flutter_lints: ^2.0.1
+  flutter_lints: ^3.0.1
 
 flutter:
   uses-material-design: true

diff --git a/packages/device_info_plus/device_info_plus/macos/Classes/SystemUUID.swift b/packages/device_info_plus/device_info_plus/macos/Classes/SystemUUID.swift
@@ -4,7 +4,14 @@ public struct SystemUUID {
 
     public static func getSystemUUID() -> String? {
         let dev = IOServiceMatching("IOPlatformExpertDevice")
-        let platformExpert: io_service_t = IOServiceGetMatchingService(kIOMasterPortDefault, dev)
+
+        var platformExpert: io_service_t
+        if #available(macOS 12, *) {
+            platformExpert = IOServiceGetMatchingService(kIOMainPortDefault, dev)
+        } else {
+            platformExpert = IOServiceGetMatchingService(kIOMasterPortDefault, dev)
+        }
+
         let serialNumberAsCFString = IORegistryEntryCreateCFProperty(platformExpert, kIOPlatformUUIDKey as CFString, kCFAllocatorDefault, 0)
         IOObjectRelease(platformExpert)
         let ser: CFTypeRef? = serialNumberAsCFString?.takeUnretainedValue()
@@ -13,4 +20,4 @@ public struct SystemUUID {
         }
         return nil
     }
-}
+}
diff --git a/packages/device_info_plus/device_info_plus_platform_interface/pubspec.yaml b/packages/device_info_plus/device_info_plus_platform_interface/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
   plugin_platform_interface: ^2.1.4
 
 dev_dependencies:
-  flutter_lints: ^2.0.1
+  flutter_lints: ">=2.0.1 <4.0.0"
   flutter_test:
     sdk: flutter
   mockito: ^5.4.0

diff --git a/packages/network_info_plus/network_info_plus/example/pubspec.yaml b/packages/network_info_plus/network_info_plus/example/pubspec.yaml
@@ -15,7 +15,7 @@ dev_dependencies:
   integration_test:
     sdk: flutter
   test: ^1.21.0
-  flutter_lints: ^2.0.1
+  flutter_lints: ^3.0.1
 
 flutter:
   uses-material-design: true
diff --git a/packages/package_info_plus/package_info_plus/example/pubspec.yaml b/packages/package_info_plus/package_info_plus/example/pubspec.yaml
@@ -18,7 +18,7 @@ dev_dependencies:
     sdk: flutter
   flutter_driver:
     sdk: flutter
-  flutter_lints: ^2.0.1
+  flutter_lints: ^3.0.1
   flutter_test:
     sdk: flutter
   mockito: ^5.4.0

diff --git a/packages/sensors_plus/sensors_plus/example/pubspec.yaml b/packages/sensors_plus/sensors_plus/example/pubspec.yaml
@@ -11,7 +11,7 @@ dev_dependencies:
     sdk: flutter
   integration_test:
     sdk: flutter
-  flutter_lints: ^2.0.1
+  flutter_lints: ^3.0.1
   flutter_test:
     sdk: flutter
 

diff --git a/packages/share_plus/share_plus/example/pubspec.yaml b/packages/share_plus/share_plus/example/pubspec.yaml
@@ -15,7 +15,7 @@ dev_dependencies:
     sdk: flutter
   integration_test:
     sdk: flutter
-  flutter_lints: ^2.0.1
+  flutter_lints: ^3.0.1
 
 flutter:
   uses-material-design: true