From ee9e754c889d82a3967894b22f6ea338cea7857b Mon Sep 17 00:00:00 2001 From: Kyle Hickinson Date: Thu, 23 Sep 2021 11:18:53 -0400 Subject: [PATCH 1/4] Fix #4148: Bump BraveCore library to 1.30.x --- Client/Frontend/Browser/BrowserViewController.swift | 2 +- .../Browser/New Tab Page/NewTabPageViewController.swift | 2 +- Client/Rewards/BraveRewards.swift | 6 +++--- package-lock.json | 4 ++-- package.json | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Client/Frontend/Browser/BrowserViewController.swift b/Client/Frontend/Browser/BrowserViewController.swift index 354c55717b1..ad9d052f9d5 100644 --- a/Client/Frontend/Browser/BrowserViewController.swift +++ b/Client/Frontend/Browser/BrowserViewController.swift @@ -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 } diff --git a/Client/Frontend/Browser/New Tab Page/NewTabPageViewController.swift b/Client/Frontend/Browser/New Tab Page/NewTabPageViewController.swift index 553225f7d6a..f6f08f3f28f 100644 --- a/Client/Frontend/Browser/New Tab Page/NewTabPageViewController.swift +++ b/Client/Frontend/Browser/New Tab Page/NewTabPageViewController.swift @@ -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 { diff --git a/Client/Rewards/BraveRewards.swift b/Client/Rewards/BraveRewards.swift index a85949b61be..0c362b02578 100644 --- a/Client/Rewards/BraveRewards.swift +++ b/Client/Rewards/BraveRewards.swift @@ -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 @@ -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 diff --git a/package-lock.json b/package-lock.json index 0c1d0561d1a..0946d44541d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -960,8 +960,8 @@ } }, "brave-core-ios": { - "version": "https://github.com/brave/brave-browser/releases/download/v1.29.76/brave-core-ios-1.29.76.tgz", - "integrity": "sha512-3tHnrfpqQjmpiYlJdJxd4yPFuxn/Pd3sXfQwQu3b6peWG2nKEOILhl2Psa+Eghn7GIHKkaVBjgCLPHVKY7lJSg==" + "version": "https://github.com/brave/brave-browser/releases/download/v1.30.84/brave-core-ios-1.30.84.tgz", + "integrity": "sha512-DdnbSWfKyEDevj8brH4QQkKak96aD+OfBkh3g2xSMaEyToA+0FKq31fbp2nFTbKWQiDyUiYWtT6XYMxMoAjiZw==" }, "browserslist": { "version": "3.2.8", diff --git a/package.json b/package.json index 78b12082603..ab919835d2c 100644 --- a/package.json +++ b/package.json @@ -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.84/brave-core-ios-1.30.84.tgz", "page-metadata-parser": "^1.1.3", "readability": "github:mozilla/readability#b9f47bcc8d3c223cabe2dec6a42eeb3bd778d85c", "webpack-cli": "^4.8.0" From 81fafc8a5cd7afa3b421f44b5d11fa2e82be69d2 Mon Sep 17 00:00:00 2001 From: Kyle Hickinson Date: Thu, 23 Sep 2021 11:20:55 -0400 Subject: [PATCH 2/4] Fix #4107: Move iOS deployment target to iOS 14 --- Client.xcodeproj/project.pbxproj | 22 +++++-------------- .../UIBarButtonItemExtensions.swift | 16 -------------- Client/Frontend/Share/CreatePDFActivity.swift | 1 - 3 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 Client/Extensions/UIBarButtonItemExtensions.swift diff --git a/Client.xcodeproj/project.pbxproj b/Client.xcodeproj/project.pbxproj index 2dec8af63ad..58b3fbe2c93 100644 --- a/Client.xcodeproj/project.pbxproj +++ b/Client.xcodeproj/project.pbxproj @@ -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 */; }; @@ -2547,7 +2546,6 @@ A198E75020C701ED00334C11 /* HistoryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryViewController.swift; sourceTree = ""; }; A1AD4BCE20BF3E8C007A6EA1 /* BookmarksViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksViewController.swift; sourceTree = ""; }; A1AD4BE020C082EF007A6EA1 /* UIGestureRecognizerExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIGestureRecognizerExtensions.swift; sourceTree = ""; }; - A1AD4BE220C0861D007A6EA1 /* UIBarButtonItemExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIBarButtonItemExtensions.swift; sourceTree = ""; }; A1CA29C320E1746A00CB9126 /* OptionSelectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptionSelectionViewController.swift; sourceTree = ""; }; A1CDF22A20BDD6B8005C6E58 /* POPExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = POPExtensions.swift; sourceTree = ""; }; A1D841FF20BC44F800BDAFF7 /* PopoverController.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = PopoverController.swift; sourceTree = ""; tabWidth = 4; }; @@ -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 */, @@ -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 */, @@ -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)", @@ -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)", @@ -10520,7 +10516,6 @@ "$(inherited)", ); INFOPLIST_FILE = BrowserIntents/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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)", @@ -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)", @@ -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)", @@ -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)", diff --git a/Client/Extensions/UIBarButtonItemExtensions.swift b/Client/Extensions/UIBarButtonItemExtensions.swift deleted file mode 100644 index 58dd497138a..00000000000 --- a/Client/Extensions/UIBarButtonItemExtensions.swift +++ /dev/null @@ -1,16 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -import Foundation -import UIKit - -extension UIBarButtonItem { - - /// Creates a fixed space `UIBarButtonItem` with a given width - class func fixedSpace(_ width: CGFloat) -> UIBarButtonItem { - return UIBarButtonItem(barButtonSystemItem: .fixedSpace, target: nil, action: nil).then { - $0.width = width - } - } -} diff --git a/Client/Frontend/Share/CreatePDFActivity.swift b/Client/Frontend/Share/CreatePDFActivity.swift index 4afb36e3a1d..dbad8203af9 100644 --- a/Client/Frontend/Share/CreatePDFActivity.swift +++ b/Client/Frontend/Share/CreatePDFActivity.swift @@ -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 From 51a63fd4665c9b893bb98549cd7a051eac789deb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Buczek?= Date: Fri, 1 Oct 2021 22:29:08 +0200 Subject: [PATCH 3/4] Fix #3941: Update brave-core to the build with Rewards lag fix. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ab919835d2c..4b8e0b82a3f 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ }, "license": "MPL-2.0", "dependencies": { - "brave-core-ios": "https://github.com/brave/brave-browser/releases/download/v1.30.84/brave-core-ios-1.30.84.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" From 2e04f9ed7b7d0633afc4095097143a3d8ee42810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Buczek?= Date: Fri, 1 Oct 2021 22:42:32 +0200 Subject: [PATCH 4/4] Update b-c 1.30.88 package-lock --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0946d44541d..543bd7b1e1f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -960,8 +960,8 @@ } }, "brave-core-ios": { - "version": "https://github.com/brave/brave-browser/releases/download/v1.30.84/brave-core-ios-1.30.84.tgz", - "integrity": "sha512-DdnbSWfKyEDevj8brH4QQkKak96aD+OfBkh3g2xSMaEyToA+0FKq31fbp2nFTbKWQiDyUiYWtT6XYMxMoAjiZw==" + "version": "https://github.com/brave/brave-browser/releases/download/v1.30.88/brave-core-ios-1.30.88.tgz", + "integrity": "sha512-w/W2xgO27vcp+4HLopKmJOKTFw3tJ1RHOvEEAduhocae/Q4+gRt+k4fG+whnp7GfCeiAjxlnrDUeTkkQT5F8Mg==" }, "browserslist": { "version": "3.2.8",