Skip to content

Commit

Permalink
Merge branch 'main' into fcappelli/prev_sub_breakage
Browse files Browse the repository at this point in the history
# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
  • Loading branch information
federicocappelli committed Jan 11, 2024
2 parents fdefae4 + 69091b4 commit 098e80a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions DuckDuckGo/HomeMessageViewModelBuilder.swift
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ extension RemoteAction {
case .share(let value, let title):
return .share(value: value, title: title)

case .appStore, .url:
case .appStore, .url, .surveyURL:
return .default

default:
case .dismiss:
return .cancel
}
}
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/DuckUI/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ let package = Package(
targets: ["DuckUI"])
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "101.0.0"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "101.0.1"),
],
targets: [
.target(
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/SyncUI/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ let package = Package(
],
dependencies: [
.package(path: "../DuckUI"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "101.0.0"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "101.0.1"),
.package(url: "https://github.com/duckduckgo/DesignResourcesKit", exact: "2.0.0")
],
targets: [
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/Waitlist/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let package = Package(
targets: ["Waitlist", "WaitlistMocks"])
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "101.0.0"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "101.0.1"),
.package(url: "https://github.com/duckduckgo/DesignResourcesKit", exact: "2.0.0")
],
targets: [
Expand Down

0 comments on commit 098e80a

Please sign in to comment.