Merge branch 'main' into fix10.0.2-iphone13

.gitignore

@@ -12,9 +12,11 @@ flutter_export_environment.sh
 
 examples/all_plugins/pubspec.yaml
 
+.build/
 Podfile
 Podfile.lock
 Pods/
+.swiftpm/
 .symlinks/
 **/Flutter/App.framework/
 **/Flutter/ephemeral/

packages/battery_plus/battery_plus/ios/battery_plus.podspec

@@ -14,11 +14,11 @@ Downloaded by pub (not CocoaPods).
   s.author           = { 'Flutter Community Team' => '[email protected]' }
   s.source           = { :http => 'https://github.com/fluttercommunity/plus_plugins/tree/main/packages/battery_plus' }
   s.documentation_url = 'https://pub.dev/packages/battery_plus'
-  s.source_files = 'Classes/**/*'
-  s.public_header_files = 'Classes/**/*.h'
+  s.source_files = 'battery_plus/Sources/battery_plus/**/*.{h,m}'
+  s.public_header_files = 'battery_plus/Sources/battery_plus/include/**/*.h'
   s.dependency 'Flutter'
 
   s.platform = :ios, '12.0'
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
-  s.resource_bundles = {'batery_plus_privacy' => ['PrivacyInfo.xcprivacy']}
+  s.resource_bundles = {'battery_plus_privacy' => ['battery_plus/Sources/battery_plus/PrivacyInfo.xcprivacy']}
 end

packages/battery_plus/battery_plus/ios/battery_plus/Package.swift

@@ -0,0 +1,27 @@
+// swift-tools-version: 5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+  name: "battery_plus",
+  platforms: [
+    .iOS("12.0")
+  ],
+  products: [
+    .library(name: "battery-plus", targets: ["battery_plus"])
+  ],
+  dependencies: [],
+  targets: [
+    .target(
+      name: "battery_plus",
+      dependencies: [],
+      resources: [
+        .process("PrivacyInfo.xcprivacy")
+      ],
+      cSettings: [
+        .headerSearchPath("include/battery_plus")
+      ]
+    )
+  ]
+)

packages/battery_plus/battery_plus/ios/Classes/FPPBatteryPlusPlugin.m → packages/battery_plus/battery_plus/ios/battery_plus/Sources/battery_plus/FPPBatteryPlusPlugin.m

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "FPPBatteryPlusPlugin.h"
+#import "./include/battery_plus/FPPBatteryPlusPlugin.h"
 
 @interface FPPBatteryPlusPlugin () <FlutterStreamHandler>
 @end

packages/battery_plus/battery_plus/macos/battery_plus.podspec

@@ -13,11 +13,11 @@ A Flutter plugin for accessing information about the battery state(full, chargin
   s.license          = { :file => '../LICENSE' }
   s.author           = { 'Flutter Community' => '[email protected]' }
   s.source           = { :path => 'https://github.com/fluttercommunity/plus_plugins/tree/main/packages/battery_plus' }
-  s.source_files     = 'Classes/**/*'
+  s.source_files     = 'battery_plus/Sources/battery_plus/**/*.swift'
   s.dependency 'FlutterMacOS'
 
   s.platform = :osx, '10.14'
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
   s.swift_version = '5.0'
-  s.resource_bundles = {'batery_plus_privacy' => ['PrivacyInfo.xcprivacy']}
+  s.resource_bundles = {'battery_plus_privacy' => ['battery_plus/Sources/battery_plus/PrivacyInfo.xcprivacy']}
 end

packages/battery_plus/battery_plus/macos/battery_plus/Package.swift

@@ -0,0 +1,24 @@
+// swift-tools-version: 5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+  name: "battery_plus",
+  platforms: [
+    .macOS("10.14")
+  ],
+  products: [
+    .library(name: "battery-plus", targets: ["battery_plus"])
+  ],
+  dependencies: [],
+  targets: [
+    .target(
+      name: "battery_plus",
+      dependencies: [],
+      resources: [
+        .process("PrivacyInfo.xcprivacy")
+      ]
+    )
+  ]
+)

