Add support for Aardvark in SPM

square · Oct 4, 2024 · c24d201 · c24d201
1 parent ded8c2a
commit c24d201
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 2 deletions.
diff --git a/Aardvark.podspec b/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/CoreAardvarkSwift/**/*.{swift}'
   s.resource_bundle = {'Aardvark' => ['Sources/Aardvark/PrivacyInfo.xcprivacy']}
 
   s.dependency 'CoreAardvark', '~> 4.0'

diff --git a/Package.swift b/Package.swift
@@ -9,12 +9,33 @@ let package = Package(
 		.iOS(.v14),
 	],
 	products: [
+        .library(
+            name: "Aardvark",
+            targets: ["Aardvark", "AardvarkSwift"]
+        ),
 		.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: "CoreAardvark",
             resources: [

diff --git a/Sources/Aardvark/Aardvark.h b/Sources/Aardvark/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
diff --git a/...k/Logging/ARKLogDistributor+UIAdditions.h → ...k/include/ARKLogDistributor+UIAdditions.h b/...k/Logging/ARKLogDistributor+UIAdditions.h → ...k/include/ARKLogDistributor+UIAdditions.h
diff --git a/...s/Aardvark/Logging/ARKScreenshotLogging.h → ...s/Aardvark/include/ARKScreenshotLogging.h b/...s/Aardvark/Logging/ARKScreenshotLogging.h → ...s/Aardvark/include/ARKScreenshotLogging.h
diff --git a/Sources/Aardvark/Aardvark.swift → Sources/AardvarkSwift/Aardvark.swift b/Sources/Aardvark/Aardvark.swift → Sources/AardvarkSwift/Aardvark.swift
@@ -17,6 +17,10 @@
 import CoreAardvark
 import Foundation
 
+#if SWIFT_PACKAGE
+import Aardvark
+#endif
+
 @objc
 public class Aardvark : NSObject {
 

diff --git a/...BugReporting/ARKBugReportAttachment.swift → ...BugReporting/ARKBugReportAttachment.swift b/...BugReporting/ARKBugReportAttachment.swift → ...BugReporting/ARKBugReportAttachment.swift
diff --git a/...ardvark/BugReporting/ARKBugReporter.swift → ...rkSwift/BugReporting/ARKBugReporter.swift b/...ardvark/BugReporting/ARKBugReporter.swift → ...rkSwift/BugReporting/ARKBugReporter.swift
diff --git a/...ark/BugReporting/ARKEmailAttachment.swift → ...ift/BugReporting/ARKEmailAttachment.swift b/...ark/BugReporting/ARKEmailAttachment.swift → ...ift/BugReporting/ARKEmailAttachment.swift
diff --git a/...rting/DictionaryAttachmentGenerator.swift → ...rting/DictionaryAttachmentGenerator.swift b/...rting/DictionaryAttachmentGenerator.swift → ...rting/DictionaryAttachmentGenerator.swift
diff --git a/...rting/FileSystemAttachmentGenerator.swift → ...rting/FileSystemAttachmentGenerator.swift b/...rting/FileSystemAttachmentGenerator.swift → ...rting/FileSystemAttachmentGenerator.swift
diff --git a/...porting/LogStoreAttachmentGenerator.swift → ...porting/LogStoreAttachmentGenerator.swift b/...porting/LogStoreAttachmentGenerator.swift → ...porting/LogStoreAttachmentGenerator.swift
@@ -16,6 +16,10 @@
 
 import Foundation
 
+#if SWIFT_PACKAGE
+import Aardvark
+#endif
+
 @objc(ARKLogStoreAttachmentGenerator)
 public final class LogStoreAttachmentGenerator: NSObject {
 

diff --git a/...ng/ViewHierarchyAttachmentGenerator.swift → ...ng/ViewHierarchyAttachmentGenerator.swift b/...ng/ViewHierarchyAttachmentGenerator.swift → ...ng/ViewHierarchyAttachmentGenerator.swift
@@ -15,6 +15,7 @@
 //
 
 import Foundation
+import UIKit
 
 @objc(ARKViewHierarchyAttachmentGenerator)
 public final class ViewHierarchyAttachmentGenerator: NSObject {

diff --git a/...Aardvark/UIApplication+ARKAdditions.swift → ...arkSwift/UIApplication+ARKAdditions.swift b/...Aardvark/UIApplication+ARKAdditions.swift → ...arkSwift/UIApplication+ARKAdditions.swift
@@ -15,6 +15,7 @@
 //
 
 import Foundation
+import UIKit
 
 extension UIApplication {
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ @@
     //
     import Foundation
+    import UIKit
     extension UIApplication {
@@ Expand Down @@