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.

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

[iOS] Add new browser menu UI #26805

Merged
merged 2 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
93 changes: 50 additions & 43 deletions ios/brave-ios/App/Client.xcodeproj/Brave.xctestplan
Original file line number Diff line number Diff line change
Expand Up @@ -30,118 +30,118 @@
},
"testTargets" : [
{
"skippedTests" : [
"CertificatePinningTest\/testSelfSignedRootAllowed2()"
],
"target" : {
"containerPath" : "container:..",
"identifier" : "BraveSharedTests",
"name" : "BraveSharedTests"
"identifier" : "AIChatTests",
"name" : "AIChatTests"
}
},
{
"skippedTests" : [
"DecentralizedDNSHelperTests"
],
"target" : {
"containerPath" : "container:..",
"identifier" : "BraveWalletTests",
"name" : "BraveWalletTests"
"identifier" : "BraveVPNTests",
"name" : "BraveVPNTests"
}
},
{
"skippedTests" : [
"NavigationRouterTests",
"PlaylistTests\/testVideoPlayerTrackBarTimeManualFormatter()",
"SyncTests",
"TabSessionTests",
"TestFavicons",
"URLFormatTests"
"CertificatePinningTest\/testSelfSignedRootAllowed2()"
],
"target" : {
"containerPath" : "container:..",
"identifier" : "ClientTests",
"name" : "ClientTests"
"identifier" : "CertificateUtilitiesTests",
"name" : "CertificateUtilitiesTests"
}
},
{
"target" : {
"containerPath" : "container:..",
"identifier" : "DataTests",
"name" : "DataTests"
"identifier" : "PrivateCDNTests",
"name" : "PrivateCDNTests"
}
},
{
"target" : {
"containerPath" : "container:..",
"identifier" : "SharedTests",
"name" : "SharedTests"
"identifier" : "DataTests",
"name" : "DataTests"
}
},
{
"skippedTests" : [
"CertificatePinningTest\/testSelfSignedRootAllowed2()"
],
"target" : {
"containerPath" : "container:..",
"identifier" : "StorageTests",
"name" : "StorageTests"
"identifier" : "BraveSharedTests",
"name" : "BraveSharedTests"
}
},
{
"target" : {
"containerPath" : "container:..",
"identifier" : "BraveNewsTests",
"name" : "BraveNewsTests"
"identifier" : "BrowserMenuTests",
"name" : "BrowserMenuTests"
}
},
{
"target" : {
"containerPath" : "container:..",
"identifier" : "BraveTalkTests",
"name" : "BraveTalkTests"
"identifier" : "UserAgentTests",
"name" : "UserAgentTests"
}
},
{
"skippedTests" : [
"CertificatePinningTest\/testSelfSignedRootAllowed2()"
],
"target" : {
"containerPath" : "container:..",
"identifier" : "CertificateUtilitiesTests",
"name" : "CertificateUtilitiesTests"
"identifier" : "BraveNewsTests",
"name" : "BraveNewsTests"
}
},
{
"target" : {
"containerPath" : "container:..",
"identifier" : "GrowthTests",
"name" : "GrowthTests"
"identifier" : "StorageTests",
"name" : "StorageTests"
}
},
{
"target" : {
"containerPath" : "container:..",
"identifier" : "PrivateCDNTests",
"name" : "PrivateCDNTests"
"identifier" : "SharedTests",
"name" : "SharedTests"
}
},
{
"skippedTests" : [
"NavigationRouterTests",
"PlaylistTests\/testVideoPlayerTrackBarTimeManualFormatter()",
"SyncTests",
"TabSessionTests",
"TestFavicons",
"URLFormatTests"
],
"target" : {
"containerPath" : "container:..",
"identifier" : "BraveVPNTests",
"name" : "BraveVPNTests"
"identifier" : "ClientTests",
"name" : "ClientTests"
}
},
{
"skippedTests" : [
"DecentralizedDNSHelperTests"
],
"target" : {
"containerPath" : "container:..",
"identifier" : "UserAgentTests",
"name" : "UserAgentTests"
"identifier" : "BraveWalletTests",
"name" : "BraveWalletTests"
}
},
{
"target" : {
"containerPath" : "container:..",
"identifier" : "AIChatTests",
"name" : "AIChatTests"
"identifier" : "GrowthTests",
"name" : "GrowthTests"
}
},
{
Expand All @@ -150,6 +150,13 @@
"identifier" : "PlaylistUITests",
"name" : "PlaylistUITests"
}
},
{
"target" : {
"containerPath" : "container:..",
"identifier" : "BraveTalkTests",
"name" : "BraveTalkTests"
}
}
],
"version" : 1
Expand Down
12 changes: 11 additions & 1 deletion ios/brave-ios/Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version: 5.9
// swift-tools-version: 5.10
// The swift-tools-version declares the minimum version of Swift required to build this package.

import Foundation
Expand Down Expand Up @@ -45,6 +45,7 @@ var package = Package(
.library(name: "UserAgent", targets: ["UserAgent"]),
.library(name: "CredentialProviderUI", targets: ["CredentialProviderUI"]),
.library(name: "PlaylistUI", targets: ["PlaylistUI"]),
.library(name: "BrowserMenu", targets: ["BrowserMenu"]),
.executable(name: "LeoAssetCatalogGenerator", targets: ["LeoAssetCatalogGenerator"]),
.plugin(name: "IntentBuilderPlugin", targets: ["IntentBuilderPlugin"]),
.plugin(name: "LoggerPlugin", targets: ["LoggerPlugin"]),
Expand Down Expand Up @@ -422,6 +423,14 @@ var package = Package(
dependencies: ["PlaylistUI", "Playlist", "Preferences", "Data", "TestHelpers"],
resources: [.copy("Resources/Big_Buck_Bunny_360_10s_1MB.mp4")]
),
.target(
name: "BrowserMenu",
dependencies: [
"DesignSystem", "BraveUI", "Preferences", "Strings", "BraveStrings", "BraveVPN",
"GuardianConnect", "BraveWallet",
]
),
.testTarget(name: "BrowserMenuTests", dependencies: ["BrowserMenu"]),
.plugin(name: "IntentBuilderPlugin", capability: .buildTool()),
.plugin(name: "LoggerPlugin", capability: .buildTool()),
.plugin(
Expand Down Expand Up @@ -469,6 +478,7 @@ var braveTarget: PackageDescription.Target = .target(
.product(name: "Lottie", package: "lottie-spm"),
.product(name: "Collections", package: "swift-collections"),
"PlaylistUI",
"BrowserMenu",
],
exclude: [
"Frontend/UserContent/UserScripts/AllFrames",
Expand Down
Loading
Loading