packages/device_info_plus/device_info_plus/.gitignore

@@ -11,9 +11,11 @@ flutter_export_environment.sh
 
 examples/all_plugins/pubspec.yaml
 
+.build/
 Podfile
 Podfile.lock
 Pods/
+.swiftpm/
 .symlinks/
 **/Flutter/App.framework/
 **/Flutter/ephemeral/
@@ -45,3 +47,4 @@ build/
 .project
 .classpath
 .settings
+

packages/device_info_plus/device_info_plus/ios/device_info_plus.podspec

@@ -14,11 +14,11 @@ Downloaded by pub (not CocoaPods).
   s.author           = { 'Flutter Community Team' => '[email protected]' }
   s.source           = { :http => 'https://github.com/fluttercommunity/plus_plugins/tree/main/packages/device_info_plus' }
   s.documentation_url = 'https://pub.dev/packages/device_info_plus'
-  s.source_files = 'Classes/**/*'
-  s.public_header_files = 'Classes/**/*.h'
+  s.source_files = 'device_info_plus/Sources/device_info_plus/**/*.{h,m}'
+  s.public_header_files = 'device_info_plus/Sources/device_info_plus/include/**/*.h'
   s.dependency 'Flutter'
   s.platform = :ios, '12.0'
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
-  s.resource_bundles = {'device_info_plus_privacy' => ['PrivacyInfo.xcprivacy']}
+  s.resource_bundles = {'device_info_plus_privacy' => ['device_info_plus/Sources/device_info_plus/PrivacyInfo.xcprivacy']}
 end
 

packages/device_info_plus/device_info_plus/ios/device_info_plus/Package.swift

@@ -0,0 +1,27 @@
+// swift-tools-version: 5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "device_info_plus",
+    platforms: [
+        .iOS("12.0"),
+    ],
+    products: [
+        .library(name: "device-info-plus", targets: ["device_info_plus"])
+    ],
+    dependencies: [],
+    targets: [
+        .target(
+            name: "device_info_plus",
+            dependencies: [],
+            resources: [
+                .process("PrivacyInfo.xcprivacy"),
+            ],
+            cSettings: [
+                .headerSearchPath("include/device_info_plus")
+            ]
+        )
+    ]
+)

packages/device_info_plus/device_info_plus/ios/Classes/FPPDeviceInfoPlusPlugin.m → packages/device_info_plus/device_info_plus/ios/device_info_plus/Sources/device_info_plus/FPPDeviceInfoPlusPlugin.m

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "FPPDeviceInfoPlusPlugin.h"
+#import "./include/device_info_plus/FPPDeviceInfoPlusPlugin.h"
 #import <sys/utsname.h>
 
 @implementation FPPDeviceInfoPlusPlugin

packages/device_info_plus/device_info_plus/macos/device_info_plus.podspec

@@ -13,8 +13,8 @@ https://github.com/flutter/flutter/issues/46618
   s.license          = { :file => '../LICENSE' }
   s.author           = { 'Flutter Community' => '[email protected]' }
   s.source           = { :path => '.' }
-  s.source_files = 'Classes/**/*'
-  s.public_header_files = 'Classes/**/*.h'
+  s.source_files = 'device_info_plus/Sources/device_info_plus/**/*.swift'
+  s.public_header_files = 'device_info_plus/Sources/device_info_plus/**/*.h'
   s.dependency 'FlutterMacOS'
 
   s.platform = :osx

packages/device_info_plus/device_info_plus/macos/device_info_plus/Package.swift

@@ -0,0 +1,23 @@
+// swift-tools-version: 5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "device_info_plus",
+    platforms: [
+        .macOS("10.14")
+    ],
+    products: [
+        .library(name: "device-info-plus", targets: ["device_info_plus"])
+    ],
+    dependencies: [],
+    targets: [
+        .target(
+            name: "device_info_plus",
+            dependencies: [],
+            resources: [
+            ]
+        )
+    ]
+)

