From 356db5d4dc3a0523909bfd1f5709e6a4b8e4a619 Mon Sep 17 00:00:00 2001 From: Dmitriy Borovikov Date: Thu, 11 Jan 2024 19:12:42 +0300 Subject: [PATCH] Update for minimum Swift 5.6 comparability. --- LICENSE | 2 +- LinuxMain.swift | 8 --- Package.swift | 3 +- README.md | 2 +- Sources/CDRCodable/Decoder/CDRDecoder.swift | 2 +- Tests/XCTestManifests.swift | 67 --------------------- 6 files changed, 4 insertions(+), 80 deletions(-) delete mode 100644 LinuxMain.swift delete mode 100644 Tests/XCTestManifests.swift diff --git a/LICENSE b/LICENSE index 44744d9..0078dc3 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019 Dmitriy Borovikov +Copyright (c) 2024 Dmitriy Borovikov Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/LinuxMain.swift b/LinuxMain.swift deleted file mode 100644 index 261a33b..0000000 --- a/LinuxMain.swift +++ /dev/null @@ -1,8 +0,0 @@ -import XCTest - -import CDRCodableTests - -var tests = [XCTestCaseEntry]() -tests += CDRCodableTests.__allTests() - -XCTMain(tests) diff --git a/Package.swift b/Package.swift index 37cb723..e24d95d 100644 --- a/Package.swift +++ b/Package.swift @@ -1,5 +1,4 @@ -// swift-tools-version:4.2 -// The swift-tools-version declares the minimum version of Swift required to build this package. +// swift-tools-version:5.6 import PackageDescription diff --git a/README.md b/README.md index cefe45b..337da81 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Now can be used with [FastRTPSBridge](https://github.com/DimaRU/FastRTPSBridge), ## Requirements -- Swift 4.2+ +- Swift 5.6+ ## Usage diff --git a/Sources/CDRCodable/Decoder/CDRDecoder.swift b/Sources/CDRCodable/Decoder/CDRDecoder.swift index a50a040..d07d011 100644 --- a/Sources/CDRCodable/Decoder/CDRDecoder.swift +++ b/Sources/CDRCodable/Decoder/CDRDecoder.swift @@ -93,7 +93,7 @@ extension _CDRDecoder: Decoder { } } -protocol _CDRDecodingContainer: class { +protocol _CDRDecodingContainer: AnyObject { var codingPath: [CodingKey] { get set } var userInfo: [CodingUserInfoKey : Any] { get } var data: _CDRDecoder.DataBlock { get } diff --git a/Tests/XCTestManifests.swift b/Tests/XCTestManifests.swift deleted file mode 100644 index 4546e14..0000000 --- a/Tests/XCTestManifests.swift +++ /dev/null @@ -1,67 +0,0 @@ -#if !canImport(ObjectiveC) -import XCTest - -extension CDRCodableDecodingTests { - // DO NOT MODIFY: This is autogenerated, use: - // `swift test --generate-linuxmain` - // to regenerate. - static let __allTests__CDRCodableDecodingTests = [ - ("testDecodeArray", testDecodeArray), - ("testDecodeData", testDecodeData), - ("testDecodeDouble", testDecodeDouble), - ("testDecodeFalse", testDecodeFalse), - ("testDecodeFloat", testDecodeFloat), - ("testDecodeInt", testDecodeInt), - ("testDecodeString", testDecodeString), - ("testDecodeTrue", testDecodeTrue), - ("testDecodeUInt8", testDecodeUInt8), - ] -} - -extension CDRCodableEncodingTests { - // DO NOT MODIFY: This is autogenerated, use: - // `swift test --generate-linuxmain` - // to regenerate. - static let __allTests__CDRCodableEncodingTests = [ - ("testEncodeArray", testEncodeArray), - ("testEncodeData", testEncodeData), - ("testEncodeDouble", testEncodeDouble), - ("testEncodeFalse", testEncodeFalse), - ("testEncodeFloat", testEncodeFloat), - ("testEncodeInt32", testEncodeInt32), - ("testEncodeString", testEncodeString), - ("testEncodeTrue", testEncodeTrue), - ("testEncodeUInt32", testEncodeUInt32), - ] -} - -extension CDRCodablePerformanceTests { - // DO NOT MODIFY: This is autogenerated, use: - // `swift test --generate-linuxmain` - // to regenerate. - static let __allTests__CDRCodablePerformanceTests = [ - ("testDataDecodeEncode", testDataDecodeEncode), - ("testPerformanceDataDecode", testPerformanceDataDecode), - ("testPerformanceDataEncode", testPerformanceDataEncode), - ] -} - -extension CDRCodableRoundTripTests { - // DO NOT MODIFY: This is autogenerated, use: - // `swift test --generate-linuxmain` - // to regenerate. - static let __allTests__CDRCodableRoundTripTests = [ - ("testTemp", testTemp), - ("testTempNested", testTempNested), - ] -} - -public func __allTests() -> [XCTestCaseEntry] { - return [ - testCase(CDRCodableDecodingTests.__allTests__CDRCodableDecodingTests), - testCase(CDRCodableEncodingTests.__allTests__CDRCodableEncodingTests), - testCase(CDRCodablePerformanceTests.__allTests__CDRCodablePerformanceTests), - testCase(CDRCodableRoundTripTests.__allTests__CDRCodableRoundTripTests), - ] -} -#endif