From 6dec20b8107e8e4cb2d6c91b4976761544dc84cd Mon Sep 17 00:00:00 2001 From: Alexey Martemyanov Date: Thu, 10 Nov 2022 16:04:03 +0600 Subject: [PATCH 1/3] fix warnings: GRDB -> 1.2.1 --- Package.resolved | 4 ++-- Package.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.resolved b/Package.resolved index fa24fde2d..eb58d5fb5 100644 --- a/Package.resolved +++ b/Package.resolved @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/duckduckgo/GRDB.swift.git", "state": { "branch": null, - "revision": "f465dd5c0bf590cdb9bee4e96c53b1719ee30730", - "version": "1.2.0" + "revision": "830ddd161710ed7a80dcbeb4d4b62cf0ae4d8baf", + "version": "1.2.1" } }, { diff --git a/Package.swift b/Package.swift index 643f9b220..c7e0cb7f8 100644 --- a/Package.swift +++ b/Package.swift @@ -16,7 +16,7 @@ let package = Package( ], dependencies: [ .package(name: "Autofill", url: "https://github.com/duckduckgo/duckduckgo-autofill.git", .exact("5.2.0")), - .package(name: "GRDB", url: "https://github.com/duckduckgo/GRDB.swift.git", .exact("1.2.0")), + .package(name: "GRDB", url: "https://github.com/duckduckgo/GRDB.swift.git", .exact("1.2.1")), .package(url: "https://github.com/duckduckgo/TrackerRadarKit", .exact("1.1.1")), .package(name: "Punycode", url: "https://github.com/gumob/PunycodeSwift.git", .exact("2.1.0")), .package(url: "https://github.com/duckduckgo/content-scope-scripts", .exact("3.2.0")) From f68bbafce45c2030b092e720d836e9a8fa02f2ca Mon Sep 17 00:00:00 2001 From: Alexey Martemyanov Date: Fri, 11 Nov 2022 09:10:08 +0600 Subject: [PATCH 2/3] Set C++ stdlib to 11 --- Package.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Package.swift b/Package.swift index c7e0cb7f8..cd2917d3c 100644 --- a/Package.swift +++ b/Package.swift @@ -48,6 +48,9 @@ let package = Package( name: "BloomFilter", resources: [ .process("CMakeLists.txt") + ], + cxxSettings: [ + .unsafeFlags(["-std=c++11"]) ]), .target( name: "Common", From 9a894c64e8ded43e988ba0727810c4c53fabb6d9 Mon Sep 17 00:00:00 2001 From: Alexey Martemyanov Date: Fri, 11 Nov 2022 09:38:45 +0600 Subject: [PATCH 3/3] Unsafe std=c++11 -> cxxLanguageStandard: .cxx11 --- Package.swift | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Package.swift b/Package.swift index cd2917d3c..42f8a058a 100644 --- a/Package.swift +++ b/Package.swift @@ -48,9 +48,6 @@ let package = Package( name: "BloomFilter", resources: [ .process("CMakeLists.txt") - ], - cxxSettings: [ - .unsafeFlags(["-std=c++11"]) ]), .target( name: "Common", @@ -81,5 +78,6 @@ let package = Package( "Common" ] ) - ] + ], + cxxLanguageStandard: .cxx11 )