From 5fc8147cd9403ccb7e13d7d9e575bc8b20493d04 Mon Sep 17 00:00:00 2001 From: Dmitry Lobanov Date: Tue, 8 Jun 2021 11:53:22 +0300 Subject: [PATCH 1/3] project: code layout has been adjusted for swift package manager. --- Base64.xcodeproj/project.pbxproj | 44 ++++++++++++++++--- .../Base64}/MF_Base64Additions.m | 0 .../include/Base64}/MF_Base64Additions.h | 0 3 files changed, 38 insertions(+), 6 deletions(-) rename {Base64 => Sources/Base64}/MF_Base64Additions.m (100%) rename {Base64 => Sources/Base64/include/Base64}/MF_Base64Additions.h (100%) diff --git a/Base64.xcodeproj/project.pbxproj b/Base64.xcodeproj/project.pbxproj index b6904e4..39f86c3 100644 --- a/Base64.xcodeproj/project.pbxproj +++ b/Base64.xcodeproj/project.pbxproj @@ -7,8 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 0A883AFC266F663000DAF016 /* MF_Base64Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A883AFB266F663000DAF016 /* MF_Base64Additions.m */; }; 0DA2A7C3158CC3EB00A9516B /* MF_AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DA2A7C0158CC3EB00A9516B /* MF_AppDelegate.m */; }; - 0DA2A7C4158CC3EB00A9516B /* MF_Base64Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DA2A7C2158CC3EB00A9516B /* MF_Base64Additions.m */; }; 0DA2A7CB158CC40700A9516B /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0DA2A7C9158CC40700A9516B /* MainMenu.xib */; }; 0DA2A7D0158CC41700A9516B /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DA2A7CE158CC41700A9516B /* main.m */; }; 0DA2A7D6158CC43500A9516B /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 0DA2A7D2158CC43500A9516B /* Credits.rtf */; }; @@ -17,10 +17,10 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 0A883AFB266F663000DAF016 /* MF_Base64Additions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MF_Base64Additions.m; sourceTree = ""; }; + 0A883B00266F669F00DAF016 /* MF_Base64Additions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MF_Base64Additions.h; sourceTree = ""; }; 0DA2A7BF158CC3EB00A9516B /* MF_AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MF_AppDelegate.h; path = Base64/MF_AppDelegate.h; sourceTree = SOURCE_ROOT; }; 0DA2A7C0158CC3EB00A9516B /* MF_AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MF_AppDelegate.m; path = Base64/MF_AppDelegate.m; sourceTree = SOURCE_ROOT; }; - 0DA2A7C1158CC3EB00A9516B /* MF_Base64Additions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MF_Base64Additions.h; path = Base64/MF_Base64Additions.h; sourceTree = SOURCE_ROOT; }; - 0DA2A7C2158CC3EB00A9516B /* MF_Base64Additions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MF_Base64Additions.m; path = Base64/MF_Base64Additions.m; sourceTree = SOURCE_ROOT; }; 0DA2A7CC158CC41700A9516B /* Base64-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Base64-Info.plist"; path = "Base64/Base64-Info.plist"; sourceTree = SOURCE_ROOT; }; 0DA2A7CD158CC41700A9516B /* Base64-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Base64-Prefix.pch"; path = "Base64/Base64-Prefix.pch"; sourceTree = SOURCE_ROOT; }; 0DA2A7CE158CC41700A9516B /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Base64/main.m; sourceTree = SOURCE_ROOT; }; @@ -46,6 +46,39 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 0A883AF8266F663000DAF016 /* Sources */ = { + isa = PBXGroup; + children = ( + 0A883AF9266F663000DAF016 /* Base64 */, + ); + path = Sources; + sourceTree = ""; + }; + 0A883AF9266F663000DAF016 /* Base64 */ = { + isa = PBXGroup; + children = ( + 0A883AFD266F665100DAF016 /* include */, + 0A883AFB266F663000DAF016 /* MF_Base64Additions.m */, + ); + path = Base64; + sourceTree = ""; + }; + 0A883AFD266F665100DAF016 /* include */ = { + isa = PBXGroup; + children = ( + 0A883AFF266F669F00DAF016 /* Base64 */, + ); + path = include; + sourceTree = ""; + }; + 0A883AFF266F669F00DAF016 /* Base64 */ = { + isa = PBXGroup; + children = ( + 0A883B00266F669F00DAF016 /* MF_Base64Additions.h */, + ); + path = Base64; + sourceTree = ""; + }; 0DDF90D7158A1A0F00D44611 = { isa = PBXGroup; children = ( @@ -85,10 +118,9 @@ 0DDF90EC158A1A0F00D44611 /* Base64 */ = { isa = PBXGroup; children = ( + 0A883AF8266F663000DAF016 /* Sources */, 0DA2A7BF158CC3EB00A9516B /* MF_AppDelegate.h */, 0DA2A7C0158CC3EB00A9516B /* MF_AppDelegate.m */, - 0DA2A7C1158CC3EB00A9516B /* MF_Base64Additions.h */, - 0DA2A7C2158CC3EB00A9516B /* MF_Base64Additions.m */, 0DA2A7C9158CC40700A9516B /* MainMenu.xib */, 0DDF90ED158A1A0F00D44611 /* Supporting Files */, ); @@ -174,8 +206,8 @@ buildActionMask = 2147483647; files = ( 0DA2A7C3158CC3EB00A9516B /* MF_AppDelegate.m in Sources */, - 0DA2A7C4158CC3EB00A9516B /* MF_Base64Additions.m in Sources */, 0DA2A7D0158CC41700A9516B /* main.m in Sources */, + 0A883AFC266F663000DAF016 /* MF_Base64Additions.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Base64/MF_Base64Additions.m b/Sources/Base64/MF_Base64Additions.m similarity index 100% rename from Base64/MF_Base64Additions.m rename to Sources/Base64/MF_Base64Additions.m diff --git a/Base64/MF_Base64Additions.h b/Sources/Base64/include/Base64/MF_Base64Additions.h similarity index 100% rename from Base64/MF_Base64Additions.h rename to Sources/Base64/include/Base64/MF_Base64Additions.h From 66c3da497419f7aee5a5867dd3779f33e92c31f3 Mon Sep 17 00:00:00 2001 From: Dmitry Lobanov Date: Tue, 8 Jun 2021 11:53:34 +0300 Subject: [PATCH 2/3] distribution: swift package manager has been added. --- Package.swift | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 Package.swift diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..4b23173 --- /dev/null +++ b/Package.swift @@ -0,0 +1,26 @@ +// swift-tools-version:5.3 +// The swift-tools-version declares the minimum version of Swift required to build this package. +import PackageDescription + +let package = Package( + name: "Base64", + platforms: [ + .iOS(.v9), + .macOS(.v10_10), + .watchOS(.v3), + .tvOS(.v9), + ], + products: [ + // Products define the executables and libraries produced by a package, and make them visible to other packages. + .library( + name: "Base64", + targets: ["Base64"] + ) + ], + dependencies: [], + targets: [ + // Targets are the basic building blocks of a package. A target can define a module or a test suite. + // Targets can depend on other targets in this package, and on products in packages which this package depends on. + .target(name: "Base64") + ] +) From 015ce993db89e0212c1ea0d5aa845abb478d4313 Mon Sep 17 00:00:00 2001 From: Dmitry Lobanov Date: Tue, 8 Jun 2021 12:02:22 +0300 Subject: [PATCH 3/3] sources: umbrella header has been added. --- Sources/Base64/MF_Base64Additions.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Base64/MF_Base64Additions.m b/Sources/Base64/MF_Base64Additions.m index f4ee5ad..549ff2e 100755 --- a/Sources/Base64/MF_Base64Additions.m +++ b/Sources/Base64/MF_Base64Additions.m @@ -10,7 +10,7 @@ // Hosted at https://github.com/ekscrypto/Base64 // -#import "MF_Base64Additions.h" +#import @implementation MF_Base64Codec