Skip to content

Commit

Permalink
[camera_avfoundation] Adds Swift Package Manager compatibility (flutt…
Browse files Browse the repository at this point in the history 
…er#7080)

Adds Swift Package Manager support to `camera_avfoundation`.

This does not migrate the example app's Xcode project to use Swift Package Manager, that's tracked by flutter/flutter#148021.

Fixes flutter/flutter#146902
  • Loading branch information
@loic-sharma
loic-sharma authored Jul 10, 2024
1 parent 57d42e4 commit ea35fc6
Show file tree
Hide file tree
Showing 49 changed files with 133 additions and 33 deletions.
4 changes: 4 additions & 0 deletions packages/camera/camera_avfoundation/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 1,7 @@
## 0.9.17

* Adds Swift Package Manager compatibility.

## 0.9.16 3

* Removes unused `maxVideoDuration` code.
Expand Down
2 changes: 0 additions & 2 deletions packages/camera/camera_avfoundation/example/ios/Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 32,6 @@ target 'Runner' do

target 'RunnerTests' do
inherit! :search_paths
# Pods for testing
pod 'OCMock', '~> 3.8.1'
end
end

Expand Down
27 changes: 27 additions & 0 deletions packages/camera/camera_avfoundation/example/ios/Runner.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -106,6 107,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
408D7A792C3C9CD000B71F9A /* OCMock in Frameworks */,
25C3919135C3D981E6F800D0 /* libPods-RunnerTests.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -295,6 300,9 @@
Base,
);
mainGroup = 97C146E51CF9500F007C117D;
packageReferences = (
408D7A772C3C9CD000B71F9A /* XCRemoteSwiftPackageReference "ocmock" */,
);
productRefGroup = 97C146EF1CF9500F007C117D /* Products */;
projectDirPath = "";
projectRoot = "";
Expand Down Expand Up @@ -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 = 97C146E61CF9500F007C117D /* Project object */;
}
2 changes: 2 additions & 0 deletions packages/camera/camera_avfoundation/example/ios/RunnerTests/AvailableCamerasTest.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions ...camera_avfoundation/example/ios/RunnerTests/CameraCaptureSessionQueueRaceConditionTests.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraFocusTests.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraMethodChannelTests.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraOrientationTests.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 2 additions & 0 deletions packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraPermissionTests.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraPreviewPauseTests.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraPropertiesTests.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 2 additions & 0 deletions packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraSessionPresetsTests.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraSettingsTests.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraTestUtils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions packages/camera/camera_avfoundation/example/ios/RunnerTests/FLTCamPhotoCaptureTests.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions packages/camera/camera_avfoundation/example/ios/RunnerTests/FLTCamSampleBufferTests.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions packages/camera/camera_avfoundation/example/ios/RunnerTests/FLTSavePhotoDelegateTests.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions packages/camera/camera_avfoundation/example/ios/RunnerTests/QueueUtilsTests.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions packages/camera/camera_avfoundation/example/ios/RunnerTests/StreamingTest.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions packages/camera/camera_avfoundation/example/ios/RunnerTests/ThreadSafeEventChannelTests.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Empty file removed packages/camera/camera_avfoundation/ios/Assets/.gitkeep
View file
Empty file.
8 changes: 4 additions & 4 deletions packages/camera/camera_avfoundation/ios/camera_avfoundation.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
31 changes: 31 additions & 0 deletions packages/camera/camera_avfoundation/ios/camera_avfoundation/Package.swift
View file
Original file line number Diff line number Diff line change
@@ -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")
]
)
]
)
2 changes: 1 addition & 1 deletion ...ation/ios/Classes/CameraPermissionUtils.m → ...mera_avfoundation/CameraPermissionUtils.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 8 additions & 8 deletions ...a_avfoundation/ios/Classes/CameraPlugin.m → ...ources/camera_avfoundation/CameraPlugin.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion ...foundation/ios/Classes/CameraProperties.m → ...es/camera_avfoundation/CameraProperties.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
12 changes: 6 additions & 6 deletions .../camera_avfoundation/ios/Classes/FLTCam.m → ...tion/Sources/camera_avfoundation/FLTCam.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion ...os/Classes/FLTCamMediaSettingsAVWrapper.m → ...foundation/FLTCamMediaSettingsAVWrapper.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions ...dation/ios/Classes/FLTSavePhotoDelegate.m → ...amera_avfoundation/FLTSavePhotoDelegate.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions ...n/ios/Classes/FLTThreadSafeEventChannel.m → ..._avfoundation/FLTThreadSafeEventChannel.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading

0 comments on commit ea35fc6

Please sign in to comment.