Skip to content

Commit 8eabd31

Browse files
authored
Merge pull request #105 from GiacomoLeopizzi/swift_package_manager
Swift package manager
2 parents 24d9220 + 6c0465b commit 8eabd31

File tree

9 files changed

+29
-24
lines changed

9 files changed

+29
-24
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,4 @@ fastlane/report.xml
6565
fastlane/Preview.html
6666
fastlane/screenshots
6767
fastlane/test_output
68+
.DS_Store

ARVideoKit.xcodeproj/project.pbxproj

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
FB2E36891FAE29C00035B8D6 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = FB2E36881FAE29BF0035B8D6 /* LICENSE */; };
1212
FB404FFE20D72A190056EA1D /* JPEG.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB404FFD20D72A190056EA1D /* JPEG.swift */; };
1313
FBD604DF1FA969DD00EC9804 /* ARVideoKit.h in Headers */ = {isa = PBXBuildFile; fileRef = FBD604DD1FA969DD00EC9804 /* ARVideoKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
14-
FBD604EB1FA96B1C00EC9804 /* video.scnassets in Resources */ = {isa = PBXBuildFile; fileRef = FBD604EA1FA96B1C00EC9804 /* video.scnassets */; };
1514
FBD604EE1FA96B2700EC9804 /* ARVideoOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = FBD604EC1FA96B2700EC9804 /* ARVideoOptions.swift */; };
1615
FBD604EF1FA96B2700EC9804 /* ARInputViewOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = FBD604ED1FA96B2700EC9804 /* ARInputViewOptions.swift */; };
1716
FBD604F51FA96B3300EC9804 /* UIImage+VideoBuffer.swift in Sources */ = {isa = PBXBuildFile; fileRef = FBD604F01FA96B3300EC9804 /* UIImage+VideoBuffer.swift */; };
@@ -40,7 +39,6 @@
4039
FBD604DA1FA969DD00EC9804 /* ARVideoKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ARVideoKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4140
FBD604DD1FA969DD00EC9804 /* ARVideoKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ARVideoKit.h; sourceTree = "<group>"; };
4241
FBD604DE1FA969DD00EC9804 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
43-
FBD604EA1FA96B1C00EC9804 /* video.scnassets */ = {isa = PBXFileReference; lastKnownFileType = wrapper.scnassets; path = video.scnassets; sourceTree = "<group>"; };
4442
FBD604EC1FA96B2700EC9804 /* ARVideoOptions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ARVideoOptions.swift; sourceTree = "<group>"; };
4543
FBD604ED1FA96B2700EC9804 /* ARInputViewOptions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ARInputViewOptions.swift; sourceTree = "<group>"; };
4644
FBD604F01FA96B3300EC9804 /* UIImage+VideoBuffer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIImage+VideoBuffer.swift"; sourceTree = "<group>"; };
@@ -110,7 +108,6 @@
110108
isa = PBXGroup;
111109
children = (
112110
B466A8B62279E33800BD7070 /* Utils */,
113-
FBD604E51FA96ACD00EC9804 /* Assets */,
114111
FBD604E61FA96AD400EC9804 /* Enumerations */,
115112
FBD604E71FA96AE500EC9804 /* Extensions */,
116113
FBD604E81FA96AEC00EC9804 /* Protocols */,
@@ -122,14 +119,6 @@
122119
path = ARVideoKit;
123120
sourceTree = "<group>";
124121
};
125-
FBD604E51FA96ACD00EC9804 /* Assets */ = {
126-
isa = PBXGroup;
127-
children = (
128-
FBD604EA1FA96B1C00EC9804 /* video.scnassets */,
129-
);
130-
path = Assets;
131-
sourceTree = "<group>";
132-
};
133122
FBD604E61FA96AD400EC9804 /* Enumerations */ = {
134123
isa = PBXGroup;
135124
children = (
@@ -281,7 +270,6 @@
281270
buildActionMask = 2147483647;
282271
files = (
283272
FB2E36891FAE29C00035B8D6 /* LICENSE in Resources */,
284-
FBD604EB1FA96B1C00EC9804 /* video.scnassets in Resources */,
285273
FBD605071FA96B6B00EC9804 /* LoveLiver_LICENSE in Resources */,
286274
);
287275
runOnlyForDeploymentPostprocessing = 0;
-203 KB
Binary file not shown.

ARVideoKit/Enumerations/ARVideoOptions.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// Created by Ahmed Bekhit on 10/18/17.
66
// Copyright © 2017 Ahmed Fathi Bekhit. All rights reserved.
77
//
8+
import Foundation
89

910
/// Allows specifying the final video orientation.
1011
@objc public enum ARFrameMode: Int {

ARVideoKit/Extensions/RecordAR+PhotoRender.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import AVFoundation
1010
import Photos
11+
import UIKit
1112

1213
@available(iOS 11.0, *)
1314
extension RecordAR {

ARVideoKit/Rendering/Live Photo/Generate+LivePhoto.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import AVFoundation
1010
import Photos
11+
import UIKit
1112

1213
@available(iOS 11.0, *)
1314
class LivePhotoGenerator {

ARVideoKit/Sources/RecordAR.swift

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -143,16 +143,9 @@ import PhotosUI
143143
view = ARSpriteKit
144144
scnView = SCNView(frame: UIScreen.main.bounds)
145145

146-
let bundle = Bundle(for: RecordAR.self)
147-
let url = bundle.url(forResource: "video.scnassets/vid", withExtension: "scn")
148-
149-
do {
150-
let scene = try SCNScene(url: url!, options: nil)
151-
scnView.scene = scene
152-
setup()
153-
}catch let error {
154-
logAR.message("Error occurred while loading SK Video Assets : \(error). Please download \"video.scnassets\" from\nwww.ahmedbekhit.com/ARVideoKitAssets")
155-
}
146+
let scene = SCNScene()
147+
scnView.scene = scene
148+
setup()
156149
}
157150

158151
/**

Package.swift

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,23 @@
1-
// swift-tools-version:4.0
1+
// swift-tools-version:5.1
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33

44
import PackageDescription
55

66
let package = Package(
7-
name: "ARVideoKit"
7+
name: "ARVideoKit",
8+
platforms: [
9+
.iOS(.v11)
10+
],
11+
products: [
12+
.library(
13+
name: "ARVideoKit",
14+
targets: ["ARVideoKit"]),
15+
],
16+
dependencies: [ ],
17+
targets: [
18+
.target(
19+
name: "ARVideoKit",
20+
dependencies: [],
21+
path: "ARVideoKit")
22+
]
823
)

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ github "AFathi/ARVideoKit" ~> 1.31
7474
$ carthage update
7575
```
7676

77+
### Swift Package Manager (available Xcode 11.2 and forward)
78+
79+
1. In Xcode, select File > Swift Packages > Add Package Dependency.
80+
2. Follow the prompts using the URL for this repository.
81+
7782
### Manual
7883
Drag `ARVideoKit.xcodeproj` into your project and click the **+** button in the embedded binaries section of your project's target.
7984
![example embed framework](http://www.ahmedbekhit.com/embeddedBinary.png)

0 commit comments

Comments
 (0)