Merge branch 'main' of github.com:flutter/packages into gmf_web_fix

packages/camera/camera_avfoundation/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.9.17
+
+* Adds Swift Package Manager compatibility.
+
 ## 0.9.16+3
 
 * Removes unused `maxVideoDuration` code.

packages/camera/camera_avfoundation/example/ios/Podfile

@@ -32,8 +32,6 @@ target 'Runner' do
 
   target 'RunnerTests' do
     inherit! :search_paths
-    # Pods for testing
-    pod 'OCMock', '~> 3.8.1'
   end
 end
 

packages/camera/camera_avfoundation/example/ios/Runner.xcodeproj/project.pbxproj

@@ -14,6 +14,7 @@
 		25C3919135C3D981E6F800D0 /* libPods-RunnerTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1944D8072499F3B5E7653D44 /* libPods-RunnerTests.a */; };
 		334733EA2668111C00DCC49E /* CameraOrientationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 03BB767226653ABE00CE5A93 /* CameraOrientationTests.m */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+		408D7A792C3C9CD000B71F9A /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = 408D7A782C3C9CD000B71F9A /* OCMock */; };
 		43ED1537282570DE00EB00DE /* AvailableCamerasTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 43ED1536282570DE00EB00DE /* AvailableCamerasTest.m */; };
 		788A065A27B0E02900533D74 /* StreamingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 788A065927B0E02900533D74 /* StreamingTest.m */; };
 		7D5FCCD42AEF9D0200FB7108 /* CameraSettingsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D5FCCD32AEF9D0200FB7108 /* CameraSettingsTests.m */; };
@@ -106,6 +107,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				408D7A792C3C9CD000B71F9A /* OCMock in Frameworks */,
 				25C3919135C3D981E6F800D0 /* libPods-RunnerTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -241,6 +243,9 @@
 				03BB766E2665316900CE5A93 /* PBXTargetDependency */,
 			);
 			name = RunnerTests;
+			packageProductDependencies = (
+				408D7A782C3C9CD000B71F9A /* OCMock */,
+			);
 			productName = camera_exampleTests;
 			productReference = 03BB76682665316900CE5A93 /* RunnerTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
@@ -295,6 +300,9 @@
 				Base,
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
+			packageReferences = (
+				408D7A772C3C9CD000B71F9A /* XCRemoteSwiftPackageReference "ocmock" */,
+			);
 			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -733,6 +741,25 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCRemoteSwiftPackageReference section */
+		408D7A772C3C9CD000B71F9A /* XCRemoteSwiftPackageReference "ocmock" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/erikdoe/ocmock";
+			requirement = {
+				kind = revision;
+				revision = fe1661a3efed11831a6452f4b1a0c5e6ddc08c3d;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		408D7A782C3C9CD000B71F9A /* OCMock */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 408D7A772C3C9CD000B71F9A /* XCRemoteSwiftPackageReference "ocmock" */;
+			productName = OCMock;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
 }

packages/camera/camera_avfoundation/example/ios/RunnerTests/AvailableCamerasTest.m

@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 @import camera_avfoundation;
+#if __has_include(<camera_avfoundation/camera_avfoundation-umbrella.h>)
 @import camera_avfoundation.Test;
+#endif
 @import XCTest;
 @import AVFoundation;
 #import <OCMock/OCMock.h>

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraCaptureSessionQueueRaceConditionTests.m

@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 @import camera_avfoundation;
+#if __has_include(<camera_avfoundation/camera_avfoundation-umbrella.h>)
 @import camera_avfoundation.Test;
+#endif
 @import XCTest;
 
 @interface CameraCaptureSessionQueueRaceConditionTests : XCTestCase

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraFocusTests.m

@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 @import camera_avfoundation;
+#if __has_include(<camera_avfoundation/camera_avfoundation-umbrella.h>)
 @import camera_avfoundation.Test;
+#endif
 @import XCTest;
 @import AVFoundation;
 #import <OCMock/OCMock.h>

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraMethodChannelTests.m

@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 @import camera_avfoundation;
+#if __has_include(<camera_avfoundation/camera_avfoundation-umbrella.h>)
 @import camera_avfoundation.Test;
+#endif
 @import XCTest;
 @import AVFoundation;
 #import <OCMock/OCMock.h>

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraOrientationTests.m

@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 @import camera_avfoundation;
+#if __has_include(<camera_avfoundation/camera_avfoundation-umbrella.h>)
 @import camera_avfoundation.Test;
+#endif
 @import XCTest;
 @import Flutter;
 

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraPermissionTests.m

@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 @import camera_avfoundation;
+#if __has_include(<camera_avfoundation/camera_avfoundation-umbrella.h>)
 @import camera_avfoundation.Test;
+#endif
 @import AVFoundation;
 @import XCTest;
 #import <OCMock/OCMock.h>

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraPreviewPauseTests.m

@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 @import camera_avfoundation;
+#if __has_include(<camera_avfoundation/camera_avfoundation-umbrella.h>)
 @import camera_avfoundation.Test;
