Merge pull request #161 from square/luis/add-spm-support

Add Swift Package Manager support

.github/workflows/ci.yml

@@ -49,3 +49,11 @@ jobs:
         run: bundle exec pod lib lint --verbose --fail-fast AardvarkLoggingUI.podspec --include-podspecs=CoreAardvark.podspec
       - name: Lint AardvarkMailUI Podspec
         run: bundle exec pod lib lint --verbose --fail-fast AardvarkMailUI.podspec --include-podspecs="{CoreAardvark,Aardvark}.podspec"
+  swift-build:
+    name: Swift Build
+    runs-on: macos-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+      - name: Swift Build
+        run: swift build --sdk "$(xcode-select -p)/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk" --triple "arm64-apple-ios14.0-simulator"

.gitignore

@@ -16,3 +16,5 @@ profile
 *.moved-aside
 DerivedData
 .idea/
+# SPM
+.build/

Aardvark.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.swift_version = '5.0'
   s.ios.deployment_target = '14.0'
 
-  s.source_files = 'Sources/Aardvark/**/*.{h,m,swift}'
+  s.source_files = 'Sources/Aardvark/**/*.{h,m}', 'Sources/AardvarkSwift/**/*.{swift}'
   s.resource_bundle = {'Aardvark' => ['Sources/Aardvark/PrivacyInfo.xcprivacy']}
 
   s.dependency 'CoreAardvark', '~> 4.0'

AardvarkMailUI.podspec

@@ -10,8 +10,8 @@ Pod::Spec.new do |s|
   s.swift_version = '5.0'
   s.ios.deployment_target = '14.0'
 
-  s.source_files = 'Sources/AardvarkMailUI/**/*.{h,m,swift}'
-  s.private_header_files = 'Sources/AardvarkMailUI/**/*_Testing.h', 'Sources/AardvarkMailUI/PrivateCategories/*.h'
+  s.source_files = 'Sources/AardvarkMailUI/**/*.{h,m}', 'Sources/AardvarkMailUISwift/**/*.swift'
+  s.private_header_files = 'Sources/AardvarkMailUI/private/*.h'
 
   s.dependency 'Aardvark', '~> 5.0'
 end

CoreAardvark.podspec

@@ -11,6 +11,6 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '14.0'
   s.watchos.deployment_target = '7.0'
 
-  s.source_files = 'Sources/CoreAardvark/**/*.{h,m,swift}'
-  s.private_header_files = 'Sources/CoreAardvark/**/*_Testing.h', 'Sources/CoreAardvark/PrivateCategories/*.h'
+  s.source_files = 'Sources/CoreAardvark/**/*.{h,m}', 'Sources/CoreAardvarkSwift/**/*.{swift}'
+  s.private_header_files = 'Sources/CoreAardvark/private/*.h'
 end

Package.swift

@@ -0,0 +1,88 @@
+// swift-tools-version:5.10
+
+import PackageDescription
+
+let package = Package(
+	name: "Aardvark",
+    defaultLocalization: "en",
+	platforms: [
+		.iOS(.v14),
+	],
+	products: [
+        .library(
+            name: "Aardvark",
+            targets: ["Aardvark", "AardvarkSwift"]
+        ),
+        .library(
+            name: "AardvarkLoggingUI",
+            targets: ["AardvarkLoggingUI"]
+        ),
+        .library(
+            name: "AardvarkMailUI",
+            targets: ["AardvarkMailUI", "AardvarkMailUISwift"]
+        ),
+		.library(
+            name: "CoreAardvark",
+			targets: ["CoreAardvark", "CoreAardvarkSwift"]
+		),
+	],
+	targets: [
+        .target(
+            name: "Aardvark",
+            dependencies: ["CoreAardvark"],
+            resources: [
+                .process("PrivacyInfo.xcprivacy"),
+            ],
+            cSettings: [
+                .define("SWIFT_PACKAGE"),
+            ]
+        ),
+        .target(
+            name: "AardvarkSwift",
+            dependencies: ["Aardvark"],
+            cSettings: [
+                .define("SWIFT_PACKAGE"),
+            ]
+        ),
+        .target(
+            name: "AardvarkLoggingUI",
+            dependencies: ["CoreAardvark"],
+            cSettings: [
+                .define("SWIFT_PACKAGE"),
+                .headerSearchPath("private"),
+            ]
+        ),
+        .target(
+            name: "AardvarkMailUI",
+            dependencies: ["Aardvark", "AardvarkSwift"],
+            cSettings: [
+                .define("SWIFT_PACKAGE"),
+                .headerSearchPath("private"),
+            ]
+        ),
+        .target(
+            name: "AardvarkMailUISwift",
+            dependencies: ["Aardvark", "AardvarkSwift", "AardvarkMailUI"],
+            cSettings: [
+                .define("SWIFT_PACKAGE"),
+            ]
+        ),
+		.target(
+            name: "CoreAardvark",
+            resources: [
+                .process("Resources/en.lproj"),
+            ],
+            cSettings: [
+                .define("SWIFT_PACKAGE"),
+                .headerSearchPath("private"),
+            ]
+		),
+        .target(
+            name: "CoreAardvarkSwift",
+            dependencies: ["CoreAardvark"],
+            cSettings: [
+                .define("SWIFT_PACKAGE"),
+            ]
+        ),
+	]
+)

Sources/Aardvark/Aardvark.h → Sources/Aardvark/include/Aardvark.h

@@ -23,6 +23,10 @@ FOUNDATION_EXPORT double Aardvark_iOSVersionNumber;
 //! Project version string for Aardvark-iOS.
 FOUNDATION_EXPORT const unsigned char Aardvark_iOSVersionString[];
 
-
+#if SWIFT_PACKAGE
+#import "ARKLogDistributor+UIAdditions.h"
+#import "ARKScreenshotLogging.h"
+#else
 #import <Aardvark/ARKLogDistributor+UIAdditions.h>
 #import <Aardvark/ARKScreenshotLogging.h>
+#endif

Sources/AardvarkLoggingUI/AardvarkLoggingUI.h → Sources/AardvarkLoggingUI/include/AardvarkLoggingUI.h

@@ -24,7 +24,12 @@ FOUNDATION_EXPORT const unsigned char AardvarkLoggingUIVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <AardvarkLoggingUI/PublicHeader.h>
 
-
+#if SWIFT_PACKAGE
+#import "ARKIndividualLogViewController.h"
+#import "ARKLogTableViewController.h"
+#import "ARKScreenshotViewController.h"
+#else
 #import <AardvarkLoggingUI/ARKIndividualLogViewController.h>
 #import <AardvarkLoggingUI/ARKLogTableViewController.h>
 #import <AardvarkLoggingUI/ARKScreenshotViewController.h>
+#endif