Skip to content
This repository has been archived by the owner on May 10, 2024. It is now read-only.

Bump BraveCore library to 1.30.x & move deployment target to iOS 14 #4218

Merged
merged 4 commits into from
Oct 4, 2021
Merged

Bump BraveCore library to 1.30.x & move deployment target to iOS 14 #4218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee9e754
Fix #4148: Bump BraveCore library to 1.30.x
kylehickinson Sep 23, 2021
81fafc8
Fix #4107: Move iOS deployment target to iOS 14
kylehickinson Sep 23, 2021
51a63fd
Fix #3941: Update brave-core to the build with Rewards lag fix.
iccub Oct 1, 2021
2e04f9e
Update b-c 1.30.88 package-lock
iccub Oct 1, 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
22 changes: 6 additions & 16 deletions Client.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,6 @@
A198E75120C701ED00334C11 /* HistoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A198E75020C701ED00334C11 /* HistoryViewController.swift */; };
A1AD4BCF20BF3E8C007A6EA1 /* BookmarksViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1AD4BCE20BF3E8C007A6EA1 /* BookmarksViewController.swift */; };
A1AD4BE120C082EF007A6EA1 /* UIGestureRecognizerExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1AD4BE020C082EF007A6EA1 /* UIGestureRecognizerExtensions.swift */; };
A1AD4BE320C0861D007A6EA1 /* UIBarButtonItemExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1AD4BE220C0861D007A6EA1 /* UIBarButtonItemExtensions.swift */; };
A1CA29C420E1746A00CB9126 /* OptionSelectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1CA29C320E1746A00CB9126 /* OptionSelectionViewController.swift */; };
A1F66A7320DD71C400303328 /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1F66A7220DD71C400303328 /* SettingsViewController.swift */; };
A1FEEE2020BF28D900298DA2 /* Then.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1FEEE1F20BF28D900298DA2 /* Then.swift */; };
Expand Down Expand Up @@ -2547,7 +2546,6 @@
A198E75020C701ED00334C11 /* HistoryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryViewController.swift; sourceTree = "<group>"; };
A1AD4BCE20BF3E8C007A6EA1 /* BookmarksViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksViewController.swift; sourceTree = "<group>"; };
A1AD4BE020C082EF007A6EA1 /* UIGestureRecognizerExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIGestureRecognizerExtensions.swift; sourceTree = "<group>"; };
A1AD4BE220C0861D007A6EA1 /* UIBarButtonItemExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIBarButtonItemExtensions.swift; sourceTree = "<group>"; };
A1CA29C320E1746A00CB9126 /* OptionSelectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptionSelectionViewController.swift; sourceTree = "<group>"; };
A1CDF22A20BDD6B8005C6E58 /* POPExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = POPExtensions.swift; sourceTree = "<group>"; };
A1D841FF20BC44F800BDAFF7 /* PopoverController.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = PopoverController.swift; sourceTree = "<group>"; tabWidth = 4; };
Expand Down Expand Up @@ -4104,7 +4102,6 @@
E65075501E37F6D1006961AC /* UIViewExtensions.swift */,
C817B34C1FC609500086018E /* UIScrollViewSwizzled.swift */,
A1AD4BE020C082EF007A6EA1 /* UIGestureRecognizerExtensions.swift */,
A1AD4BE220C0861D007A6EA1 /* UIBarButtonItemExtensions.swift */,
595E0EE021CAEF5B00813D49 /* FileManagerExtension.swift */,
592F521D2217327B0078395E /* HttpCookieExtension.swift */,
5D8AE6AE230C76B60096C845 /* AppearanceExtensions.swift */,
Expand Down Expand Up @@ -7685,7 +7682,6 @@
4422D54C21BFFB7E00BF1855 /* strutil.cc in Sources */,
CA8D5C1C26D7CF04009BF13D /* PlaylistCarplayManager.swift in Sources */,
59A68D66379CFA85C4EAF00B /* TwoLineCell.swift in Sources */,
A1AD4BE320C0861D007A6EA1 /* UIBarButtonItemExtensions.swift in Sources */,
C6D267522136800100465DFA /* PrivateBrowsingManager.swift in Sources */,
0A4B012220D02F26004D4011 /* TabBarCell.swift in Sources */,
27FD2CAC2146C31C00A5A779 /* FindInPageActivity.swift in Sources */,
Expand Down Expand Up @@ -8920,7 +8916,7 @@
"$(SRCROOT)/Client/WebFilters/ShieldStats/Httpse/ThirdParty/leveldb/**",
"$(SRCROOT)/Client/WebFilters/ShieldStats/Httpse/ThirdParty/re2",
);
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)",
Expand Down Expand Up @@ -9595,7 +9591,7 @@
"$(SRCROOT)/Client/WebFilters/ShieldStats/Httpse/ThirdParty/leveldb/**",
"$(SRCROOT)/Client/WebFilters/ShieldStats/Httpse/ThirdParty/re2",
);
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)",
Expand Down Expand Up @@ -10520,7 +10516,6 @@
"$(inherited)",
);
INFOPLIST_FILE = BrowserIntents/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -10555,7 +10550,6 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = BrowserIntents/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -10590,7 +10584,6 @@
DEVELOPMENT_TEAM = L6556KQ6XT;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = BrowserIntents/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -10625,7 +10618,6 @@
DEVELOPMENT_TEAM = KL8N8XSYF4;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = BrowserIntents/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -10660,7 +10652,6 @@
DEVELOPMENT_TEAM = KL8N8XSYF4;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = BrowserIntents/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -10694,7 +10685,6 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = BrowserIntents/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -11939,7 +11929,7 @@
"$(SRCROOT)/Client/WebFilters/ShieldStats/Httpse/ThirdParty/leveldb/**",
"$(SRCROOT)/Client/WebFilters/ShieldStats/Httpse/ThirdParty/re2",
);
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)",
Expand Down Expand Up @@ -12175,7 +12165,7 @@
"$(SRCROOT)/Client/WebFilters/ShieldStats/Httpse/ThirdParty/leveldb/**",
"$(SRCROOT)/Client/WebFilters/ShieldStats/Httpse/ThirdParty/re2",
);
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)",
Expand Down Expand Up @@ -12478,7 +12468,7 @@
"$(SRCROOT)/Client/WebFilters/ShieldStats/Httpse/ThirdParty/leveldb/**",
"$(SRCROOT)/Client/WebFilters/ShieldStats/Httpse/ThirdParty/re2",
);
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)",
Expand Down Expand Up @@ -12734,7 +12724,7 @@
"$(SRCROOT)/Client/WebFilters/ShieldStats/Httpse/ThirdParty/leveldb/**",
"$(SRCROOT)/Client/WebFilters/ShieldStats/Httpse/ThirdParty/re2",
);
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)",
Expand Down
16 changes: 0 additions & 16 deletions Client/Extensions/UIBarButtonItemExtensions.swift
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Client/Frontend/Browser/BrowserViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ class BrowserViewController: UIViewController {
}
}

