From 4be1d372a33a54f41392434a17c0e88eec75e2fa Mon Sep 17 00:00:00 2001 From: Normen Date: Wed, 5 Jul 2023 15:23:03 +0200 Subject: [PATCH 1/8] Add Sources folder and move all the source code into that folder --- Pod/Classes/.gitkeep | 0 {Pod/Classes => Sources}/MBCircularProgressBarLayer.h | 0 {Pod/Classes => Sources}/MBCircularProgressBarLayer.m | 0 {Pod/Classes => Sources}/MBCircularProgressBarView.h | 0 {Pod/Classes => Sources}/MBCircularProgressBarView.m | 0 5 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Pod/Classes/.gitkeep rename {Pod/Classes => Sources}/MBCircularProgressBarLayer.h (100%) rename {Pod/Classes => Sources}/MBCircularProgressBarLayer.m (100%) rename {Pod/Classes => Sources}/MBCircularProgressBarView.h (100%) rename {Pod/Classes => Sources}/MBCircularProgressBarView.m (100%) diff --git a/Pod/Classes/.gitkeep b/Pod/Classes/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/Pod/Classes/MBCircularProgressBarLayer.h b/Sources/MBCircularProgressBarLayer.h similarity index 100% rename from Pod/Classes/MBCircularProgressBarLayer.h rename to Sources/MBCircularProgressBarLayer.h diff --git a/Pod/Classes/MBCircularProgressBarLayer.m b/Sources/MBCircularProgressBarLayer.m similarity index 100% rename from Pod/Classes/MBCircularProgressBarLayer.m rename to Sources/MBCircularProgressBarLayer.m diff --git a/Pod/Classes/MBCircularProgressBarView.h b/Sources/MBCircularProgressBarView.h similarity index 100% rename from Pod/Classes/MBCircularProgressBarView.h rename to Sources/MBCircularProgressBarView.h diff --git a/Pod/Classes/MBCircularProgressBarView.m b/Sources/MBCircularProgressBarView.m similarity index 100% rename from Pod/Classes/MBCircularProgressBarView.m rename to Sources/MBCircularProgressBarView.m From be567dbb0c634b0f3458f77c64bfe13ae1151416 Mon Sep 17 00:00:00 2001 From: Normen Date: Wed, 5 Jul 2023 15:23:57 +0200 Subject: [PATCH 2/8] Update s.source_files variable to the new project structure --- MBCircularProgressBar.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MBCircularProgressBar.podspec b/MBCircularProgressBar.podspec index d1bd503..49c4ac4 100644 --- a/MBCircularProgressBar.podspec +++ b/MBCircularProgressBar.podspec @@ -24,7 +24,7 @@ a circular animatable & Interface Builder highly customizable progress bar s.platform = :ios, '8.0' s.requires_arc = true - s.source_files = 'Pod/Classes/**/*' + s.source_files = 'Sources/**/*' s.resource_bundles = { 'MBCircularProgressBar' => ['Pod/Assets/*.png'] } From cbce3a13bf56acd9eb2575edc086ae3c07b718ef Mon Sep 17 00:00:00 2001 From: Normen Date: Wed, 5 Jul 2023 15:24:23 +0200 Subject: [PATCH 3/8] Add package.swift file to make this framework usable via the swift package manager --- Package.swift | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 Package.swift diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..9a7127f --- /dev/null +++ b/Package.swift @@ -0,0 +1,16 @@ +// swift-tools-version:5.3 +import PackageDescription + +let package = Package( + name: "MBCircularProgressBar", + products: [ + .library(name: "MBCircularProgressBar", targets: ["CircularProgressBar"]) + ], + targets: [ + .target( + name: "CircularProgressBar", + path: "Sources", + exclude: ["Example"] + ), + ] +) From abccdc3cb829079bb2ff265c2a706a43b8f5eba2 Mon Sep 17 00:00:00 2001 From: Normen Date: Wed, 5 Jul 2023 15:35:18 +0200 Subject: [PATCH 4/8] Add explanation for usage of the swift package manager to the README.md file --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index bcb1dc0..b47acbe 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,17 @@ To run the example project, clone the repo, and run `pod update` from the Exampl ## Installation +### Swift Package Manager + +1. Add the following to your `Package.swift`: + ```swift + .package(url: "https://github.com/MatiBot/MBCircularProgressBar.git", .upToNextMajor(from: "0.3.4")), + ``` +2. Next, add `MBCircularProgressBar` to your App targets dependencies like so: + ```swift + .target(name: "App", dependencies: ["CircularProgressBar"]), + ``` + ### Cocoapods MBCircularProgressBar is available through [CocoaPods](http://cocoapods.org). From ffe7bcdc3bf8a0e1f784c8d9d82b2f559f04026e Mon Sep 17 00:00:00 2001 From: Normen Date: Wed, 5 Jul 2023 15:42:57 +0200 Subject: [PATCH 5/8] Rename target from CircularProgressBar to MBCircularProgressBar --- Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index 9a7127f..0ffda33 100644 --- a/Package.swift +++ b/Package.swift @@ -4,11 +4,11 @@ import PackageDescription let package = Package( name: "MBCircularProgressBar", products: [ - .library(name: "MBCircularProgressBar", targets: ["CircularProgressBar"]) + .library(name: "MBCircularProgressBar", targets: ["MBCircularProgressBar"]) ], targets: [ .target( - name: "CircularProgressBar", + name: "MBCircularProgressBar", path: "Sources", exclude: ["Example"] ), From 532a3b40a28a11fc6bc0468703dc9a7cba6fa153 Mon Sep 17 00:00:00 2001 From: Normen Date: Wed, 5 Jul 2023 15:45:33 +0200 Subject: [PATCH 6/8] Update .gitignore to exclude the path with get generate by swift package --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index c964cd8..6ac6f61 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ # Xcode # build/ +.build/ +.swiftpm/ *.pbxuser !default.pbxuser *.mode1v3 From 86ddd524557dd5873d495db3bd39d9cc3a1423ff Mon Sep 17 00:00:00 2001 From: Normen Date: Wed, 5 Jul 2023 16:54:43 +0200 Subject: [PATCH 7/8] Add missing uikit import --- Sources/MBCircularProgressBarLayer.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Sources/MBCircularProgressBarLayer.h b/Sources/MBCircularProgressBarLayer.h index 3465f00..073ac22 100644 --- a/Sources/MBCircularProgressBarLayer.h +++ b/Sources/MBCircularProgressBarLayer.h @@ -7,6 +7,7 @@ // @import QuartzCore; +@import UIKit; typedef NS_ENUM(NSInteger, MBCircularProgressBarAppearanceType) { MBCircularProgressBarAppearanceTypeOverlaysEmptyLine = 0, From 1dd2f3d94c6b4357e3b0e7f47c60614bb981c50c Mon Sep 17 00:00:00 2001 From: Normen Date: Wed, 5 Jul 2023 16:55:08 +0200 Subject: [PATCH 8/8] Add publicHeadersPath to the target to allow interop with objc --- Package.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 0ffda33..a95811c 100644 --- a/Package.swift +++ b/Package.swift @@ -3,6 +3,9 @@ import PackageDescription let package = Package( name: "MBCircularProgressBar", + platforms: [ + .iOS(.v9) + ], products: [ .library(name: "MBCircularProgressBar", targets: ["MBCircularProgressBar"]) ], @@ -10,7 +13,8 @@ let package = Package( .target( name: "MBCircularProgressBar", path: "Sources", - exclude: ["Example"] + exclude: ["Example"], + publicHeadersPath: "." ), ] )