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

SPM Multi-module structure. #1615

Merged
merged 1 commit into from
Nov 4, 2024
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 2 additions & 4 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ analyzer_rules:
- unused_declaration
- unused_import
excluded:
- Carthage
- Pods
- Tests
- Vendor
- HaishinKit/Tests
- SRTHaishinKit/Vendor
- .build
opt_in_rules:
# - anyobject_protocol
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ GEM
fastlane-sirp (1.0.0)
sysrandom (~> 1.0)
ffi (1.17.0-arm64-darwin)
ffi (1.17.0-x86_64-linux-gnu)
ffi (1.17.0-x86_64-linux)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
Expand Down
700 changes: 111 additions & 589 deletions HaishinKit.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

76 changes: 0 additions & 76 deletions HaishinKit.xcodeproj/xcshareddata/xcschemes/HaishinKit.xcscheme

This file was deleted.

71 changes: 0 additions & 71 deletions HaishinKit.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme

This file was deleted.

8 changes: 8 additions & 0 deletions HaishinKit/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.DS_Store
/.build
/Packages
xcuserdata/
DerivedData/
.swiftpm/configuration/registries.json
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
.netrc
File renamed without changes.
3 changes: 2 additions & 1 deletion Package.resolved → HaishinKit/Package.resolved
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"originHash" : "f0433a32d23a021b38373f06621571fae23bad3db6b5c0b1d0800f6003fc19fe",
"pins" : [
{
"identity" : "logboard",
Expand All @@ -10,5 +11,5 @@
}
}
],
"version" : 2
"version" : 3
}
46 changes: 46 additions & 0 deletions HaishinKit/Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
// swift-tools-version: 6.0
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription

let package = Package(
name: "HaishinKit",
platforms: [
.iOS(.v13),
.tvOS(.v13),
.visionOS(.v1),
.macOS(.v10_15),
.macCatalyst(.v14)
],
products: [
.library(name: "HaishinKit", targets: ["HaishinKit"])
],
dependencies: [
.package(url: "https://github.com/shogo4405/Logboard.git", "2.5.0"..<"2.6.0")
],
targets: [
.target(
name: "HaishinKit",
dependencies: ["Logboard"],
path: "Sources",
sources: [
"Codec",
"Extension",
"HKStream",
"ISO",
"Mixer",
"Network",
"RTMP",
"Screen",
"Util",
"View"
]),
.testTarget(
name: "HaishinKitTests", dependencies: ["HaishinKit"],
resources: [
.process("TestData")
]
)
],
swiftLanguageModes: [.version("5"), .version("6")]
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import Testing

@testable import HaishinKit

/*
@Suite struct AudioMixerByMultiTrackTests {
final class Result: AudioMixerDelegate {
var outputs: [AVAudioPCMBuffer] = []
Expand Down Expand Up @@ -82,3 +83,4 @@ import Testing
#expect(inputFormats[1]?.sampleRate == 44100)
}
}
*/
File renamed without changes.
File renamed without changes.
49 changes: 0 additions & 49 deletions Package.swift

This file was deleted.

5 changes: 0 additions & 5 deletions Platforms/HaishinKit.h

This file was deleted.

28 changes: 0 additions & 28 deletions Platforms/Info.plist

This file was deleted.

15 changes: 15 additions & 0 deletions SRTHaishinKit/Package.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"originHash" : "7ca72a24d629e4929669016660ee8ce04b0d1bfd8b1c81d1b54d70ff64b7b9a6",
"pins" : [
{
"identity" : "logboard",
"kind" : "remoteSourceControl",
"location" : "https://github.com/shogo4405/Logboard.git",
"state" : {
"revision" : "272976e1f3e8873e60ffe4b08fe50df48a93751b",
"version" : "2.5.0"
}
}
],
"version" : 3
}
35 changes: 35 additions & 0 deletions SRTHaishinKit/Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// swift-tools-version: 6.0
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription

let package = Package(
name: "SRTHaishinKit",
platforms: [
.iOS(.v13),
.tvOS(.v13),
.visionOS(.v1),
.macOS(.v13),
.macCatalyst(.v14)
],
products: [
.library(name: "SRTHaishinKit", targets: ["SRTHaishinKit"])
],
dependencies: [
.package(path: "../HaishinKit")
],
targets: [
.binaryTarget(
name: "libsrt",
path: "Vendor/SRT/libsrt.xcframework"
),
.target(name: "SRTHaishinKit",
dependencies: ["HaishinKit", "libsrt"],
path: "Sources"
),
.testTarget(
name: "SRTHaishinKitTests", dependencies: ["SRTHaishinKit"]
)
],
swiftLanguageModes: [.version("5")]
)
4 changes: 0 additions & 4 deletions SRTHaishinKit/SRTHaishinKit.h

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading