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

Modify the sample code to use SPM. #1622

Merged
merged 1 commit into from
Nov 10, 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
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion HaishinKit.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Pod::Spec.new do |s|
s.osx.deployment_target = "10.15"
s.tvos.deployment_target = "13.0"
s.visionos.deployment_target = "1.0"
s.source_files = "Sources/**/*.swift", "Platforms/*.{h,swift}"
s.source_files = "HaishinKit/Sources/**/*.swift"
s.dependency 'Logboard', '~> 2.5.0'

end
838 changes: 195 additions & 643 deletions HaishinKit.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"originHash" : "65fb8386efe381a8d8c0bbcbddd33200978bf40057eb2c5aa74817b5200968c7",
"originHash" : "87b7d77cdfb110dfd10d32a20bd753033d5b64aee2a2425cb4e35bc311b18f5c",
"pins" : [
{
"identity" : "logboard",
Expand Down
11 changes: 11 additions & 0 deletions HaishinKit.xcodeproj/xcshareddata/xcschemes/Example iOS.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,17 @@
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO"
parallelizable = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BCB798882CE06AEC0059DFE9"
BuildableName = "Tests.xctest"
BlueprintName = "Tests"
ReferencedContainer = "container:HaishinKit.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
Expand Down
76 changes: 0 additions & 76 deletions HaishinKit.xcodeproj/xcshareddata/xcschemes/HaishinKit.xcscheme

This file was deleted.

11 changes: 11 additions & 0 deletions HaishinKit.xcodeproj/xcshareddata/xcschemes/Screencast.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,17 @@
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO"
parallelizable = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BCB798882CE06AEC0059DFE9"
BuildableName = "Tests.xctest"
BlueprintName = "Tests"
ReferencedContainer = "container:HaishinKit.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
Expand Down
38 changes: 11 additions & 27 deletions HaishinKit.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1540"
version = "1.3">
LastUpgradeVersion = "1610"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
buildImplicitDependencies = "YES"
buildArchitectures = "Automatic">
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
<Testables>
<TestableReference
skipped = "NO">
skipped = "NO"
parallelizable = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "29798E581CE60E5300F5CBD0"
BlueprintIdentifier = "BCB798882CE06AEC0059DFE9"
BuildableName = "Tests.xctest"
BlueprintName = "Tests"
ReferencedContainer = "container:HaishinKit.xcodeproj">
Expand All @@ -26,40 +29,21 @@
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = ""
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "29C9327D1CD76FB800283FC5"
BuildableName = "Example iOS.app"
BlueprintName = "Example iOS"
ReferencedContainer = "container:HaishinKit.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "29C9327D1CD76FB800283FC5"
BuildableName = "Example iOS.app"
BlueprintName = "Example iOS"
ReferencedContainer = "container:HaishinKit.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
Expand Down
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.
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,8 @@ import Testing

@testable import HaishinKit

/*

@Suite struct AudioMixerByMultiTrackTests {
final class Result: AudioMixerDelegate {
var outputs: [AVAudioPCMBuffer] = []
Expand Down Expand Up @@ -82,3 +84,5 @@ import Testing
#expect(inputFormats[1]?.sampleRate == 44100)
}
}

*/
File renamed without changes.
File renamed without changes.
41 changes: 18 additions & 23 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.9
// swift-tools-version:6.0
// The swift-tools-version declares the minimum version of Swift required to build this package.
import PackageDescription

Expand All @@ -21,29 +21,24 @@ let package = Package(
targets: [
.binaryTarget(
name: "libsrt",
path: "Vendor/SRT/libsrt.xcframework"
path: "SRTHaishinKit/Vendor/SRT/libsrt.xcframework"
),
.target(name: "HaishinKit",
dependencies: ["Logboard"],
path: "Sources",
sources: [
"Codec",
"Extension",
"HKStream",
"ISO",
"Mixer",
"Network",
"RTMP",
"Screen",
"Util",
"View"
]),
.target(name: "SRTHaishinKit",
dependencies: [
"libsrt",
"HaishinKit"
],
path: "SRTHaishinKit"
.target(
name: "HaishinKit",
dependencies: ["Logboard"],
path: "HaishinKit/Sources"),
.target(
name: "SRTHaishinKit",
dependencies: ["libsrt", "HaishinKit"],
path: "SRTHaishinKit/Sources"
),
.testTarget(
name: "HaishinKitTests",
dependencies: ["HaishinKit"],
path: "HaishinKit/Tests",
resources: [
.process("Asset")
]
)
]
)
4 changes: 2 additions & 2 deletions SRTHaishinKit.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ Pod::Spec.new do |s|

# s.visionos.deployment_target = "1.0"

s.source_files = "SRTHaishinKit/*.{h,swift}"
s.vendored_frameworks = "Vendor/SRT/libsrt.xcframework"
s.source_files = "SRTHaishinKit/Sources/*.swift"
s.vendored_frameworks = "SRTHaishinKit/Vendor/SRT/libsrt.xcframework"
s.dependency 'HaishinKit', '2.0.0'

end
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.
Loading