packages/sensors_plus/sensors_plus/ios/sensors_plus.podspec

@@ -14,12 +14,12 @@ Flutter plugin to access the accelerometer, gyroscope, magnetometer and baromete
   s.author           = { 'Flutter Community Team' => '[email protected]' }
   s.source           = { :http => 'https://github.com/fluttercommunity/plus_plugins/tree/main/packages/sensors_plus' }
   s.documentation_url = 'https://pub.dev/packages/sensors_plus'
-  s.source_files = 'Classes/**/*'
+  s.source_files = 'sensors_plus/Sources/sensors_plus/**/*.swift'
   s.dependency 'Flutter'
   s.platform = :ios, '12.0'
 
   # Flutter.framework does not contain a i386 slice.
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
   s.swift_version = '5.0'
-  s.resource_bundles = {'sensors_plus_privacy' => ['PrivacyInfo.xcprivacy']}
+  s.resource_bundles = {'sensors_plus_privacy' => ['sensors_plus/Sources/sensors_plus/PrivacyInfo.xcprivacy']}
 end

packages/sensors_plus/sensors_plus/ios/sensors_plus/Package.swift

@@ -0,0 +1,24 @@
+// swift-tools-version: 5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "sensors_plus",
+    platforms: [
+        .iOS("12.0"),
+    ],
+    products: [
+        .library(name: "sensors-plus", targets: ["sensors_plus"])
+    ],
+    dependencies: [],
+    targets: [
+        .target(
+            name: "sensors_plus",
+            dependencies: [],
+            resources: [
+                .process("PrivacyInfo.xcprivacy"),
+            ]
+        )
+    ]
+)

packages/share_plus/share_plus/.gitignore

@@ -11,9 +11,11 @@ flutter_export_environment.sh
 
 examples/all_plugins/pubspec.yaml
 
+.build/
 Podfile
 Podfile.lock
 Pods/
+.swiftpm/
 .symlinks/
 **/Flutter/App.framework/
 **/Flutter/ephemeral/

packages/share_plus/share_plus/ios/share_plus.podspec

@@ -14,13 +14,12 @@ Downloaded by pub (not CocoaPods).
   s.author           = { 'Flutter Community Team' => '[email protected]' }
   s.source           = { :http => 'https://github.com/fluttercommunity/plus_plugins/tree/main/packages/share_plus/share_plus' }
   s.documentation_url = 'https://pub.dev/packages/share_plus'
-  s.source_files = 'Classes/**/*'
-  s.public_header_files = 'Classes/**/*.h'
+  s.source_files = 'share_plus/Sources/share_plus/**/*.{h,m}'
+  s.public_header_files = 'share_plus/Sources/share_plus/include/**/*.h'
   s.dependency 'Flutter'
   s.ios.weak_framework = 'LinkPresentation'
 
   s.platform = :ios, '12.0'
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
-  s.resource_bundles = {'share_plus_privacy' => ['PrivacyInfo.xcprivacy']}
+  s.resource_bundles = {'share_plus_privacy' => ['share_plus/Sources/share_plus/PrivacyInfo.xcprivacy']}
 end
-

packages/share_plus/share_plus/ios/share_plus/Package.swift

@@ -0,0 +1,27 @@
+// swift-tools-version: 5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "share_plus",
+    platforms: [
+        .iOS("12.0"),
+    ],
+    products: [
+        .library(name: "share-plus", targets: ["share_plus"])
+    ],
+    dependencies: [],
+    targets: [
+        .target(
+            name: "share_plus",
+            dependencies: [],
+            resources: [
+                .process("PrivacyInfo.xcprivacy"),
+            ],
+            cSettings: [
+                .headerSearchPath("include/share_plus")
+            ]
+        )
+    ]
+)