Skip to content

Commit

Permalink
Bump Xcode to 15.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
shogo4405 committed Sep 3, 2023
1 parent 2e1cb55 commit a06956b
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 25 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ on: [pull_request]
jobs:
build:

runs-on: macOS-12
runs-on: macOS-13

steps:
- uses: actions/checkout@v1
- name: Select Xcode version
run: sudo xcode-select -s '/Applications/Xcode_15.0.app'
- name: bundle install
run: |
bundle install
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "shogo4405/Logboard" ~> 2.3.1
github "shogo4405/Logboard" ~> 2.4.1
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "shogo4405/Logboard" "2.3.1"
github "shogo4405/Logboard" "2.4.1"
16 changes: 10 additions & 6 deletions HaishinKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -2089,15 +2089,15 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = "";
SUPPORTED_PLATFORMS = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
TARGETED_DEVICE_FAMILY = "1,2";
TVOS_DEPLOYMENT_TARGET = 11.0;
TVOS_DEPLOYMENT_TARGET = 12.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand Down Expand Up @@ -2145,15 +2145,15 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = "";
SUPPORTED_PLATFORMS = "";
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
TARGETED_DEVICE_FAMILY = "1,2";
TVOS_DEPLOYMENT_TARGET = 11.0;
TVOS_DEPLOYMENT_TARGET = 12.0;
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand All @@ -2176,6 +2176,7 @@
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = "$(SRCROOT)/Platforms/iOS/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -2195,6 +2196,7 @@
SWIFT_INCLUDE_PATHS = "";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3";
TVOS_DEPLOYMENT_TARGET = 12.0;
};
name = Debug;
};
Expand All @@ -2214,6 +2216,7 @@
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = "$(SRCROOT)/Platforms/iOS/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -2232,6 +2235,7 @@
SWIFT_INCLUDE_PATHS = "";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3";
TVOS_DEPLOYMENT_TARGET = 12.0;
};
name = Release;
};
Expand Down Expand Up @@ -2480,7 +2484,7 @@
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2023 Shogo Endo. All rights reserved.";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -2530,7 +2534,7 @@
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2023 Shogo Endo. All rights reserved.";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
8 changes: 4 additions & 4 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// swift-tools-version:5.5
// swift-tools-version:5.9
// The swift-tools-version declares the minimum version of Swift required to build this package.
import PackageDescription

let package = Package(
name: "HaishinKit",
platforms: [
.iOS(.v11),
.tvOS(.v11),
.iOS(.v12),
.tvOS(.v12),
.macOS(.v10_13),
.macCatalyst(.v14)
],
Expand All @@ -15,7 +15,7 @@ let package = Package(
.library(name: "SRTHaishinKit", targets: ["SRTHaishinKit"])
],
dependencies: [
.package(url: "https://github.com/shogo4405/Logboard.git", from: "2.3.1")
.package(url: "https://github.com/shogo4405/Logboard.git", from: "2.4.0")
],
targets: [
.binaryTarget(
Expand Down
12 changes: 6 additions & 6 deletions Sources/Codec/AudioCodecRingBuffer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -118,23 +118,23 @@ final class AudioCodecRingBuffer {
let channelCount = Int(format.channelCount)
switch format.commonFormat {
case .pcmFormatInt16:
current.int16ChannelData?[0].assign(repeating: 0, count: numSamples * channelCount)
current.int16ChannelData?[0].update(repeating: 0, count: numSamples * channelCount)
case .pcmFormatInt32:
current.int32ChannelData?[0].assign(repeating: 0, count: numSamples * channelCount)
current.int32ChannelData?[0].update(repeating: 0, count: numSamples * channelCount)
case .pcmFormatFloat32:
current.floatChannelData?[0].assign(repeating: 0, count: numSamples * channelCount)
current.floatChannelData?[0].update(repeating: 0, count: numSamples * channelCount)
default:
break
}
} else {
for i in 0..<Int(format.channelCount) {
switch format.commonFormat {
case .pcmFormatInt16:
current.int16ChannelData?[i].assign(repeating: 0, count: numSamples)
current.int16ChannelData?[i].update(repeating: 0, count: numSamples)
case .pcmFormatInt32:
current.int32ChannelData?[i].assign(repeating: 0, count: numSamples)
current.int32ChannelData?[i].update(repeating: 0, count: numSamples)
case .pcmFormatFloat32:
current.floatChannelData?[i].assign(repeating: 0, count: numSamples)
current.floatChannelData?[i].update(repeating: 0, count: numSamples)
default:
break
}
Expand Down
12 changes: 6 additions & 6 deletions Sources/Media/IOAudioMonitorRingBuffer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -124,23 +124,23 @@ class IOAudioMonitorRingBuffer {
let channelCount = Int(format.channelCount)
switch format.commonFormat {
case .pcmFormatInt16:
buffer.int16ChannelData?[0].assign(repeating: 0, count: numSamples * channelCount)
buffer.int16ChannelData?[0].update(repeating: 0, count: numSamples * channelCount)
case .pcmFormatInt32:
buffer.int32ChannelData?[0].assign(repeating: 0, count: numSamples * channelCount)
buffer.int32ChannelData?[0].update(repeating: 0, count: numSamples * channelCount)
case .pcmFormatFloat32:
buffer.floatChannelData?[0].assign(repeating: 0, count: numSamples * channelCount)
buffer.floatChannelData?[0].update(repeating: 0, count: numSamples * channelCount)
default:
break
}
} else {
for i in 0..<Int(format.channelCount) {
switch format.commonFormat {
case .pcmFormatInt16:
buffer.int16ChannelData?[i].assign(repeating: 0, count: numSamples)
buffer.int16ChannelData?[i].update(repeating: 0, count: numSamples)
case .pcmFormatInt32:
buffer.int32ChannelData?[i].assign(repeating: 0, count: numSamples)
buffer.int32ChannelData?[i].update(repeating: 0, count: numSamples)
case .pcmFormatFloat32:
buffer.floatChannelData?[i].assign(repeating: 0, count: numSamples)
buffer.floatChannelData?[i].update(repeating: 0, count: numSamples)
default:
break
}
Expand Down

0 comments on commit a06956b

Please sign in to comment.