+#endif
 @import XCTest;
 @import AVFoundation;
 #import <OCMock/OCMock.h>

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraPropertiesTests.m

@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 @import camera_avfoundation;
+#if __has_include(<camera_avfoundation/camera_avfoundation-umbrella.h>)
 @import camera_avfoundation.Test;
+#endif
 @import AVFoundation;
 @import XCTest;
 

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraSessionPresetsTests.m

@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 @import camera_avfoundation;
+#if __has_include(<camera_avfoundation/camera_avfoundation-umbrella.h>)
 @import camera_avfoundation.Test;
+#endif
 
 @import AVFoundation;
 @import XCTest;

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraSettingsTests.m

@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 @import camera_avfoundation;
+#if __has_include(<camera_avfoundation/camera_avfoundation-umbrella.h>)
 @import camera_avfoundation.Test;
+#endif
 @import XCTest;
 @import AVFoundation;
 #import <OCMock/OCMock.h>

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraTestUtils.h

@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 @import camera_avfoundation;
+#if __has_include(<camera_avfoundation/camera_avfoundation-umbrella.h>)
 @import camera_avfoundation.Test;
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 

packages/camera/camera_avfoundation/example/ios/RunnerTests/FLTCamPhotoCaptureTests.m

@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 @import camera_avfoundation;
+#if __has_include(<camera_avfoundation/camera_avfoundation-umbrella.h>)
 @import camera_avfoundation.Test;
+#endif
 @import AVFoundation;
 @import XCTest;
 #import <OCMock/OCMock.h>

packages/camera/camera_avfoundation/example/ios/RunnerTests/FLTCamSampleBufferTests.m

@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 @import camera_avfoundation;
+#if __has_include(<camera_avfoundation/camera_avfoundation-umbrella.h>)
 @import camera_avfoundation.Test;
+#endif
 @import AVFoundation;
 @import XCTest;
 #import <OCMock/OCMock.h>

packages/camera/camera_avfoundation/example/ios/RunnerTests/FLTSavePhotoDelegateTests.m

@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 @import camera_avfoundation;
+#if __has_include(<camera_avfoundation/camera_avfoundation-umbrella.h>)
 @import camera_avfoundation.Test;
+#endif
 @import AVFoundation;
 @import XCTest;
 #import <OCMock/OCMock.h>

packages/camera/camera_avfoundation/example/ios/RunnerTests/QueueUtilsTests.m

@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 @import camera_avfoundation;
+#if __has_include(<camera_avfoundation/camera_avfoundation-umbrella.h>)
 @import camera_avfoundation.Test;
+#endif
 @import XCTest;
 
 @interface QueueUtilsTests : XCTestCase

packages/camera/camera_avfoundation/example/ios/RunnerTests/StreamingTest.m

@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 @import camera_avfoundation;
+#if __has_include(<camera_avfoundation/camera_avfoundation-umbrella.h>)
 @import camera_avfoundation.Test;
+#endif
 @import XCTest;
 @import AVFoundation;
 #import <OCMock/OCMock.h>

packages/camera/camera_avfoundation/example/ios/RunnerTests/ThreadSafeEventChannelTests.m

@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 @import camera_avfoundation;
+#if __has_include(<camera_avfoundation/camera_avfoundation-umbrella.h>)
 @import camera_avfoundation.Test;
+#endif
 @import XCTest;
 #import <OCMock/OCMock.h>
 

packages/camera/camera_avfoundation/ios/camera_avfoundation.podspec

@@ -13,12 +13,12 @@ A Flutter plugin to use the camera from your Flutter app.
   s.author           = { 'Flutter Dev Team' => '[email protected]' }
   s.source           = { :http => 'https://github.com/flutter/packages/tree/main/packages/camera_avfoundation' }
   s.documentation_url = 'https://pub.dev/packages/camera_avfoundation'
-  s.source_files = 'Classes/**/*.{h,m}'
-  s.public_header_files = 'Classes/**/*.h'
-  s.module_map = 'Classes/CameraPlugin.modulemap'
+  s.source_files = 'camera_avfoundation/Sources/camera_avfoundation/**/*.{h,m}'
+  s.public_header_files = 'camera_avfoundation/Sources/camera_avfoundation/include/**/*.h'
+  s.module_map = 'camera_avfoundation/Sources/camera_avfoundation/include/CameraPlugin.modulemap'
   s.dependency 'Flutter'
 
   s.platform = :ios, '12.0'
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
-  s.resource_bundles = {'camera_avfoundation_privacy' => ['Resources/PrivacyInfo.xcprivacy']}
+  s.resource_bundles = {'camera_avfoundation_privacy' => ['camera_avfoundation/Sources/camera_avfoundation/Resources/PrivacyInfo.xcprivacy']}
 end

packages/camera/camera_avfoundation/ios/camera_avfoundation/Package.swift

