Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to BrowserServicesKit 1.1.1 #111

Merged
merged 2 commits into from
May 11, 2021
Merged

Update to BrowserServicesKit 1.1.1 #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a999d29
Use a specific version of BrowserServicesKit.
samsymons May 7, 2021
958abb6
Use BrowserServicesKit 1.1.1.
samsymons May 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions DuckDuckGo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
4B677442255DBEEA00025BD8 /* Database.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B677440255DBEEA00025BD8 /* Database.swift */; };
4B67744B255DBF3A00025BD8 /* BloomFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B677449255DBF3A00025BD8 /* BloomFilter.cpp */; };
4B677450255DBFA300025BD8 /* HashExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B67744F255DBFA300025BD8 /* HashExtension.swift */; };
4B7727A92645E1B800B64301 /* BrowserServicesKit in Frameworks */ = {isa = PBXBuildFile; productRef = 4B7727A82645E1B800B64301 /* BrowserServicesKit */; };
4B82E9B325B69E3E00656FE7 /* TrackerRadarKit in Frameworks */ = {isa = PBXBuildFile; productRef = 4B82E9B225B69E3E00656FE7 /* TrackerRadarKit */; };
4B82E9B925B6A05800656FE7 /* DetectedTrackerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B82E9B825B6A05800656FE7 /* DetectedTrackerTests.swift */; };
4B82E9C125B6A1CD00656FE7 /* TrackerRadarManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B82E9C025B6A1CD00656FE7 /* TrackerRadarManagerTests.swift */; };
Expand All @@ -99,7 +100,6 @@
4BA1A6E6258C270800F6F690 /* EncryptionKeyGeneratorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BA1A6E5258C270800F6F690 /* EncryptionKeyGeneratorTests.swift */; };
4BA1A6F6258C4F9600F6F690 /* EncryptionMocks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BA1A6F5258C4F9600F6F690 /* EncryptionMocks.swift */; };
4BA1A6FE258C5C1300F6F690 /* EncryptedValueTransformerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BA1A6FD258C5C1300F6F690 /* EncryptedValueTransformerTests.swift */; };
4BAF970D2637262700BF6FAB /* BrowserServicesKit in Frameworks */ = {isa = PBXBuildFile; productRef = 4BAF970C2637262700BF6FAB /* BrowserServicesKit */; };
4BB88B4525B7B55C006F6B06 /* DebugUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB88B4425B7B55C006F6B06 /* DebugUserScript.swift */; };
4BB88B4A25B7B690006F6B06 /* SequenceExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB88B4925B7B690006F6B06 /* SequenceExtensions.swift */; };
4BB88B5025B7BA2B006F6B06 /* TabInstrumentation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB88B4F25B7BA2B006F6B06 /* TabInstrumentation.swift */; };
Expand Down Expand Up @@ -639,7 +639,7 @@
85AE2FF224A33A2D002D507F /* WebKit.framework in Frameworks */,
B65783F525F8ACA400D8DB33 /* Punnycode in Frameworks */,
4B82E9B325B69E3E00656FE7 /* TrackerRadarKit in Frameworks */,
4BAF970D2637262700BF6FAB /* BrowserServicesKit in Frameworks */,
4B7727A92645E1B800B64301 /* BrowserServicesKit in Frameworks */,
85FF55C825F82E4F00E2AB99 /* Lottie in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -1834,7 +1834,7 @@
4B82E9B225B69E3E00656FE7 /* TrackerRadarKit */,
85FF55C725F82E4F00E2AB99 /* Lottie */,
B65783F425F8ACA400D8DB33 /* Punnycode */,
4BAF970C2637262700BF6FAB /* BrowserServicesKit */,
4B7727A82645E1B800B64301 /* BrowserServicesKit */,
);
productName = DuckDuckGo;
productReference = AA585D7E248FD31100E9A3E2 /* DuckDuckGo Privacy Browser.app */;
Expand Down Expand Up @@ -1899,7 +1899,7 @@
85FF55C625F82E4F00E2AB99 /* XCRemoteSwiftPackageReference "lottie-ios" */,
B65783F325F8ACA400D8DB33 /* XCRemoteSwiftPackageReference "PunycodeSwift" */,
B6DA44152616C13800DD1EC2 /* XCRemoteSwiftPackageReference "OHHTTPStubs" */,
4BAF970B2637262700BF6FAB /* XCRemoteSwiftPackageReference "BrowserServicesKit" */,
4B7727A72645E1B800B64301 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */,
);
productRefGroup = AA585D7F248FD31100E9A3E2 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -2798,20 +2798,20 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
4B82E9B125B69E3E00656FE7 /* XCRemoteSwiftPackageReference "TrackerRadarKit" */ = {
4B7727A72645E1B800B64301 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/duckduckgo/TrackerRadarKit.git";
repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.0.2;
kind = revision;
revision = d8d6579ff2b1e78f5a2e264b4a9a2cf77701e7eb;
};
};
4BAF970B2637262700BF6FAB /* XCRemoteSwiftPackageReference "BrowserServicesKit" */ = {
4B82E9B125B69E3E00656FE7 /* XCRemoteSwiftPackageReference "TrackerRadarKit" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit.git";
repositoryURL = "https://github.com/duckduckgo/TrackerRadarKit.git";
requirement = {
kind = revision;
revision = 02c3f69ba847a3f00cee497abb5d71b5e1748af6;
kind = upToNextMajorVersion;
minimumVersion = 1.0.2;
};
};
85FF55C625F82E4F00E2AB99 /* XCRemoteSwiftPackageReference "lottie-ios" */ = {
Expand Down Expand Up @@ -2841,16 +2841,16 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
4B7727A82645E1B800B64301 /* BrowserServicesKit */ = {
isa = XCSwiftPackageProductDependency;
package = 4B7727A72645E1B800B64301 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
productName = BrowserServicesKit;
};
4B82E9B225B69E3E00656FE7 /* TrackerRadarKit */ = {
isa = XCSwiftPackageProductDependency;
package = 4B82E9B125B69E3E00656FE7 /* XCRemoteSwiftPackageReference "TrackerRadarKit" */;
productName = TrackerRadarKit;
};
4BAF970C2637262700BF6FAB /* BrowserServicesKit */ = {
isa = XCSwiftPackageProductDependency;
package = 4BAF970B2637262700BF6FAB /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
productName = BrowserServicesKit;
};
85FF55C725F82E4F00E2AB99 /* Lottie */ = {
isa = XCSwiftPackageProductDependency;
package = 85FF55C625F82E4F00E2AB99 /* XCRemoteSwiftPackageReference "lottie-ios" */;
Expand Down
4 changes: 2 additions & 2 deletions DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
"repositoryURL": "https://github.com/duckduckgo/BrowserServicesKit.git",
"state": {
"branch": null,
"revision": "02c3f69ba847a3f00cee497abb5d71b5e1748af6",
"revision": "d8d6579ff2b1e78f5a2e264b4a9a2cf77701e7eb",
"version": null
}
},
{
"package": "GRDB",
"repositoryURL": "https://github.com/duckduckgo/GRDB.swift.git",
"state": {
"branch": "SQLCipher",
"branch": null,
"revision": "e5714d4b6ee1651d2271b04ae85aaf5a327fe70a",
"version": null
}
Expand Down