From c254a30c799e0d7c70ed2d810597eb2a51b2df34 Mon Sep 17 00:00:00 2001 From: Tim Oliver Date: Sun, 8 Oct 2023 11:04:05 +0900 Subject: [PATCH 1/6] Fixed incorrect SPM symlink --- include/TORoundedButton.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/TORoundedButton.h b/include/TORoundedButton.h index a4e16cc..441b845 120000 --- a/include/TORoundedButton.h +++ b/include/TORoundedButton.h @@ -1 +1 @@ -/Users/TiM/Projects/TORoundedButton/TORoundedButton/TORoundedButton.h \ No newline at end of file +../TORoundedButton/TORoundedButton.h \ No newline at end of file From 1888499e7099a04f71a078942fa44154027ea003 Mon Sep 17 00:00:00 2001 From: Tim Oliver Date: Sun, 8 Oct 2023 11:13:17 +0900 Subject: [PATCH 2/6] Updated SPM integration --- Package.swift | 12 +++++------- TORoundedButton/TORoundedButton.h | 1 + {include => spm}/TORoundedButton.h | 0 spm/TORoundedButton.m | 1 + 4 files changed, 7 insertions(+), 7 deletions(-) rename {include => spm}/TORoundedButton.h (100%) create mode 120000 spm/TORoundedButton.m diff --git a/Package.swift b/Package.swift index e37b544..b0b911a 100644 --- a/Package.swift +++ b/Package.swift @@ -6,22 +6,20 @@ import PackageDescription let package = Package( name: "TORoundedButton", platforms: [ - .iOS(.v10) + .iOS(.v12) ], products: [ .library( name: "TORoundedButton", + type: .static, targets: ["TORoundedButton"] ) ], targets: [ .target( name: "TORoundedButton", - path: ".", - sources: [ - "TORoundedButton/TORoundedButton.m" - ], - publicHeadersPath: "include" + sources: ["spm"] ) - ] + ], + cLanguageStandard: .c11 ) diff --git a/TORoundedButton/TORoundedButton.h b/TORoundedButton/TORoundedButton.h index cb1d954..f6f02a8 100644 --- a/TORoundedButton/TORoundedButton.h +++ b/TORoundedButton/TORoundedButton.h @@ -26,6 +26,7 @@ NS_ASSUME_NONNULL_BEGIN @class TORoundedButton; +NS_SWIFT_NAME(RoundedButtonDelegate) @protocol TORoundedButtonDelegate /// Called when the user taps on the associated button. diff --git a/include/TORoundedButton.h b/spm/TORoundedButton.h similarity index 100% rename from include/TORoundedButton.h rename to spm/TORoundedButton.h diff --git a/spm/TORoundedButton.m b/spm/TORoundedButton.m new file mode 120000 index 0000000..73562b4 --- /dev/null +++ b/spm/TORoundedButton.m @@ -0,0 +1 @@ +../TORoundedButton/TORoundedButton.m \ No newline at end of file From 5c2c16264b620f8d0b334662248f7527295190b5 Mon Sep 17 00:00:00 2001 From: Tim Oliver Date: Sun, 8 Oct 2023 11:20:55 +0900 Subject: [PATCH 3/6] Added custom path to package --- Package.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index b0b911a..8be048c 100644 --- a/Package.swift +++ b/Package.swift @@ -1,6 +1,4 @@ // swift-tools-version:5.0 -// The swift-tools-version declares the minimum version of Swift required to build this package. - import PackageDescription let package = Package( @@ -18,6 +16,7 @@ let package = Package( targets: [ .target( name: "TORoundedButton", + path: ".", sources: ["spm"] ) ], From 980ac5cfc66fd34c440399a9091fd44dea0f9681 Mon Sep 17 00:00:00 2001 From: Tim Oliver Date: Sun, 8 Oct 2023 11:33:53 +0900 Subject: [PATCH 4/6] Updated location of header in SPM to be public --- Package.swift | 3 +-- spm/TORoundedButton.h | 1 - spm/include/TORoundedButton.h | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 120000 spm/TORoundedButton.h create mode 120000 spm/include/TORoundedButton.h diff --git a/Package.swift b/Package.swift index 8be048c..e0f0f44 100644 --- a/Package.swift +++ b/Package.swift @@ -16,8 +16,7 @@ let package = Package( targets: [ .target( name: "TORoundedButton", - path: ".", - sources: ["spm"] + path: "spm" ) ], cLanguageStandard: .c11 diff --git a/spm/TORoundedButton.h b/spm/TORoundedButton.h deleted file mode 120000 index 441b845..0000000 --- a/spm/TORoundedButton.h +++ /dev/null @@ -1 +0,0 @@ -../TORoundedButton/TORoundedButton.h \ No newline at end of file diff --git a/spm/include/TORoundedButton.h b/spm/include/TORoundedButton.h new file mode 120000 index 0000000..b8ea986 --- /dev/null +++ b/spm/include/TORoundedButton.h @@ -0,0 +1 @@ +../../TORoundedButton/TORoundedButton.h \ No newline at end of file From 5ff3c8de04f679c91fd732d662fcdc451ea287fb Mon Sep 17 00:00:00 2001 From: Tim Oliver Date: Sun, 8 Oct 2023 11:40:21 +0900 Subject: [PATCH 5/6] Removed C standard --- Package.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index e0f0f44..2890d9e 100644 --- a/Package.swift +++ b/Package.swift @@ -18,6 +18,5 @@ let package = Package( name: "TORoundedButton", path: "spm" ) - ], - cLanguageStandard: .c11 + ] ) From fcba91e577e1a3f0de629796a78a1f44da7e8ee6 Mon Sep 17 00:00:00 2001 From: Tim Oliver Date: Sun, 8 Oct 2023 11:44:26 +0900 Subject: [PATCH 6/6] Updated CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b9d411..2759f72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ x.y.z Release Notes (yyyy-MM-dd) * Re-calculating the darker tap color when moving between light and dark mode. * Changed the tap-down animation to always use a fluid zoom animation. +* A broken symlink reference in the SPM integration. 1.1.3 Release Notes (2020-12-12) =============================================================