Skip to content

Commit 0d89956

Browse files
authored
Merge pull request #153 from tbaranes/feature/xcode_14
Fixed compilation using Xcode 14
2 parents a5b6b85 + 687352e commit 0d89956

File tree

4 files changed

+13
-16
lines changed

4 files changed

+13
-16
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: macOS-latest
2222
strategy:
2323
matrix:
24-
destination: ["OS=14.4,name=iPhone 11 Pro"] #, "OS=12.4,name=iPhone XS", "OS=11.4,name=iPhone X", "OS=10.3.1,name=iPhone SE"]
24+
destination: ["OS=15.2,name=iPhone 11 Pro"] #, "OS=12.4,name=iPhone XS", "OS=11.4,name=iPhone X", "OS=10.3.1,name=iPhone SE"]
2525
steps:
2626
- uses: actions/checkout@v1
2727
- name: iOS - ${{ matrix.destination }}
@@ -33,7 +33,7 @@ jobs:
3333
runs-on: macOS-latest
3434
strategy:
3535
matrix:
36-
destination: ["OS=14.3,name=Apple TV 4K"] #, "OS=11.4,name=Apple TV 4K", "OS=10.2,name=Apple TV 1080p"]
36+
destination: ["OS=15.2,name=Apple TV 4K"] #, "OS=11.4,name=Apple TV 4K", "OS=10.2,name=Apple TV 1080p"]
3737
steps:
3838
- uses: actions/checkout@v1
3939
- name: tvOS - ${{ matrix.destination }}
@@ -43,7 +43,7 @@ jobs:
4343
runs-on: macOS-latest
4444
strategy:
4545
matrix:
46-
destination: ["OS=7.2,name=Apple Watch Series 5 - 44mm"] #, "OS=4.2,name=Apple Watch Series 3 - 42mm", "OS=3.2,name=Apple Watch Series 2 - 42mm"]
46+
destination: ["OS=8.3,name=Apple Watch Series 5 - 44mm"] #, "OS=4.2,name=Apple Watch Series 3 - 42mm", "OS=3.2,name=Apple Watch Series 2 - 42mm"]
4747
steps:
4848
- uses: actions/checkout@v1
4949
- name: watchOS - ${{ matrix.destination }}

Sources/Extensions/Swift/Data/DataExtension.swift

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,19 @@ extension Data {
6868
public func toHexString(hexLeader: Bool = false, spaces: Bool = false) -> String {
6969
let count = self.count / MemoryLayout<UInt8>.stride
7070

71-
var hexString = ""
72-
if hexLeader {
73-
hexString = "0x"
74-
}
71+
let hexString = withUnsafeBytes { bytes -> String in
72+
var hexString = ""
73+
if hexLeader {
74+
hexString = "0x"
75+
}
7576

76-
self.withUnsafeBytes { bytes in
77-
for index in 0..<count {
77+
for (index, byte) in bytes.enumerated() {
7878
if spaces && (index % 4) == 0 && index != 0 && index != (count - 1) {
7979
hexString += " "
8080
}
81-
hexString += String(format: "%02X", bytes[index])
81+
hexString += String(format: "%02X", byte)
8282
}
83+
return hexString
8384
}
8485
return hexString
8586
}

SwiftyUtils.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2044,15 +2044,15 @@
20442044
};
20452045
E2576C401D1480E6009B2CD0 /* Run Script - ⚠️ SwiftLint */ = {
20462046
isa = PBXShellScriptBuildPhase;
2047-
buildActionMask = 2147483647;
2047+
buildActionMask = 8;
20482048
files = (
20492049
);
20502050
inputPaths = (
20512051
);
20522052
name = "Run Script - ⚠️ SwiftLint";
20532053
outputPaths = (
20542054
);
2055-
runOnlyForDeploymentPostprocessing = 0;
2055+
runOnlyForDeploymentPostprocessing = 1;
20562056
shellPath = /bin/sh;
20572057
shellScript = "swiftlint --config .swiftlint.yml\n";
20582058
};

Tests/Extensions/Foundation/Bundle/BundleExtensionTests.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ extension BundleExtensionTests {
2525
XCTAssertEqual(Bundle.main.displayName, "")
2626
}
2727

28-
func testAppVersion() {
29-
XCTAssertEqual(Bundle.main.appVersion, "")
30-
}
31-
3228
func testBundleId() {
3329
XCTAssertEqual(Bundle.main.bundleId, "com.apple.dt.xctest.tool")
3430
}

0 commit comments

Comments
 (0)