Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for arm64 simulator slice in xcframework #3

Merged
merged 4 commits into from
Jul 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions Package.resolved

This file was deleted.

10 changes: 6 additions & 4 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,16 @@ let package = Package(
dependencies: [
.package(
name: "YbridOpus",
url: "https://github.com/ybrid/opus-swift.git",
from: "0.8.0"),
url: "https://github.com/vector-im/opus-swift",
from: "0.8.4"),
.package(
name: "YbridOgg",
url: "https://github.com/ybrid/ogg-swift.git",
from: "0.8.0")
url: "https://github.com/vector-im/ogg-swift.git",
from: "0.8.3")
],
targets: [
// To debug with a local framework
// .binaryTarget(name: "YbridOpus", path: "YbridOpus.xcframework"),
.target(name: "Copustools", path: "Sources/SupportingFiles/Dependencies/Copustools"),
.target(name: "SwiftOGG", dependencies: ["YbridOpus", "YbridOgg", "Copustools"], path: "Sources/SwiftOGG"),
.testTarget(name: "EncoderDecoderTests", dependencies: ["SwiftOGG"], resources: [.process("Resources")]),
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ Apple's recording and playback APIs from `AVFoundation` can then be used quite s
# Licence
Portions of the swift-ogg library contain code derived from [watson-developer-cloud/swift-sdk](https://github.com/watson-developer-cloud/swift-sdk) under the Apache License 2.0

This project makes use of [opus-swift](https://github.com/ybrid/opus-swift) and [ogg-swift](https://github.com/ybrid/ogg-swift) which package the source code of libopus and libogg as platform independend XCFrameworks.
This project makes use of [opus-swift](https://github.com/vector-im/opus-swift) and [ogg-swift](https://github.com/vector-im/ogg-swift.git) which package the source code of libopus and libogg as platform independent XCFrameworks.
These two projects are under the MIT licence while the underlying libopus and libogg library source themselves are included under the BSD Licence described [here](https://opus-codec.org/license/)
10 changes: 10 additions & 0 deletions Sample.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Sample.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
8 changes: 8 additions & 0 deletions Sample.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>PreviewsEnabled</key>
<false/>
</dict>
</plist>
25 changes: 25 additions & 0 deletions Sample.xcworkspace/xcshareddata/swiftpm/Package.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"object": {
"pins": [
{
"package": "YbridOgg",
"repositoryURL": "https://github.com/vector-im/ogg-swift.git",
"state": {
"branch": null,
"revision": "9d82ed838404f10b607a1a1689f404563e9115c3",
"version": "0.8.3"
}
},
{
"package": "YbridOpus",
"repositoryURL": "https://github.com/vector-im/opus-swift",
"state": {
"branch": null,
"revision": "11f1887767cbc87c4b64b789ee830b779cc744cb",
"version": "0.8.4"
}
}
]
},
"version": 1
}
Loading