diff --git a/Aardvark.podspec b/Aardvark.podspec index cc2ee347..77764437 100644 --- 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 index 28231e9c..054ca2b3 100644 --- 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 index 6ad3e561..6dda2924 100644 --- 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 #import +#endif diff --git a/Sources/Aardvark/Logging/ARKLogDistributor+UIAdditions.h b/Sources/Aardvark/include/ARKLogDistributor+UIAdditions.h similarity index 100% rename from Sources/Aardvark/Logging/ARKLogDistributor+UIAdditions.h rename to Sources/Aardvark/include/ARKLogDistributor+UIAdditions.h diff --git a/Sources/Aardvark/Logging/ARKScreenshotLogging.h b/Sources/Aardvark/include/ARKScreenshotLogging.h similarity index 100% rename from Sources/Aardvark/Logging/ARKScreenshotLogging.h rename to Sources/Aardvark/include/ARKScreenshotLogging.h diff --git a/Sources/Aardvark/Aardvark.swift b/Sources/AardvarkSwift/Aardvark.swift similarity index 98% rename from Sources/Aardvark/Aardvark.swift rename to Sources/AardvarkSwift/Aardvark.swift index 91518e7c..4a4e627f 100644 --- a/Sources/Aardvark/Aardvark.swift +++ b/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/Sources/Aardvark/BugReporting/ARKBugReportAttachment.swift b/Sources/AardvarkSwift/BugReporting/ARKBugReportAttachment.swift similarity index 100% rename from Sources/Aardvark/BugReporting/ARKBugReportAttachment.swift rename to Sources/AardvarkSwift/BugReporting/ARKBugReportAttachment.swift diff --git a/Sources/Aardvark/BugReporting/ARKBugReporter.swift b/Sources/AardvarkSwift/BugReporting/ARKBugReporter.swift similarity index 100% rename from Sources/Aardvark/BugReporting/ARKBugReporter.swift rename to Sources/AardvarkSwift/BugReporting/ARKBugReporter.swift diff --git a/Sources/Aardvark/BugReporting/ARKEmailAttachment.swift b/Sources/AardvarkSwift/BugReporting/ARKEmailAttachment.swift similarity index 100% rename from Sources/Aardvark/BugReporting/ARKEmailAttachment.swift rename to Sources/AardvarkSwift/BugReporting/ARKEmailAttachment.swift diff --git a/Sources/Aardvark/BugReporting/DictionaryAttachmentGenerator.swift b/Sources/AardvarkSwift/BugReporting/DictionaryAttachmentGenerator.swift similarity index 100% rename from Sources/Aardvark/BugReporting/DictionaryAttachmentGenerator.swift rename to Sources/AardvarkSwift/BugReporting/DictionaryAttachmentGenerator.swift diff --git a/Sources/Aardvark/BugReporting/FileSystemAttachmentGenerator.swift b/Sources/AardvarkSwift/BugReporting/FileSystemAttachmentGenerator.swift similarity index 100% rename from Sources/Aardvark/BugReporting/FileSystemAttachmentGenerator.swift rename to Sources/AardvarkSwift/BugReporting/FileSystemAttachmentGenerator.swift diff --git a/Sources/Aardvark/BugReporting/LogStoreAttachmentGenerator.swift b/Sources/AardvarkSwift/BugReporting/LogStoreAttachmentGenerator.swift similarity index 99% rename from Sources/Aardvark/BugReporting/LogStoreAttachmentGenerator.swift rename to Sources/AardvarkSwift/BugReporting/LogStoreAttachmentGenerator.swift index fe9140ce..70aff94b 100644 --- a/Sources/Aardvark/BugReporting/LogStoreAttachmentGenerator.swift +++ b/Sources/AardvarkSwift/BugReporting/LogStoreAttachmentGenerator.swift @@ -16,6 +16,10 @@ import Foundation +#if SWIFT_PACKAGE +import Aardvark +#endif + @objc(ARKLogStoreAttachmentGenerator) public final class LogStoreAttachmentGenerator: NSObject { diff --git a/Sources/Aardvark/BugReporting/ViewHierarchyAttachmentGenerator.swift b/Sources/AardvarkSwift/BugReporting/ViewHierarchyAttachmentGenerator.swift similarity index 99% rename from Sources/Aardvark/BugReporting/ViewHierarchyAttachmentGenerator.swift rename to Sources/AardvarkSwift/BugReporting/ViewHierarchyAttachmentGenerator.swift index 6304276b..b576f525 100644 --- a/Sources/Aardvark/BugReporting/ViewHierarchyAttachmentGenerator.swift +++ b/Sources/AardvarkSwift/BugReporting/ViewHierarchyAttachmentGenerator.swift @@ -15,6 +15,7 @@ // import Foundation +import UIKit @objc(ARKViewHierarchyAttachmentGenerator) public final class ViewHierarchyAttachmentGenerator: NSObject { diff --git a/Sources/Aardvark/UIApplication+ARKAdditions.swift b/Sources/AardvarkSwift/UIApplication+ARKAdditions.swift similarity index 99% rename from Sources/Aardvark/UIApplication+ARKAdditions.swift rename to Sources/AardvarkSwift/UIApplication+ARKAdditions.swift index feb6a2fb..6b1037ab 100644 --- a/Sources/Aardvark/UIApplication+ARKAdditions.swift +++ b/Sources/AardvarkSwift/UIApplication+ARKAdditions.swift @@ -15,6 +15,7 @@ // import Foundation +import UIKit extension UIApplication {