From 541aec772aabbe7cd49579cdf9cec1083ee192ac Mon Sep 17 00:00:00 2001 From: Joe Newton Date: Mon, 29 Nov 2021 09:08:56 -0500 Subject: [PATCH] Updated path of documentation catalog for compatibility with Swift Packages --- Half.podspec | 2 +- Half.xcodeproj/project.pbxproj | 6 +++-- Package.swift | 4 +-- Package@swift-4.0.swift | 2 +- Package@swift-4.2.swift | 2 +- Package@swift-5.0.swift | 27 +++++++++++++++++++ .../Floating-Point-Operators-for-Half.md | 0 .../Half}/Half.docc/Half-swift.struct.md | 3 +-- .../Half}/Half.docc/Half.md | 0 .../Half.docc/Standard-Library-Functions.md | 0 .../Half}/Half.docc/half_t.md | 0 11 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 Package@swift-5.0.swift rename {Documentation => Sources/Half}/Half.docc/Floating-Point-Operators-for-Half.md (100%) rename {Documentation => Sources/Half}/Half.docc/Half-swift.struct.md (95%) rename {Documentation => Sources/Half}/Half.docc/Half.md (100%) rename {Documentation => Sources/Half}/Half.docc/Standard-Library-Functions.md (100%) rename {Documentation => Sources/Half}/Half.docc/half_t.md (100%) diff --git a/Half.podspec b/Half.podspec index 7024cdb..cd218af 100644 --- a/Half.podspec +++ b/Half.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "Half" - s.version = "1.3.0" + s.version = "1.3.1" s.summary = "Swift Half-Precision Floating Point" s.description = <<-DESC A lightweight framework containing a Swift implementation for a half-precision floating point type for iOS, macOS, tvOS, and watchOS. diff --git a/Half.xcodeproj/project.pbxproj b/Half.xcodeproj/project.pbxproj index 7b6e0d3..c47ae2d 100644 --- a/Half.xcodeproj/project.pbxproj +++ b/Half.xcodeproj/project.pbxproj @@ -211,8 +211,9 @@ DD02B88C27488FAE007F5569 /* Package@swift-4.0.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Package@swift-4.0.swift"; sourceTree = ""; }; DD02B88D27488FAE007F5569 /* Package@swift-4.2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Package@swift-4.2.swift"; sourceTree = ""; }; DD02B88E27489027007F5569 /* ATTRIBUTIONS */ = {isa = PBXFileReference; lastKnownFileType = text; path = ATTRIBUTIONS; sourceTree = ""; }; + DD02B8CE27551396007F5569 /* Package@swift-5.0.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Package@swift-5.0.swift"; sourceTree = ""; }; DD17A9F9257744BC00D30599 /* scripts */ = {isa = PBXFileReference; lastKnownFileType = folder; path = scripts; sourceTree = ""; }; - DD3BB7202731ADDA00DB55F8 /* Half.docc */ = {isa = PBXFileReference; lastKnownFileType = folder.documentationcatalog; path = Half.docc; sourceTree = ""; }; + DD3BB7202731ADDA00DB55F8 /* Half.docc */ = {isa = PBXFileReference; lastKnownFileType = folder.documentationcatalog; name = Half.docc; path = Sources/Half/Half.docc; sourceTree = ""; }; DD438A452742CFD900F0A1F6 /* .remarkrc */ = {isa = PBXFileReference; explicitFileType = text.json; path = .remarkrc; sourceTree = ""; }; DD438A462742D18A00F0A1F6 /* Plists */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Plists; sourceTree = ""; }; DD48BC94270E0DE800D842BC /* HalfTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = HalfTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -341,7 +342,7 @@ children = ( DD3BB7202731ADDA00DB55F8 /* Half.docc */, ); - path = Documentation; + name = Documentation; sourceTree = ""; }; DD48BC9E270E0F1300D842BC /* Test Plans */ = { @@ -420,6 +421,7 @@ DD17A9F9257744BC00D30599 /* scripts */, DD86D5E023D22DB90046E63E /* Half.podspec */, DD86D5DF23D22DB90046E63E /* Package.swift */, + DD02B8CE27551396007F5569 /* Package@swift-5.0.swift */, DD02B88D27488FAE007F5569 /* Package@swift-4.2.swift */, DD02B88C27488FAE007F5569 /* Package@swift-4.0.swift */, DDB1DE5C2405EEE300C20FED /* codecov.yml */, diff --git a/Package.swift b/Package.swift index 200d995..6e1e604 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.0 +// swift-tools-version:5.5 import PackageDescription let package = Package( @@ -19,7 +19,7 @@ let package = Package( .target(name: "CHalf"), .testTarget(name: "CHalfTests", dependencies: ["CHalf", "Half"]), - .target(name: "Half", dependencies: ["CHalf"]), + .target(name: "Half", dependencies: ["CHalf"], exclude: ["Half.swift.gyb"]), .testTarget(name: "HalfTests", dependencies: ["Half"]) ], diff --git a/Package@swift-4.0.swift b/Package@swift-4.0.swift index 1474535..89a33ba 100644 --- a/Package@swift-4.0.swift +++ b/Package@swift-4.0.swift @@ -12,7 +12,7 @@ let package = Package( .target(name: "CHalf"), .testTarget(name: "CHalfTests", dependencies: ["CHalf"]), - .target(name: "Half", dependencies: ["CHalf"]), + .target(name: "Half", dependencies: ["CHalf"], exclude: ["Half.swift.gyb"]), .testTarget(name: "HalfTests", dependencies: ["Half"]) ], diff --git a/Package@swift-4.2.swift b/Package@swift-4.2.swift index 413fb2e..03190cb 100644 --- a/Package@swift-4.2.swift +++ b/Package@swift-4.2.swift @@ -12,7 +12,7 @@ let package = Package( .target(name: "CHalf"), .testTarget(name: "CHalfTests", dependencies: ["CHalf"]), - .target(name: "Half", dependencies: ["CHalf"]), + .target(name: "Half", dependencies: ["CHalf"], exclude: ["Half.swift.gyb"]), .testTarget(name: "HalfTests", dependencies: ["Half"]) ], diff --git a/Package@swift-5.0.swift b/Package@swift-5.0.swift new file mode 100644 index 0000000..805e29c --- /dev/null +++ b/Package@swift-5.0.swift @@ -0,0 +1,27 @@ +// swift-tools-version:5.0 +import PackageDescription + +let package = Package( + name: "Half", + + platforms: [ + .iOS("9.0"), + .macOS("10.10"), + .tvOS("9.0"), + .watchOS("2.0") + ], + + products: [ + .library(name: "Half", targets: ["Half", "CHalf"]) + ], + + targets: [ + .target(name: "CHalf"), + .testTarget(name: "CHalfTests", dependencies: ["CHalf", "Half"]), + + .target(name: "Half", dependencies: ["CHalf"], exclude: ["Half.swift.gyb"]), + .testTarget(name: "HalfTests", dependencies: ["Half"]) + ], + + swiftLanguageVersions: [.version("4"), .version("4.2"), .version("5")] +) diff --git a/Documentation/Half.docc/Floating-Point-Operators-for-Half.md b/Sources/Half/Half.docc/Floating-Point-Operators-for-Half.md similarity index 100% rename from Documentation/Half.docc/Floating-Point-Operators-for-Half.md rename to Sources/Half/Half.docc/Floating-Point-Operators-for-Half.md diff --git a/Documentation/Half.docc/Half-swift.struct.md b/Sources/Half/Half.docc/Half-swift.struct.md similarity index 95% rename from Documentation/Half.docc/Half-swift.struct.md rename to Sources/Half/Half.docc/Half-swift.struct.md index 6acbe46..d83451c 100644 --- a/Documentation/Half.docc/Half-swift.struct.md +++ b/Sources/Half/Half.docc/Half-swift.struct.md @@ -21,7 +21,7 @@ ### Converting with No Loss of Precision -These initializers result in nil if the value passed can't be represented without any loss of precision. +These initializers result in `nil` if the value passed can't be represented without any loss of precision. - ``init(exactly:)-6m48t`` - ``init(exactly:)-5u1uj`` @@ -107,7 +107,6 @@ These initializers result in nil if the value passed can't be represented withou - ``init(bitPattern:)`` - ``init(sign:exponentBitPattern:significandBitPattern:)`` - ``init(nan:signaling:)`` -- ``Half/half_t`` ### Querying a Half's State diff --git a/Documentation/Half.docc/Half.md b/Sources/Half/Half.docc/Half.md similarity index 100% rename from Documentation/Half.docc/Half.md rename to Sources/Half/Half.docc/Half.md diff --git a/Documentation/Half.docc/Standard-Library-Functions.md b/Sources/Half/Half.docc/Standard-Library-Functions.md similarity index 100% rename from Documentation/Half.docc/Standard-Library-Functions.md rename to Sources/Half/Half.docc/Standard-Library-Functions.md diff --git a/Documentation/Half.docc/half_t.md b/Sources/Half/Half.docc/half_t.md similarity index 100% rename from Documentation/Half.docc/half_t.md rename to Sources/Half/Half.docc/half_t.md