Skip to content

Commit 58b67d0

Browse files
committed
Add support for Aardvark in SPM
1 parent ded8c2a commit 58b67d0

14 files changed

+37
-2
lines changed

Aardvark.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
1010
s.swift_version = '5.0'
1111
s.ios.deployment_target = '14.0'
1212

13-
s.source_files = 'Sources/Aardvark/**/*.{h,m,swift}'
13+
s.source_files = 'Sources/Aardvark/**/*.{h,m}', 'Sources/AardvarkSwift/**/*.{swift}'
1414
s.resource_bundle = {'Aardvark' => ['Sources/Aardvark/PrivacyInfo.xcprivacy']}
1515

1616
s.dependency 'CoreAardvark', '~> 4.0'

Package.swift

+21
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,33 @@ let package = Package(
99
.iOS(.v14),
1010
],
1111
products: [
12+
.library(
13+
name: "Aardvark",
14+
targets: ["Aardvark", "AardvarkSwift"]
15+
),
1216
.library(
1317
name: "CoreAardvark",
1418
targets: ["CoreAardvark", "CoreAardvarkSwift"]
1519
),
1620
],
1721
targets: [
22+
.target(
23+
name: "Aardvark",
24+
dependencies: ["CoreAardvark"],
25+
resources: [
26+
.process("PrivacyInfo.xcprivacy"),
27+
],
28+
cSettings: [
29+
.define("SWIFT_PACKAGE"),
30+
]
31+
),
32+
.target(
33+
name: "AardvarkSwift",
34+
dependencies: ["Aardvark"],
35+
cSettings: [
36+
.define("SWIFT_PACKAGE"),
37+
]
38+
),
1839
.target(
1940
name: "CoreAardvark",
2041
resources: [

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ FOUNDATION_EXPORT double Aardvark_iOSVersionNumber;
2323
//! Project version string for Aardvark-iOS.
2424
FOUNDATION_EXPORT const unsigned char Aardvark_iOSVersionString[];
2525

26-
26+
#if SWIFT_PACKAGE
27+
#import "ARKLogDistributor+UIAdditions.h"
28+
#import "ARKScreenshotLogging.h"
29+
#else
2730
#import <Aardvark/ARKLogDistributor+UIAdditions.h>
2831
#import <Aardvark/ARKScreenshotLogging.h>
32+
#endif

Sources/Aardvark/Aardvark.swift Sources/AardvarkSwift/Aardvark.swift

+4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
import CoreAardvark
1818
import Foundation
1919

20+
#if SWIFT_PACKAGE
21+
import Aardvark
22+
#endif
23+
2024
@objc
2125
public class Aardvark : NSObject {
2226

Sources/Aardvark/BugReporting/LogStoreAttachmentGenerator.swift Sources/AardvarkSwift/BugReporting/LogStoreAttachmentGenerator.swift

+4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616

1717
import Foundation
1818

19+
#if SWIFT_PACKAGE
20+
import Aardvark
21+
#endif
22+
1923
@objc(ARKLogStoreAttachmentGenerator)
2024
public final class LogStoreAttachmentGenerator: NSObject {
2125

Sources/Aardvark/BugReporting/ViewHierarchyAttachmentGenerator.swift Sources/AardvarkSwift/BugReporting/ViewHierarchyAttachmentGenerator.swift

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
//
1616

1717
import Foundation
18+
import UIKit
1819

1920
@objc(ARKViewHierarchyAttachmentGenerator)
2021
public final class ViewHierarchyAttachmentGenerator: NSObject {

Sources/Aardvark/UIApplication+ARKAdditions.swift Sources/AardvarkSwift/UIApplication+ARKAdditions.swift

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
//
1616

1717
import Foundation
18+
import UIKit
1819

1920
extension UIApplication {
2021

0 commit comments

Comments
 (0)