diff --git a/apple/LocalPSPDFKit/Package.swift b/apple/LocalPSPDFKit/Package.swift new file mode 100644 index 000000000..019269d28 --- /dev/null +++ b/apple/LocalPSPDFKit/Package.swift @@ -0,0 +1,29 @@ +// swift-tools-version:5.5 + +import PackageDescription + +let package = Package( + name: "PSPDFKit", + platforms: [ + .iOS(.v15), + .macOS("99.0") + ], + products: [ + .library( + name: "PSPDFKit", + targets: ["PSPDFKit", "PSPDFKitUI"] + ) + ], + targets: [ + .binaryTarget( + name: "PSPDFKit", + url: "https://customers.pspdfkit.com/pspdfkit/xcframework/11.2.0.zip", + checksum: "e70261d3938fb99955bd8a89bd20a691c9024d573e0fcf9fa53fd4a797cc10fb" + ), + .binaryTarget( + name: "PSPDFKitUI", + url: "https://customers.pspdfkit.com/pspdfkitui/xcframework/11.2.0.zip", + checksum: "f4e757c4067921b469d910fc8babb6e9445b189c53aca378ef943960806f22dd" + ) + ] +) diff --git a/apple/Omnivore.xcodeproj/project.pbxproj b/apple/Omnivore.xcodeproj/project.pbxproj index 223e4eabc..76d2f839c 100644 --- a/apple/Omnivore.xcodeproj/project.pbxproj +++ b/apple/Omnivore.xcodeproj/project.pbxproj @@ -10,7 +10,6 @@ 0411792A26A22860004AE24F /* MacAppSmokeTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0411792926A22860004AE24F /* MacAppSmokeTest.swift */; }; 0418837E2742E99F003E0001 /* Intercom in Frameworks */ = {isa = PBXBuildFile; productRef = 0418837D2742E99F003E0001 /* Intercom */; }; 041883802742FCF2003E0001 /* Utils in Frameworks */ = {isa = PBXBuildFile; productRef = 0418837F2742FCF2003E0001 /* Utils */; }; - 042184ED273AD426002357B0 /* PSPDFKit in Frameworks */ = {isa = PBXBuildFile; productRef = 042184EC273AD426002357B0 /* PSPDFKit */; }; 042184EF273AD5F3002357B0 /* PDFViewer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042184EE273AD5F3002357B0 /* PDFViewer.swift */; }; 042184F0273AD5F3002357B0 /* PDFViewer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042184EE273AD5F3002357B0 /* PDFViewer.swift */; }; 042F48DC26DFD10E00BF98FC /* iOSLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042F48DB26DFD10E00BF98FC /* iOSLaunchTests.swift */; }; @@ -188,6 +187,7 @@ 042F48D926DFD10E00BF98FC /* UITests-iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "UITests-iOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 042F48DB26DFD10E00BF98FC /* iOSLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSLaunchTests.swift; sourceTree = ""; }; 042F48DD26DFD10E00BF98FC /* iOSUITests.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = iOSUITests.plist; sourceTree = ""; }; + 04501446283A861300BD138D /* LocalPSPDFKit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = LocalPSPDFKit; sourceTree = ""; }; 046C5CD226A3F89A00AC5349 /* ShareExtension-Mac.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "ShareExtension-Mac.appex"; sourceTree = BUILT_PRODUCTS_DIR; }; 046C5CD426A3F89A00AC5349 /* icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = icon.icns; sourceTree = ""; }; 046C5CDB26A3F89A00AC5349 /* ShareExtensionMac.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = ShareExtensionMac.plist; sourceTree = ""; }; @@ -315,7 +315,6 @@ 0418837E2742E99F003E0001 /* Intercom in Frameworks */, 045B1681279147E7005047F7 /* FirebaseMessaging in Frameworks */, 041883802742FCF2003E0001 /* Utils in Frameworks */, - 042184ED273AD426002357B0 /* PSPDFKit in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -420,6 +419,7 @@ 2EE5B57B588CF4ADBA39A106 = { isa = PBXGroup; children = ( + 04501446283A861300BD138D /* LocalPSPDFKit */, 047AD6F62724E513004FD5CF /* SafariExtension (iOS)Release.entitlements */, 047AD6F52724CF8A004FD5CF /* SafariExtension (iOS).entitlements */, 0480E70B26D8A07A006CAE2F /* Omnivore-Mac.xctestplan */, @@ -719,7 +719,6 @@ name = "Omnivore-iOS"; packageProductDependencies = ( 8F13016D33DF1598D7157563 /* App */, - 042184EC273AD426002357B0 /* PSPDFKit */, 0418837D2742E99F003E0001 /* Intercom */, 0418837F2742FCF2003E0001 /* Utils */, 045B1680279147E7005047F7 /* FirebaseMessaging */, @@ -796,7 +795,6 @@ ); mainGroup = 2EE5B57B588CF4ADBA39A106; packageReferences = ( - 042184EB273AD426002357B0 /* XCRemoteSwiftPackageReference "PSPDFKit-SP" */, 0418837C2742E99F003E0001 /* XCRemoteSwiftPackageReference "intercom-ios" */, 048F592A2790EAF800E0B494 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, ); @@ -1964,14 +1962,6 @@ version = 11.1.2; }; }; - 042184EB273AD426002357B0 /* XCRemoteSwiftPackageReference "PSPDFKit-SP" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/PSPDFKit/PSPDFKit-SP"; - requirement = { - branch = master; - kind = branch; - }; - }; 048F592A2790EAF800E0B494 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/firebase/firebase-ios-sdk"; @@ -1992,11 +1982,6 @@ isa = XCSwiftPackageProductDependency; productName = Utils; }; - 042184EC273AD426002357B0 /* PSPDFKit */ = { - isa = XCSwiftPackageProductDependency; - package = 042184EB273AD426002357B0 /* XCRemoteSwiftPackageReference "PSPDFKit-SP" */; - productName = PSPDFKit; - }; 045B1680279147E7005047F7 /* FirebaseMessaging */ = { isa = XCSwiftPackageProductDependency; package = 048F592A2790EAF800E0B494 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; diff --git a/apple/Omnivore.xcworkspace/xcshareddata/swiftpm/Package.resolved b/apple/Omnivore.xcworkspace/xcshareddata/swiftpm/Package.resolved index 4f826f753..0e27d329f 100644 --- a/apple/Omnivore.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/apple/Omnivore.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,221 +1,214 @@ { - "pins" : [ - { - "identity" : "abseil-cpp-swiftpm", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/abseil-cpp-SwiftPM.git", - "state" : { - "revision" : "fffc3c2729be5747390ad02d5100291a0d9ad26a", - "version" : "0.20200225.4" + "object": { + "pins": [ + { + "package": "abseil", + "repositoryURL": "https://github.com/firebase/abseil-cpp-SwiftPM.git", + "state": { + "branch": null, + "revision": "fffc3c2729be5747390ad02d5100291a0d9ad26a", + "version": "0.20200225.4" + } + }, + { + "package": "Segment", + "repositoryURL": "git@github.com:segmentio/analytics-swift.git", + "state": { + "branch": null, + "revision": "92cc824211160ab98c28c7d40c1e6d27645c2bf1", + "version": "1.2.3" + } + }, + { + "package": "AppAuth", + "repositoryURL": "https://github.com/openid/AppAuth-iOS.git", + "state": { + "branch": null, + "revision": "01131d68346c8ae552961c768d583c715fbe1410", + "version": "1.4.0" + } + }, + { + "package": "BoringSSL-GRPC", + "repositoryURL": "https://github.com/firebase/boringssl-SwiftPM.git", + "state": { + "branch": null, + "revision": "734a8247442fde37df4364c21f6a0085b6a36728", + "version": "0.7.2" + } + }, + { + "package": "Files", + "repositoryURL": "https://github.com/JohnSundell/Files", + "state": { + "branch": null, + "revision": "d273b5b7025d386feef79ef6bad7de762e106eaf", + "version": "4.2.0" + } + }, + { + "package": "Firebase", + "repositoryURL": "https://github.com/firebase/firebase-ios-sdk", + "state": { + "branch": null, + "revision": "08686f04881483d2bc098b2696e674c0ba135e47", + "version": "8.10.0" + } + }, + { + "package": "GoogleAppMeasurement", + "repositoryURL": "https://github.com/google/GoogleAppMeasurement.git", + "state": { + "branch": null, + "revision": "9b2f6aca5b4685c45f9f5481f19bee8e7982c538", + "version": "8.9.1" + } + }, + { + "package": "GoogleDataTransport", + "repositoryURL": "https://github.com/google/GoogleDataTransport.git", + "state": { + "branch": null, + "revision": "15ccdfd25ac55b9239b82809531ff26605e7556e", + "version": "9.1.2" + } + }, + { + "package": "GoogleUtilities", + "repositoryURL": "https://github.com/google/GoogleUtilities.git", + "state": { + "branch": null, + "revision": "b3bb0c5551fb3f80ca939829639ab5b093edd14f", + "version": "7.7.0" + } + }, + { + "package": "gRPC", + "repositoryURL": "https://github.com/firebase/grpc-SwiftPM.git", + "state": { + "branch": null, + "revision": "fb405dd2c7901485f7e158b24e3a0a47e4efd8b5", + "version": "1.28.4" + } + }, + { + "package": "GTMSessionFetcher", + "repositoryURL": "https://github.com/google/gtm-session-fetcher.git", + "state": { + "branch": null, + "revision": "bc6a19702ac76ac4e488b68148710eb815f9bc56", + "version": "1.7.0" + } + }, + { + "package": "Intercom", + "repositoryURL": "https://github.com/intercom/intercom-ios", + "state": { + "branch": null, + "revision": "3345d9e7599141d7c844981423a7e5409f2bfb81", + "version": "11.1.2" + } + }, + { + "package": "leveldb", + "repositoryURL": "https://github.com/firebase/leveldb.git", + "state": { + "branch": null, + "revision": "0706abcc6b0bd9cedfbb015ba840e4a780b5159b", + "version": "1.22.2" + } + }, + { + "package": "nanopb", + "repositoryURL": "https://github.com/firebase/nanopb.git", + "state": { + "branch": null, + "revision": "7ee9ef9f627d85cbe1b8c4f49a3ed26eed216c77", + "version": "2.30908.0" + } + }, + { + "package": "Promises", + "repositoryURL": "https://github.com/google/promises.git", + "state": { + "branch": null, + "revision": "611337c330350c9c1823ad6d671e7f936af5ee13", + "version": "2.0.0" + } + }, + { + "package": "Sovran", + "repositoryURL": "https://github.com/segmentio/Sovran-Swift.git", + "state": { + "branch": null, + "revision": "944c17d7c46bd95fc37f09136cabd172be5b413b", + "version": "1.0.3" + } + }, + { + "package": "swift-argument-parser", + "repositoryURL": "https://github.com/apple/swift-argument-parser", + "state": { + "branch": null, + "revision": "e1465042f195f374b94f915ba8ca49de24300a0d", + "version": "1.0.2" + } + }, + { + "package": "swift-graphql", + "repositoryURL": "https://github.com/maticzav/swift-graphql", + "state": { + "branch": null, + "revision": "b1fad45d10194e865685150fedad9ef0845fb254", + "version": "2.3.1" + } + }, + { + "package": "SwiftProtobuf", + "repositoryURL": "https://github.com/apple/swift-protobuf.git", + "state": { + "branch": null, + "revision": "7e2c5f3cbbeea68e004915e3a8961e20bd11d824", + "version": "1.18.0" + } + }, + { + "package": "SwiftFormat", + "repositoryURL": "https://github.com/nicklockwood/SwiftFormat", + "state": { + "branch": null, + "revision": "872e7034f54aeee3f20acf790ecc13e1383f7360", + "version": "0.48.4" + } + }, + { + "package": "Introspect", + "repositoryURL": "https://github.com/siteline/SwiftUI-Introspect.git", + "state": { + "branch": null, + "revision": "f2616860a41f9d9932da412a8978fec79c06fe24", + "version": "0.1.4" + } + }, + { + "package": "Valet", + "repositoryURL": "https://github.com/Square/Valet", + "state": { + "branch": null, + "revision": "2bf3329055f5d71d42a12801dd69d1d770fafa5e", + "version": "4.1.2" + } + }, + { + "package": "Yams", + "repositoryURL": "https://github.com/jpsim/Yams.git", + "state": { + "branch": null, + "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa", + "version": "4.0.6" + } } - }, - { - "identity" : "analytics-swift", - "kind" : "remoteSourceControl", - "location" : "git@github.com:segmentio/analytics-swift.git", - "state" : { - "revision" : "92cc824211160ab98c28c7d40c1e6d27645c2bf1", - "version" : "1.2.3" - } - }, - { - "identity" : "appauth-ios", - "kind" : "remoteSourceControl", - "location" : "https://github.com/openid/AppAuth-iOS.git", - "state" : { - "revision" : "01131d68346c8ae552961c768d583c715fbe1410", - "version" : "1.4.0" - } - }, - { - "identity" : "boringssl-swiftpm", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/boringssl-SwiftPM.git", - "state" : { - "revision" : "734a8247442fde37df4364c21f6a0085b6a36728", - "version" : "0.7.2" - } - }, - { - "identity" : "files", - "kind" : "remoteSourceControl", - "location" : "https://github.com/JohnSundell/Files", - "state" : { - "revision" : "d273b5b7025d386feef79ef6bad7de762e106eaf", - "version" : "4.2.0" - } - }, - { - "identity" : "firebase-ios-sdk", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/firebase-ios-sdk", - "state" : { - "revision" : "08686f04881483d2bc098b2696e674c0ba135e47", - "version" : "8.10.0" - } - }, - { - "identity" : "googleappmeasurement", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/GoogleAppMeasurement.git", - "state" : { - "revision" : "9b2f6aca5b4685c45f9f5481f19bee8e7982c538", - "version" : "8.9.1" - } - }, - { - "identity" : "googledatatransport", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/GoogleDataTransport.git", - "state" : { - "revision" : "15ccdfd25ac55b9239b82809531ff26605e7556e", - "version" : "9.1.2" - } - }, - { - "identity" : "googleutilities", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/GoogleUtilities.git", - "state" : { - "revision" : "b3bb0c5551fb3f80ca939829639ab5b093edd14f", - "version" : "7.7.0" - } - }, - { - "identity" : "grpc-swiftpm", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/grpc-SwiftPM.git", - "state" : { - "revision" : "fb405dd2c7901485f7e158b24e3a0a47e4efd8b5", - "version" : "1.28.4" - } - }, - { - "identity" : "gtm-session-fetcher", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/gtm-session-fetcher.git", - "state" : { - "revision" : "bc6a19702ac76ac4e488b68148710eb815f9bc56", - "version" : "1.7.0" - } - }, - { - "identity" : "intercom-ios", - "kind" : "remoteSourceControl", - "location" : "https://github.com/intercom/intercom-ios", - "state" : { - "revision" : "3345d9e7599141d7c844981423a7e5409f2bfb81", - "version" : "11.1.2" - } - }, - { - "identity" : "leveldb", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/leveldb.git", - "state" : { - "revision" : "0706abcc6b0bd9cedfbb015ba840e4a780b5159b", - "version" : "1.22.2" - } - }, - { - "identity" : "nanopb", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/nanopb.git", - "state" : { - "revision" : "7ee9ef9f627d85cbe1b8c4f49a3ed26eed216c77", - "version" : "2.30908.0" - } - }, - { - "identity" : "promises", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/promises.git", - "state" : { - "revision" : "611337c330350c9c1823ad6d671e7f936af5ee13", - "version" : "2.0.0" - } - }, - { - "identity" : "pspdfkit-sp", - "kind" : "remoteSourceControl", - "location" : "https://github.com/PSPDFKit/PSPDFKit-SP", - "state" : { - "branch" : "master", - "revision" : "344c895fea62eb42c6b56e6a060d5dff73cc5bc2" - } - }, - { - "identity" : "sovran-swift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/segmentio/Sovran-Swift.git", - "state" : { - "revision" : "944c17d7c46bd95fc37f09136cabd172be5b413b", - "version" : "1.0.3" - } - }, - { - "identity" : "swift-argument-parser", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-argument-parser", - "state" : { - "revision" : "e1465042f195f374b94f915ba8ca49de24300a0d", - "version" : "1.0.2" - } - }, - { - "identity" : "swift-graphql", - "kind" : "remoteSourceControl", - "location" : "https://github.com/maticzav/swift-graphql", - "state" : { - "revision" : "b1fad45d10194e865685150fedad9ef0845fb254", - "version" : "2.3.1" - } - }, - { - "identity" : "swift-protobuf", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-protobuf.git", - "state" : { - "revision" : "7e2c5f3cbbeea68e004915e3a8961e20bd11d824", - "version" : "1.18.0" - } - }, - { - "identity" : "swiftformat", - "kind" : "remoteSourceControl", - "location" : "https://github.com/nicklockwood/SwiftFormat", - "state" : { - "revision" : "872e7034f54aeee3f20acf790ecc13e1383f7360", - "version" : "0.48.4" - } - }, - { - "identity" : "swiftui-introspect", - "kind" : "remoteSourceControl", - "location" : "https://github.com/siteline/SwiftUI-Introspect.git", - "state" : { - "revision" : "f2616860a41f9d9932da412a8978fec79c06fe24", - "version" : "0.1.4" - } - }, - { - "identity" : "valet", - "kind" : "remoteSourceControl", - "location" : "https://github.com/Square/Valet", - "state" : { - "revision" : "2bf3329055f5d71d42a12801dd69d1d770fafa5e", - "version" : "4.1.2" - } - }, - { - "identity" : "yams", - "kind" : "remoteSourceControl", - "location" : "https://github.com/jpsim/Yams.git", - "state" : { - "revision" : "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa", - "version" : "4.0.6" - } - } - ], - "version" : 2 + ] + }, + "version": 1 } diff --git a/apple/OmnivoreKit/Package.swift b/apple/OmnivoreKit/Package.swift index 1897ffaa7..fb073c60d 100644 --- a/apple/OmnivoreKit/Package.swift +++ b/apple/OmnivoreKit/Package.swift @@ -21,10 +21,11 @@ let package = Package( .package(url: "https://github.com/Square/Valet", from: "4.1.2"), .package(url: "https://github.com/maticzav/swift-graphql", from: "2.3.1"), .package(url: "https://github.com/siteline/SwiftUI-Introspect.git", from: "0.1.4"), - .package(url: "git@github.com:segmentio/analytics-swift.git", .upToNextMajor(from: "1.0.0")) + .package(url: "git@github.com:segmentio/analytics-swift.git", .upToNextMajor(from: "1.0.0")), + .package(path: "../LocalPSPDFKit") ], targets: [ - .target(name: "App", dependencies: ["Views", "Services", "Models", "Utils"]), + .target(name: "App", dependencies: ["Views", "Services", "Models", "Utils", .product(name: "PSPDFKit", package: "LocalPSPDFKit")]), .testTarget(name: "AppTests", dependencies: ["App"]), .target( name: "Views",