let buildChannel = Ads.BraveAdsBuildChannel().then {
let buildChannel = Ads.BuildChannel().then {
$0.name = AppConstants.buildChannel.rawValue
$0.isRelease = AppConstants.buildChannel == .release
}
Expand Down
2 changes: 1 addition & 1 deletion Client/Frontend/Browser/New Tab Page/NewTabPageViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ class NewTabPageViewController: UIViewController {
backgroundView.imageConstraints?.landscapeCenter.update(offset: inset)
}

private func reportSponsoredImageBackgroundEvent(_ event: Ads.BraveAdsNewTabPageAdEventType) {
private func reportSponsoredImageBackgroundEvent(_ event: Ads.NewTabPageAdEventType) {
guard let backgroundType = background.currentBackground?.type,
case .withBrandLogo = backgroundType,
let creativeInstanceId = background.currentBackground?.wallpaper.creativeInstanceId else {
Expand Down
1 change: 0 additions & 1 deletion Client/Frontend/Share/CreatePDFActivity.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ private let log = Logger.browserLogger
#if compiler(>=5.3)

/// An activity that will create a PDF of a given web page
@available(iOS 14.0, *)
class CreatePDFActivity: UIActivity {
private let callback: (Data) -> Void
private let webView: WKWebView
Expand Down
6 changes: 3 additions & 3 deletions Client/Rewards/BraveRewards.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class BraveRewards: NSObject {

private let configuration: Configuration

init(configuration: Configuration, buildChannel: Ads.BraveAdsBuildChannel?) {
init(configuration: Configuration, buildChannel: Ads.BuildChannel?) {
self.configuration = configuration

BraveAds.isDebug = configuration.ledgerEnvironment != .production
Expand Down Expand Up @@ -264,8 +264,8 @@ extension BraveRewards {
struct Configuration {
var storageURL: URL
var ledgerEnvironment: Ledger.Environment
var adsEnvironment: Ads.BraveAdsEnvironment
var adsBuildChannel: Ads.BraveAdsBuildChannel = .init()
var adsEnvironment: Ads.Environment
var adsBuildChannel: Ads.BuildChannel = .init()
var isTesting: Bool = false
var overridenNumberOfSecondsBetweenReconcile: Int = 0
var retryInterval: Int = 0
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"license": "MPL-2.0",
"dependencies": {
"brave-core-ios": "https://github.com/brave/brave-browser/releases/download/v1.29.76/brave-core-ios-1.29.76.tgz",
"brave-core-ios": "https://github.com/brave/brave-browser/releases/download/v1.30.88/brave-core-ios-1.30.88.tgz",
"page-metadata-parser": "^1.1.3",
"readability": "github:mozilla/readability#b9f47bcc8d3c223cabe2dec6a42eeb3bd778d85c",
"webpack-cli": "^4.8.0"
Expand Down