@@ -0,0 +1,31 @@
+// swift-tools-version: 5.9
+
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import PackageDescription
+
+let package = Package(
+  name: "camera_avfoundation",
+  platforms: [
+    .iOS("12.0")
+  ],
+  products: [
+    .library(name: "camera-avfoundation", targets: ["camera_avfoundation"])
+  ],
+  dependencies: [],
+  targets: [
+    .target(
+      name: "camera_avfoundation",
+      dependencies: [],
+      exclude: ["include/camera_avfoundation-umbrella.h", "include/CameraPlugin.modulemap"],
+      resources: [
+        .process("Resources")
+      ],
+      cSettings: [
+        .headerSearchPath("include/camera_avfoundation")
+      ]
+    )
+  ]
+)

packages/camera/camera_avfoundation/ios/Classes/CameraPermissionUtils.m → packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/CameraPermissionUtils.m

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 @import AVFoundation;
-#import "CameraPermissionUtils.h"
+#import "./include/camera_avfoundation/CameraPermissionUtils.h"
 
 void FLTRequestPermission(BOOL forAudio, FLTCameraPermissionRequestCompletionHandler handler) {
   AVMediaType mediaType;

packages/camera/camera_avfoundation/ios/Classes/CameraPlugin.m → packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/CameraPlugin.m

@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "CameraPlugin.h"
-#import "CameraPlugin_Test.h"
+#import "./include/camera_avfoundation/CameraPlugin.h"
+#import "./include/camera_avfoundation/CameraPlugin_Test.h"
 
 @import AVFoundation;
 @import Flutter;
 
-#import "CameraPermissionUtils.h"
-#import "CameraProperties.h"
-#import "FLTCam.h"
-#import "FLTThreadSafeEventChannel.h"
-#import "QueueUtils.h"
-#import "messages.g.h"
+#import "./include/camera_avfoundation/CameraPermissionUtils.h"
+#import "./include/camera_avfoundation/CameraProperties.h"
+#import "./include/camera_avfoundation/FLTCam.h"
+#import "./include/camera_avfoundation/FLTThreadSafeEventChannel.h"
+#import "./include/camera_avfoundation/QueueUtils.h"
+#import "./include/camera_avfoundation/messages.g.h"
 
 static FlutterError *FlutterErrorFromNSError(NSError *error) {
   return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %d", (int)error.code]

packages/camera/camera_avfoundation/ios/Classes/CameraProperties.m → packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/CameraProperties.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 "CameraProperties.h"
+#import "./include/camera_avfoundation/CameraProperties.h"
 
 AVCaptureFlashMode FCPGetAVCaptureFlashModeForPigeonFlashMode(FCPPlatformFlashMode mode) {
   switch (mode) {

packages/camera/camera_avfoundation/ios/Classes/FLTCam.m → packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/FLTCam.m

@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "FLTCam.h"
-#import "FLTCam_Test.h"
+#import "./include/camera_avfoundation/FLTCam.h"
+#import "./include/camera_avfoundation/FLTCam_Test.h"
 
 @import CoreMotion;
 @import Flutter;
 #import <libkern/OSAtomic.h>
 
-#import "FLTSavePhotoDelegate.h"
-#import "FLTThreadSafeEventChannel.h"
-#import "QueueUtils.h"
-#import "messages.g.h"
+#import "./include/camera_avfoundation/FLTSavePhotoDelegate.h"
+#import "./include/camera_avfoundation/FLTThreadSafeEventChannel.h"
+#import "./include/camera_avfoundation/QueueUtils.h"
+#import "./include/camera_avfoundation/messages.g.h"
 
 static FlutterError *FlutterErrorFromNSError(NSError *error) {
   return [FlutterError errorWithCode:[NSString stringWithFormat:@"Error %d", (int)error.code]

packages/camera/camera_avfoundation/ios/Classes/FLTCamMediaSettingsAVWrapper.m → packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/FLTCamMediaSettingsAVWrapper.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 "FLTCamMediaSettingsAVWrapper.h"
+#import "./include/camera_avfoundation/FLTCamMediaSettingsAVWrapper.h"
 
 @implementation FLTCamMediaSettingsAVWrapper
 

packages/camera/camera_avfoundation/ios/Classes/FLTSavePhotoDelegate.m → packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/FLTSavePhotoDelegate.m

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "FLTSavePhotoDelegate.h"
-#import "FLTSavePhotoDelegate_Test.h"
+#import "./include/camera_avfoundation/FLTSavePhotoDelegate.h"
+#import "./include/camera_avfoundation/FLTSavePhotoDelegate_Test.h"
 
 @interface FLTSavePhotoDelegate ()
 /// The file path for the captured photo.

packages/camera/camera_avfoundation/ios/Classes/FLTThreadSafeEventChannel.m → packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/FLTThreadSafeEventChannel.m

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "FLTThreadSafeEventChannel.h"
-#import "QueueUtils.h"
+#import "./include/camera_avfoundation/FLTThreadSafeEventChannel.h"
+#import "./include/camera_avfoundation/QueueUtils.h"
 
 @interface FLTThreadSafeEventChannel ()
 @property(nonatomic, strong) FlutterEventChannel *channel;