diff --git a/.gitignore b/.gitignore index 90e1e0b9f12..36cd41a4e9f 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,7 @@ Client/Configuration/Local/ adblock-regions.txt yubikit.log + +# Fastlane Env +.env +.env.* diff --git a/BraveRewardsUI/QA Settings/QASettingsViewController.swift b/BraveRewardsUI/QA Settings/QASettingsViewController.swift index df6517ecb09..cc05c5ff023 100644 --- a/BraveRewardsUI/QA Settings/QASettingsViewController.swift +++ b/BraveRewardsUI/QA Settings/QASettingsViewController.swift @@ -111,7 +111,7 @@ public class QASettingsViewController: TableViewController { title = "Rewards QA Settings" - let isDefaultEnvironmentProd = AppConstants.buildChannel != .developer + let isDefaultEnvironmentProd = AppConstants.buildChannel != .debug let override: EnvironmentOverride = EnvironmentOverride(rawValue: Preferences.Rewards.environmentOverride.value) ?? .none segmentedControl.selectedSegmentIndex = EnvironmentOverride.sortedCases.firstIndex(of: override) ?? 0 diff --git a/BraveShared/Analytics/DAU.swift b/BraveShared/Analytics/DAU.swift index 157786db28e..bea506b90d9 100644 --- a/BraveShared/Analytics/DAU.swift +++ b/BraveShared/Analytics/DAU.swift @@ -47,7 +47,7 @@ public class DAU { /// Sends ping to server and returns a boolean whether a timer for the server call was scheduled. /// A user needs to be active for a certain amount of time before we ping the server. @discardableResult public func sendPingToServer() -> Bool { - if AppConstants.buildChannel == .developer { + if AppConstants.buildChannel == .debug || AppConstants.buildChannel == .enterprise { log.info("Development build detected, no server ping.") return false } @@ -188,7 +188,7 @@ public class DAU { return true } - let daysThatMustPassToSkipDtoi = AppConstants.buildChannel == .enterprise ? 2 : 14 + let daysThatMustPassToSkipDtoi = AppConstants.buildChannel == .dev ? 2 : 14 return (currentDateOrdinal - referenceDateOrdinal) > daysThatMustPassToSkipDtoi } diff --git a/BraveShared/Analytics/UserReferralProgram.swift b/BraveShared/Analytics/UserReferralProgram.swift index 7240bf550d5..94b99fded58 100644 --- a/BraveShared/Analytics/UserReferralProgram.swift +++ b/BraveShared/Analytics/UserReferralProgram.swift @@ -42,7 +42,7 @@ public class UserReferralProgram { } // This should _probably_ correspond to the baseUrl for NTPDownloader - let host = AppConstants.buildChannel == .developer ? HostUrl.staging : HostUrl.prod + let host = AppConstants.buildChannel == .debug ? HostUrl.staging : HostUrl.prod guard let apiKey = getPlistString(for: UserReferralProgram.apiKeyPlistKey)?.trimmingCharacters(in: .whitespacesAndNewlines) else { log.error("Urp init error, failed to get values from Brave.plist.") diff --git a/BraveSharedTests/DAUTests.swift b/BraveSharedTests/DAUTests.swift index ac5f75486c0..10478950732 100644 --- a/BraveSharedTests/DAUTests.swift +++ b/BraveSharedTests/DAUTests.swift @@ -27,11 +27,14 @@ class DAUTests: XCTestCase { let externalBetaExpected = URLQueryItem(name: "channel", value: "beta") XCTAssertEqual(dau.channelParam(for: .beta), externalBetaExpected) - let internalBetaExpected = URLQueryItem(name: "channel", value: "developer") - XCTAssertEqual(dau.channelParam(for: .enterprise), internalBetaExpected) + let devExpected = URLQueryItem(name: "channel", value: "developer") + XCTAssertEqual(dau.channelParam(for: .dev), devExpected) - let devExpected = URLQueryItem(name: "channel", value: "invalid") - XCTAssertEqual(dau.channelParam(for: .developer), devExpected) + let debugExpected = URLQueryItem(name: "channel", value: "invalid") + XCTAssertEqual(dau.channelParam(for: .debug), debugExpected) + + let enterpriseExpected = URLQueryItem(name: "channel", value: "invalid") + XCTAssertEqual(dau.channelParam(for: .enterprise), enterpriseExpected) } func testVersionParam() { @@ -300,7 +303,7 @@ class DAUTests: XCTestCase { } func testNoPingOnDevelopmentBuild() { - XCTAssertTrue(AppConstants.buildChannel == .developer) + XCTAssertTrue(AppConstants.buildChannel == .debug) let dau = DAU() XCTAssertFalse(dau.sendPingToServer()) diff --git a/Client.xcodeproj/project.pbxproj b/Client.xcodeproj/project.pbxproj index f55c5a7798a..1800921e34f 100644 --- a/Client.xcodeproj/project.pbxproj +++ b/Client.xcodeproj/project.pbxproj @@ -1649,11 +1649,13 @@ 2798E015213EFC3F003EDBB1 /* FavoriteTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FavoriteTests.swift; sourceTree = ""; }; 279C756A219DDE3B001CD1CB /* FingerprintingProtection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FingerprintingProtection.swift; sourceTree = ""; }; 279C75C021A5B37D001CD1CB /* FingerprintingProtection.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = FingerprintingProtection.js; sourceTree = ""; }; + 27A1AC1424884EB300344503 /* Enterprise.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Enterprise.xcconfig; sourceTree = ""; }; 27A586E0214C0DDD000CAE3C /* PreferencesTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesTest.swift; sourceTree = ""; }; 27A9068823D65A10005D7609 /* PendingContributionListController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PendingContributionListController.swift; sourceTree = ""; }; 27A9068A23D65E0E005D7609 /* PendingContributionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PendingContributionCell.swift; sourceTree = ""; }; 27AC168F23833A16004BE19C /* MonthlyAdsGrantReminder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MonthlyAdsGrantReminder.swift; sourceTree = ""; }; 27AC169623834510004BE19C /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; }; + 27AC7CF724C759BE00441317 /* Enterprise.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Enterprise.entitlements; sourceTree = ""; }; 27B0C7B323D24BAA00B9EA3D /* AutoContributeExclusionListController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoContributeExclusionListController.swift; sourceTree = ""; }; 27B0C7B623D2555C00B9EA3D /* ExclusionListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExclusionListCell.swift; sourceTree = ""; }; 27B0C7BA23D604C500B9EA3D /* AutoContributeSupportedListController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoContributeSupportedListController.swift; sourceTree = ""; }; @@ -2441,7 +2443,7 @@ E6231C001B90A44F005ABB0D /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; E6231C021B90A466005ABB0D /* libstdc++.6.0.9.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.6.0.9.tbd"; path = "usr/lib/libstdc++.6.0.9.tbd"; sourceTree = SDKROOT; }; E6231C041B90A472005ABB0D /* libxml2.2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libxml2.2.tbd; path = usr/lib/libxml2.2.tbd; sourceTree = SDKROOT; }; - E62AC15F1E956AFC00843532 /* FennecEnterpriseApplication.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = FennecEnterpriseApplication.entitlements; sourceTree = ""; }; + E62AC15F1E956AFC00843532 /* Dev.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Dev.entitlements; sourceTree = ""; }; E633E2D91C21EAF8001FFF6C /* LoginDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LoginDetailViewController.swift; path = ../Settings/LoginDetailViewController.swift; sourceTree = ""; }; E63ED7D71BFCD9990097D08E /* LoginTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginTableViewCell.swift; sourceTree = ""; }; E63ED8E01BFD25580097D08E /* LoginListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginListViewController.swift; sourceTree = ""; }; @@ -2521,9 +2523,9 @@ E698FFD91B4AADF40001F623 /* TabScrollController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabScrollController.swift; sourceTree = ""; }; E69922121B94E3EF007C480D /* Licenses.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = Licenses.html; sourceTree = ""; }; E6D8D5E61B569D70009E5A58 /* BrowserTrayAnimators.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BrowserTrayAnimators.swift; sourceTree = ""; }; - E6F738741EB7A8D300B50143 /* FennecApplication.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = FennecApplication.entitlements; sourceTree = ""; }; - E6F738751EB7A97100B50143 /* FirefoxBetaApplication.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = FirefoxBetaApplication.entitlements; sourceTree = ""; }; - E6F738761EB7A97500B50143 /* FirefoxApplication.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = FirefoxApplication.entitlements; sourceTree = ""; }; + E6F738741EB7A8D300B50143 /* Debug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Debug.entitlements; sourceTree = ""; }; + E6F738751EB7A97100B50143 /* Beta.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Beta.entitlements; sourceTree = ""; }; + E6F738761EB7A97500B50143 /* Release.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; E6F9650C1B2F1CF20034B023 /* SharedTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SharedTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; E6F9650F1B2F1CF20034B023 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; E6F9653B1B2F1D5D0034B023 /* NSURLExtensionsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSURLExtensionsTests.swift; sourceTree = ""; }; @@ -2794,6 +2796,7 @@ 0A24F846233EB5B5004D2F3A /* Dev.xcconfig */, 0A24F839233EB5B4004D2F3A /* Beta.xcconfig */, 0A24F837233EB5B4004D2F3A /* Release.xcconfig */, + 27A1AC1424884EB300344503 /* Enterprise.xcconfig */, 0A24F83A233EB5B4004D2F3A /* Local.xcconfig */, 0A24F83B233EB5B4004D2F3A /* Local */, 0A24F840233EB5B4004D2F3A /* Local.templates */, @@ -4787,10 +4790,11 @@ E689C6FF1E0C716F008BAADB /* Entitlements */ = { isa = PBXGroup; children = ( - E6F738761EB7A97500B50143 /* FirefoxApplication.entitlements */, - E6F738751EB7A97100B50143 /* FirefoxBetaApplication.entitlements */, - E6F738741EB7A8D300B50143 /* FennecApplication.entitlements */, - E62AC15F1E956AFC00843532 /* FennecEnterpriseApplication.entitlements */, + E6F738761EB7A97500B50143 /* Release.entitlements */, + E6F738751EB7A97100B50143 /* Beta.entitlements */, + E6F738741EB7A8D300B50143 /* Debug.entitlements */, + E62AC15F1E956AFC00843532 /* Dev.entitlements */, + 27AC7CF724C759BE00441317 /* Enterprise.entitlements */, ); path = Entitlements; sourceTree = ""; @@ -5569,13 +5573,16 @@ 271DEC18234CC75F009DAC37 = { CreatedOnToolsVersion = 11.1; LastSwiftMigration = 1110; + ProvisioningStyle = Automatic; }; 271DEC20234CC75F009DAC37 = { CreatedOnToolsVersion = 11.1; + ProvisioningStyle = Automatic; TestTargetID = F84B21BD1A090F8100AAB793; }; 278C468523F1E6270083347F = { CreatedOnToolsVersion = 11.3.1; + ProvisioningStyle = Automatic; }; 27F443942135E11200296C58 = { CreatedOnToolsVersion = 10.0; @@ -5585,18 +5592,22 @@ 288A2D851AB8B3260023ABC3 = { CreatedOnToolsVersion = 6.2; LastSwiftMigration = 1010; + ProvisioningStyle = Automatic; }; 2FCAE2191ABB51F800877008 = { CreatedOnToolsVersion = 6.2; LastSwiftMigration = 1010; + ProvisioningStyle = Automatic; }; 2FCAE2231ABB51F800877008 = { CreatedOnToolsVersion = 6.2; LastSwiftMigration = 1010; + ProvisioningStyle = Automatic; TestTargetID = F84B21BD1A090F8100AAB793; }; 5D1DC51220AC9AF900905E5A = { LastSwiftMigration = 1010; + ProvisioningStyle = Automatic; }; 5D1DC51A20AC9AFA00905E5A = { LastSwiftMigration = 1010; @@ -5604,6 +5615,7 @@ }; 5DE7688320B3456C00FF5533 = { LastSwiftMigration = 1010; + ProvisioningStyle = Automatic; }; 5DE7688B20B3456E00FF5533 = { LastSwiftMigration = 1010; @@ -5613,11 +5625,11 @@ E6F9650B1B2F1CF20034B023 = { CreatedOnToolsVersion = 6.3.2; LastSwiftMigration = 1010; + ProvisioningStyle = Automatic; }; F84B21BD1A090F8100AAB793 = { CreatedOnToolsVersion = 6.1; LastSwiftMigration = 1010; - ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.ApplicationGroups.iOS = { enabled = 1; @@ -5639,6 +5651,7 @@ F84B21D21A090F8100AAB793 = { CreatedOnToolsVersion = 6.1; LastSwiftMigration = 1010; + ProvisioningStyle = Automatic; TestTargetID = F84B21BD1A090F8100AAB793; }; }; @@ -7346,7 +7359,6 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; @@ -7433,7 +7445,6 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -7513,7 +7524,6 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -7594,7 +7604,6 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -7965,7 +7974,6 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; @@ -8046,7 +8054,6 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -8122,7 +8129,6 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -8198,7 +8204,6 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -8241,25 +8246,24 @@ }; name = Beta; }; - 27F443A02135E11200296C58 /* Debug */ = { + 27A1AC1624884F7A00344503 /* Enterprise */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 27A1AC1424884EB300344503 /* Enterprise.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; @@ -8271,114 +8275,122 @@ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_BITCODE = NO; + CURRENT_PROJECT_VERSION = ""; + DEBUG_ACTIVITY_MODE = ""; + "DEBUG_ACTIVITY_MODE[sdk=iphonesimulator*]" = disable; ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", + FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/iOS", + "$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)", ); + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = s; + GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = BraveShareTo/BraveShareToInfo.plist; - LD_RUNPATH_SEARCH_PATHS = ( + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/ThirdParty/sqlcipher", "$(inherited)", - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", + "$(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/include", + "$(SRCROOT)", + "$(SDKROOT)/usr/include/libxml2", + "$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)/include/**", + "$(SRCROOT)/Client/WebFilters/ShieldStats/Httpse/ThirdParty/leveldb/**", + "$(SRCROOT)/Client/WebFilters/ShieldStats/Httpse/ThirdParty/re2", + "$(SRCROOT)/ThirdParty/YubiKit/include", ); - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)", + "$(SRCROOT)/ThirdParty/YubiKit", + "$(PROJECT_DIR)/Client/WebFilters/ShieldStats/Adblock/Resources", + ); + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + OTHER_LDFLAGS = ( + "-ObjC", + "-lxml2", + ); + PRODUCT_BUNDLE_IDENTIFIER = "$(MOZ_BUNDLE_ID)"; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_INCLUDE_PATHS = "$(PROJECT_DIR)/Storage/modules"; + SWIFT_OPTIMIZATION_LEVEL = "-O"; TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; }; - name = Debug; + name = Enterprise; }; - 27F443A12135E11200296C58 /* Dev */ = { + 27A1AC1724884F7A00344503 /* Enterprise */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; - COPY_PHASE_STRIP = NO; + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon_Enterprise; + CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/Client/Entitlements/Enterprise.entitlements"; ENABLE_BITCODE = NO; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = BraveShareTo/BraveShareToInfo.plist; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)", + "$(PROJECT_DIR)/Carthage/Build/iOS", + "$(PROJECT_DIR)/BraveRewards", + ); + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(SRCROOT)", + "$(SDKROOT)/usr/include/libxml2", + "$(BUILD_DIR)/Debug$(EFFECTIVE_PLATFORM_NAME)/include/**", + "$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)/include/**", + "$(SRCROOT)/node_modules/bloom-filter-cpp", + "$(SRCROOT)/node_modules/hashset-cpp", + ); + INFOPLIST_FILE = Client/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", - "@executable_path/../../Frameworks", ); - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + OTHER_LDFLAGS = ( + "-ObjC", + "-lxml2", + "-framework", + AssetsLibrary, + "-framework", + CoreText, + "-framework", + CoreTelephony, + "-framework", + SystemConfiguration, + "-framework", + QuartzCore, + "-framework", + CoreVideo, + "-framework", + AVFoundation, + "-framework", + CoreMedia, + ); + PRODUCT_MODULE_NAME = Client; + PRODUCT_NAME = Client; + PROVISIONING_PROFILE_SPECIFIER = BraveEnt; + SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/Client/Application/Client-Bridging-Header.h"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; }; - name = Dev; + name = Enterprise; }; - 27F443A22135E11200296C58 /* Release */ = { + 27A1AC1824884F7A00344503 /* Enterprise */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; @@ -8411,8 +8423,6 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; @@ -8435,6 +8445,7 @@ MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = "Ent-ShareTo"; SKIP_INSTALL = YES; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; @@ -8442,9 +8453,9 @@ TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; - name = Release; + name = Enterprise; }; - 27F443A32135E11200296C58 /* Beta */ = { + 27A1AC1924884F7A00344503 /* Enterprise */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; @@ -8477,10 +8488,14 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - ENABLE_BITCODE = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -8491,26 +8506,30 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = BraveShareTo/BraveShareToInfo.plist; + INFOPLIST_FILE = BraveShared/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", - "@executable_path/../../Frameworks", + "@loader_path/Frameworks", ); MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_BUNDLE_IDENTIFIER = "$(FRAMEWORK_BASE_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; SKIP_INSTALL = YES; + SUPPORTS_MACCATALYST = NO; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; }; - name = Beta; + name = Enterprise; }; - 288A2DA01AB8B3260023ABC3 /* Debug */ = { + 27A1AC1A24884F7A00344503 /* Enterprise */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; @@ -8534,9 +8553,9 @@ SWIFT_OBJC_BRIDGING_HEADER = "$SRCROOT/Shared/Shared-Bridging-Header.h"; SWIFT_VERSION = 5.0; }; - name = Debug; + name = Enterprise; }; - 2FCAE2341ABB51F900877008 /* Debug */ = { + 27A1AC1B24884F7A00344503 /* Enterprise */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; @@ -8556,33 +8575,15 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - OTHER_CFLAGS = "-DSQLITE_HAS_CODEC"; PRODUCT_BUNDLE_IDENTIFIER = "$(FRAMEWORK_BASE_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OBJC_BRIDGING_HEADER = "$SRCROOT/Storage/Storage-Bridging-Header.h"; SWIFT_VERSION = 5.0; }; - name = Debug; - }; - 2FCAE2381ABB51F900877008 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - INFOPLIST_FILE = StorageTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = "$(FRAMEWORK_BASE_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "$SRCROOT/Storage/Storage-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Client.app/Client"; - }; - name = Debug; + name = Enterprise; }; - 5D1DC52A20AC9AFB00905E5A /* Debug */ = { + 27A1AC1C24884F7A00344503 /* Enterprise */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; @@ -8618,20 +8619,843 @@ CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = Data/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = "$(FRAMEWORK_BASE_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Enterprise; + }; + 27A1AC1D24884F7A00344503 /* Enterprise */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = BraveUI/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = com.brave.BraveUI; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SUPPORTS_MACCATALYST = NO; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Enterprise; + }; + 27A1AC1E24884F7A00344503 /* Enterprise */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_BITCODE = NO; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/BraveRewards", + "$(PROJECT_DIR)", + ); + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = BraveRewardsUI/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = com.brave.BraveRewardsUI; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Enterprise; + }; + 27A1AC1F24884F7A00344503 /* Enterprise */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/iOS", + "$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)", + ); + INFOPLIST_FILE = ClientTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = ClientTests; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Client.app/Client"; + }; + name = Enterprise; + }; + 27A1AC2024884F7A00344503 /* Enterprise */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + INFOPLIST_FILE = StorageTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = "$(FRAMEWORK_BASE_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "$SRCROOT/Storage/Storage-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Client.app/Client"; + }; + name = Enterprise; + }; + 27A1AC2124884F7A00344503 /* Enterprise */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_NO_COMMON_BLOCKS = YES; + INFOPLIST_FILE = SharedTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = "$(FRAMEWORK_BASE_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "$SRCROOT/Shared/Shared-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + }; + name = Enterprise; + }; + 27A1AC2224884F7A00344503 /* Enterprise */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = DataTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = "$(FRAMEWORK_BASE_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Enterprise; + }; + 27A1AC2324884F7A00344503 /* Enterprise */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = BraveSharedTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = "$(FRAMEWORK_BASE_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Client.app/Client"; + VALIDATE_PRODUCT = YES; + }; + name = Enterprise; + }; + 27A1AC2424884F7A00344503 /* Enterprise */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/BraveRewards", + ); + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = BraveRewardsUITests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 13.1; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = com.kylehickinson.BraveRewardsUITests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Client.app/Client"; + VALIDATE_PRODUCT = YES; + }; + name = Enterprise; + }; + 27F443A02135E11200296C58 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_BITCODE = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = BraveShareTo/BraveShareToInfo.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 27F443A12135E11200296C58 /* Dev */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + ENABLE_BITCODE = NO; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = BraveShareTo/BraveShareToInfo.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Dev; + }; + 27F443A22135E11200296C58 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + ENABLE_BITCODE = NO; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = BraveShareTo/BraveShareToInfo.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 27F443A32135E11200296C58 /* Beta */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + ENABLE_BITCODE = NO; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + INFOPLIST_FILE = BraveShareTo/BraveShareToInfo.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Beta; + }; + 288A2DA01AB8B3260023ABC3 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + APPLICATION_EXTENSION_API_ONLY = YES; + DEFINES_MODULE = YES; + DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "Shared/Supporting Files/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = "$(FRAMEWORK_BASE_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + SUPPORTS_MACCATALYST = NO; + SWIFT_OBJC_BRIDGING_HEADER = "$SRCROOT/Shared/Shared-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + 2FCAE2341ABB51F900877008 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + APPLICATION_EXTENSION_API_ONLY = YES; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "SQLITE_HAS_CODEC=1", + "DEBUG=1", + ); + INFOPLIST_FILE = Storage/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + OTHER_CFLAGS = "-DSQLITE_HAS_CODEC"; + PRODUCT_BUNDLE_IDENTIFIER = "$(FRAMEWORK_BASE_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + SWIFT_OBJC_BRIDGING_HEADER = "$SRCROOT/Storage/Storage-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + 2FCAE2381ABB51F900877008 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + INFOPLIST_FILE = StorageTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = "$(FRAMEWORK_BASE_BUNDLE_ID).$(PRODUCT_NAME:rfc1034identifier)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "$SRCROOT/Storage/Storage-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Client.app/Client"; + }; + name = Debug; + }; + 5D1DC52A20AC9AFB00905E5A /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = ""; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; @@ -9749,7 +10573,6 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; CURRENT_PROJECT_VERSION = ""; DEBUG_ACTIVITY_MODE = ""; "DEBUG_ACTIVITY_MODE[sdk=iphonesimulator*]" = disable; @@ -9807,7 +10630,8 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/Client/Entitlements/FirefoxApplication.entitlements"; + CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/Client/Entitlements/Release.entitlements"; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; @@ -9839,6 +10663,7 @@ ); PRODUCT_MODULE_NAME = Client; PRODUCT_NAME = Client; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/Client/Application/Client-Bridging-Header.h"; SWIFT_VERSION = 5.0; }; @@ -9848,6 +10673,7 @@ isa = XCBuildConfiguration; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", @@ -9926,6 +10752,7 @@ E448FCA51AEE7A6000869B6C /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_STYLE = Automatic; ENABLE_STRICT_OBJC_MSGSEND = YES; INFOPLIST_FILE = StorageTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -9973,7 +10800,6 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; CURRENT_PROJECT_VERSION = ""; DEBUG_ACTIVITY_MODE = ""; "DEBUG_ACTIVITY_MODE[sdk=iphonesimulator*]" = disable; @@ -10035,7 +10861,8 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon_Dev; - CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/Client/Entitlements/FennecEnterpriseApplication.entitlements"; + CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/Client/Entitlements/Dev.entitlements"; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -10082,6 +10909,7 @@ ); PRODUCT_MODULE_NAME = Client; PRODUCT_NAME = Client; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/Client/Application/Client-Bridging-Header.h"; SWIFT_VERSION = 5.0; }; @@ -10145,6 +10973,7 @@ isa = XCBuildConfiguration; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", @@ -10166,6 +10995,7 @@ E6DCC2131DCBB6F100CEC4B7 /* Dev */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = StorageTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -10183,6 +11013,7 @@ E6DCC2171DCBB6F100CEC4B7 /* Dev */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_STYLE = Automatic; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = SharedTests/Info.plist; @@ -10201,6 +11032,7 @@ E6F965151B2F1CF20034B023 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_STYLE = Automatic; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = SharedTests/Info.plist; @@ -10219,6 +11051,7 @@ E6F965171B2F1CF20034B023 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_STYLE = Automatic; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = SharedTests/Info.plist; @@ -10266,7 +11099,6 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; CURRENT_PROJECT_VERSION = ""; DEBUG_ACTIVITY_MODE = ""; "DEBUG_ACTIVITY_MODE[sdk=iphonesimulator*]" = disable; @@ -10324,7 +11156,8 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon_Beta; - CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/Client/Entitlements/FirefoxBetaApplication.entitlements"; + CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/Client/Entitlements/Beta.entitlements"; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; @@ -10356,6 +11189,7 @@ ); PRODUCT_MODULE_NAME = Client; PRODUCT_NAME = Client; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/Client/Application/Client-Bridging-Header.h"; SWIFT_VERSION = 5.0; }; @@ -10365,6 +11199,7 @@ isa = XCBuildConfiguration; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", @@ -10442,6 +11277,7 @@ E6FCC4331C40562400DF6113 /* Beta */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_STYLE = Automatic; ENABLE_STRICT_OBJC_MSGSEND = YES; INFOPLIST_FILE = StorageTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -10461,6 +11297,7 @@ E6FCC43A1C40562400DF6113 /* Beta */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_STYLE = Automatic; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = SharedTests/Info.plist; @@ -10508,7 +11345,6 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; CURRENT_PROJECT_VERSION = ""; DEBUG_ACTIVITY_MODE = ""; "DEBUG_ACTIVITY_MODE[sdk=iphonesimulator*]" = disable; @@ -10569,7 +11405,8 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon_Nightly; - CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/Client/Entitlements/FennecApplication.entitlements"; + CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/Client/Entitlements/Debug.entitlements"; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -10616,6 +11453,7 @@ ); PRODUCT_MODULE_NAME = Client; PRODUCT_NAME = Client; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/Client/Application/Client-Bridging-Header.h"; SWIFT_VERSION = 5.0; }; @@ -10625,6 +11463,7 @@ isa = XCBuildConfiguration; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", @@ -10651,6 +11490,7 @@ buildConfigurations = ( 271DEC30234CC760009DAC37 /* Debug */, 271DEC31234CC760009DAC37 /* Dev */, + 27A1AC1E24884F7A00344503 /* Enterprise */, 271DEC32234CC760009DAC37 /* Release */, 271DEC33234CC760009DAC37 /* Beta */, ); @@ -10662,6 +11502,7 @@ buildConfigurations = ( 271DEC34234CC760009DAC37 /* Debug */, 271DEC35234CC760009DAC37 /* Dev */, + 27A1AC2424884F7A00344503 /* Enterprise */, 271DEC36234CC760009DAC37 /* Release */, 271DEC37234CC760009DAC37 /* Beta */, ); @@ -10673,6 +11514,7 @@ buildConfigurations = ( 278C469023F1E6270083347F /* Debug */, 278C469123F1E6270083347F /* Dev */, + 27A1AC1D24884F7A00344503 /* Enterprise */, 278C469223F1E6270083347F /* Release */, 278C469323F1E6270083347F /* Beta */, ); @@ -10684,6 +11526,7 @@ buildConfigurations = ( 27F443A02135E11200296C58 /* Debug */, 27F443A12135E11200296C58 /* Dev */, + 27A1AC1824884F7A00344503 /* Enterprise */, 27F443A22135E11200296C58 /* Release */, 27F443A32135E11200296C58 /* Beta */, ); @@ -10695,6 +11538,7 @@ buildConfigurations = ( 288A2DA01AB8B3260023ABC3 /* Debug */, E6DCC20B1DCBB6F100CEC4B7 /* Dev */, + 27A1AC1A24884F7A00344503 /* Enterprise */, E448FCA31AEE7A6000869B6C /* Release */, E6FCC4311C40562400DF6113 /* Beta */, ); @@ -10706,6 +11550,7 @@ buildConfigurations = ( 2FCAE2341ABB51F900877008 /* Debug */, E6DCC20C1DCBB6F100CEC4B7 /* Dev */, + 27A1AC1B24884F7A00344503 /* Enterprise */, E448FCA41AEE7A6000869B6C /* Release */, E6FCC4321C40562400DF6113 /* Beta */, ); @@ -10717,6 +11562,7 @@ buildConfigurations = ( 2FCAE2381ABB51F900877008 /* Debug */, E6DCC2131DCBB6F100CEC4B7 /* Dev */, + 27A1AC2024884F7A00344503 /* Enterprise */, E448FCA51AEE7A6000869B6C /* Release */, E6FCC4331C40562400DF6113 /* Beta */, ); @@ -10728,6 +11574,7 @@ buildConfigurations = ( 5D1DC52A20AC9AFB00905E5A /* Debug */, 5D1DC52B20AC9AFB00905E5A /* Dev */, + 27A1AC1C24884F7A00344503 /* Enterprise */, 5D1DC52C20AC9AFB00905E5A /* Release */, 5D1DC52D20AC9AFB00905E5A /* Beta */, ); @@ -10739,6 +11586,7 @@ buildConfigurations = ( 5D1DC52E20AC9AFB00905E5A /* Debug */, 5D1DC52F20AC9AFB00905E5A /* Dev */, + 27A1AC2224884F7A00344503 /* Enterprise */, 5D1DC53020AC9AFB00905E5A /* Release */, 5D1DC53120AC9AFB00905E5A /* Beta */, ); @@ -10750,6 +11598,7 @@ buildConfigurations = ( 5DE7689C20B3456E00FF5533 /* Debug */, 5DE7689D20B3456E00FF5533 /* Dev */, + 27A1AC1924884F7A00344503 /* Enterprise */, 5DE7689E20B3456E00FF5533 /* Release */, 5DE7689F20B3456E00FF5533 /* Beta */, ); @@ -10761,6 +11610,7 @@ buildConfigurations = ( 5DE768A120B3456E00FF5533 /* Debug */, 5DE768A220B3456E00FF5533 /* Dev */, + 27A1AC2324884F7A00344503 /* Enterprise */, 5DE768A320B3456E00FF5533 /* Release */, 5DE768A420B3456E00FF5533 /* Beta */, ); @@ -10772,6 +11622,7 @@ buildConfigurations = ( E6F965151B2F1CF20034B023 /* Debug */, E6DCC2171DCBB6F100CEC4B7 /* Dev */, + 27A1AC2124884F7A00344503 /* Enterprise */, E6F965171B2F1CF20034B023 /* Release */, E6FCC43A1C40562400DF6113 /* Beta */, ); @@ -10783,6 +11634,7 @@ buildConfigurations = ( F84B21DB1A090F8100AAB793 /* Debug */, E6DCC2051DCBB6F100CEC4B7 /* Dev */, + 27A1AC1624884F7A00344503 /* Enterprise */, E448FC9D1AEE7A6000869B6C /* Release */, E6FCC4291C40562400DF6113 /* Beta */, ); @@ -10794,6 +11646,7 @@ buildConfigurations = ( F84B21DE1A090F8100AAB793 /* Debug */, E6DCC2061DCBB6F100CEC4B7 /* Dev */, + 27A1AC1724884F7A00344503 /* Enterprise */, E448FC9E1AEE7A6000869B6C /* Release */, E6FCC42A1C40562400DF6113 /* Beta */, ); @@ -10805,6 +11658,7 @@ buildConfigurations = ( F84B21E11A090F8100AAB793 /* Debug */, E6DCC2101DCBB6F100CEC4B7 /* Dev */, + 27A1AC1F24884F7A00344503 /* Enterprise */, E448FC9F1AEE7A6000869B6C /* Release */, E6FCC42B1C40562400DF6113 /* Beta */, ); diff --git a/Client.xcodeproj/xcshareddata/xcschemes/BraveShareTo.xcscheme b/Client.xcodeproj/xcshareddata/xcschemes/BraveShareTo.xcscheme new file mode 100644 index 00000000000..6afef4fac7c --- /dev/null +++ b/Client.xcodeproj/xcshareddata/xcschemes/BraveShareTo.xcscheme @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Client.xcodeproj/xcshareddata/xcschemes/Enterprise.xcscheme b/Client.xcodeproj/xcshareddata/xcschemes/Enterprise.xcscheme new file mode 100644 index 00000000000..17e2dd24b9e --- /dev/null +++ b/Client.xcodeproj/xcshareddata/xcschemes/Enterprise.xcscheme @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Client/Application/Delegates/AppDelegate.swift b/Client/Application/Delegates/AppDelegate.swift index aa3568a90f6..e398b3c94b8 100644 --- a/Client/Application/Delegates/AppDelegate.swift +++ b/Client/Application/Delegates/AppDelegate.swift @@ -137,7 +137,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UIViewControllerRestorati // Don't track crashes if we're building the development environment due to the fact that terminating/stopping // the simulator via Xcode will count as a "crash" and lead to restore popups in the subsequent launch - let crashedLastSession = !Preferences.AppState.backgroundedCleanly.value && AppConstants.buildChannel != .developer + let crashedLastSession = !Preferences.AppState.backgroundedCleanly.value && AppConstants.buildChannel != .debug Preferences.AppState.backgroundedCleanly.value = false browserViewController = BrowserViewController(profile: self.profile!, tabManager: self.tabManager, crashedLastSession: crashedLastSession) browserViewController.edgesForExtendedLayout = [] diff --git a/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/Contents.json b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/Contents.json new file mode 100644 index 00000000000..f83e07aefa1 --- /dev/null +++ b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/Contents.json @@ -0,0 +1,118 @@ +{ + "images" : [ + { + "filename" : "icon_20pt@2x-1.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "icon_20pt@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "icon_29pt-1.png", + "idiom" : "iphone", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "icon_29pt@2x-1.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "icon_29pt@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "icon_40pt@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "icon_40pt@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "icon_60pt@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "icon_60pt@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "icon_20pt-1.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "icon_40pt-1.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "icon_76pt-1.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "icon_76pt@2x-1.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "icon_83.5@2x-1.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "Icon-1.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/Icon-1.png b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/Icon-1.png new file mode 100644 index 00000000000..a4ef43c2149 Binary files /dev/null and b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/Icon-1.png differ diff --git a/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_20pt-1.png b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_20pt-1.png new file mode 100644 index 00000000000..34503c861a3 Binary files /dev/null and b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_20pt-1.png differ diff --git a/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_20pt@2x-1.png b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_20pt@2x-1.png new file mode 100644 index 00000000000..b91ed420728 Binary files /dev/null and b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_20pt@2x-1.png differ diff --git a/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_20pt@3x.png b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_20pt@3x.png new file mode 100644 index 00000000000..0d28023f5f6 Binary files /dev/null and b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_20pt@3x.png differ diff --git a/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_29pt-1.png b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_29pt-1.png new file mode 100644 index 00000000000..825f6f3dc0d Binary files /dev/null and b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_29pt-1.png differ diff --git a/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_29pt@2x-1.png b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_29pt@2x-1.png new file mode 100644 index 00000000000..3aee2d77ef6 Binary files /dev/null and b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_29pt@2x-1.png differ diff --git a/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_29pt@3x.png b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_29pt@3x.png new file mode 100644 index 00000000000..6f4dcb6ca67 Binary files /dev/null and b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_29pt@3x.png differ diff --git a/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_40pt-1.png b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_40pt-1.png new file mode 100644 index 00000000000..b91ed420728 Binary files /dev/null and b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_40pt-1.png differ diff --git a/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_40pt@2x.png b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_40pt@2x.png new file mode 100644 index 00000000000..936446705c1 Binary files /dev/null and b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_40pt@2x.png differ diff --git a/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_40pt@3x.png b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_40pt@3x.png new file mode 100644 index 00000000000..70b31e7a9e3 Binary files /dev/null and b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_40pt@3x.png differ diff --git a/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_60pt@2x.png b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_60pt@2x.png new file mode 100644 index 00000000000..70b31e7a9e3 Binary files /dev/null and b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_60pt@2x.png differ diff --git a/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_60pt@3x.png b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_60pt@3x.png new file mode 100644 index 00000000000..405c3ccb276 Binary files /dev/null and b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_60pt@3x.png differ diff --git a/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_76pt-1.png b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_76pt-1.png new file mode 100644 index 00000000000..aeadd497219 Binary files /dev/null and b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_76pt-1.png differ diff --git a/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_76pt@2x-1.png b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_76pt@2x-1.png new file mode 100644 index 00000000000..676b84d7b10 Binary files /dev/null and b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_76pt@2x-1.png differ diff --git a/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_83.5@2x-1.png b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_83.5@2x-1.png new file mode 100644 index 00000000000..5edb4609693 Binary files /dev/null and b/Client/Assets/Images.xcassets/AppIcon_Enterprise.appiconset/icon_83.5@2x-1.png differ diff --git a/Client/Configuration/Debug.xcconfig b/Client/Configuration/Debug.xcconfig index dc83935c3fd..46502f0dbfa 100644 --- a/Client/Configuration/Debug.xcconfig +++ b/Client/Configuration/Debug.xcconfig @@ -17,7 +17,7 @@ INCLUDE_SETTINGS_BUNDLE = YES // Defines Swift Flags, (used as #if/#endif) inside *Swift* code // BASE 'inheritence' at end, due to dynamic nature of those flags -OTHER_SWIFT_FLAGS=-DMOZ_CHANNEL_FENNEC $(OTHER_SWIFT_FLAGS_BASE) +OTHER_SWIFT_FLAGS=-DMOZ_CHANNEL_DEBUG $(OTHER_SWIFT_FLAGS_BASE) ENABLE_TESTABILITY = YES diff --git a/Client/Configuration/Dev.xcconfig b/Client/Configuration/Dev.xcconfig index b608d6cb7ac..714f8ac27b0 100644 --- a/Client/Configuration/Dev.xcconfig +++ b/Client/Configuration/Dev.xcconfig @@ -19,7 +19,7 @@ INCLUDE_SETTINGS_BUNDLE = YES // Defines Swift Flags, (used as #if/#endif) inside *Swift* code // BASE 'inheritence' at end, due to dynamic nature of those flags -OTHER_SWIFT_FLAGS=-DMOZ_CHANNEL_ENTERPRISE $(OTHER_SWIFT_FLAGS_BASE) +OTHER_SWIFT_FLAGS=-DMOZ_CHANNEL_DEV $(OTHER_SWIFT_FLAGS_BASE) GCC_PREPROCESSOR_DEFINITIONS= DEBUG=1 diff --git a/Client/Configuration/Enterprise.xcconfig b/Client/Configuration/Enterprise.xcconfig new file mode 100644 index 00000000000..81f039889bb --- /dev/null +++ b/Client/Configuration/Enterprise.xcconfig @@ -0,0 +1,29 @@ +// 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/. + +// This is for INTERNAL "beta" testing, and will be changed in the future +// to have a new bundle id + +#include "Base.xcconfig" + +MOZ_BUNDLE_DISPLAY_NAME = BraveEnt + +BRAVE_API_KEY = key + +DEVELOPMENT_TEAM = L6556KQ6XT +CODE_SIGN_IDENTITY = iPhone Distribution: BRAVE SOFTWARE, INC. +CODE_SIGN_STYLE = Manual + +// Bundle Identifier +MOZ_BUNDLE_ID = $(BASE_BUNDLE_ID).enterprise.Browser + +// Flag to indicate if we want to include the debug settings bundle or not +INCLUDE_SETTINGS_BUNDLE = YES + +// Defines Swift Flags, (used as #if/#endif) inside *Swift* code +// BASE 'inheritence' at end, due to dynamic nature of those flags +OTHER_SWIFT_FLAGS=-DMOZ_CHANNEL_ENTERPRISE $(OTHER_SWIFT_FLAGS_BASE) + +GCC_PREPROCESSOR_DEFINITIONS= DEBUG=1 + diff --git a/Client/Entitlements/FirefoxApplication.entitlements b/Client/Entitlements/Beta.entitlements similarity index 100% rename from Client/Entitlements/FirefoxApplication.entitlements rename to Client/Entitlements/Beta.entitlements diff --git a/Client/Entitlements/FennecApplication.entitlements b/Client/Entitlements/Debug.entitlements similarity index 100% rename from Client/Entitlements/FennecApplication.entitlements rename to Client/Entitlements/Debug.entitlements diff --git a/Client/Entitlements/FennecEnterpriseApplication.entitlements b/Client/Entitlements/Dev.entitlements similarity index 100% rename from Client/Entitlements/FennecEnterpriseApplication.entitlements rename to Client/Entitlements/Dev.entitlements diff --git a/Client/Entitlements/Enterprise.entitlements b/Client/Entitlements/Enterprise.entitlements new file mode 100644 index 00000000000..6e1e4034f7a --- /dev/null +++ b/Client/Entitlements/Enterprise.entitlements @@ -0,0 +1,17 @@ + + + + + aps-environment + production + com.apple.security.application-groups + + group.$(MOZ_BUNDLE_ID).unique + + com.apple.developer.nfc.readersession.formats + + NDEF + TAG + + + diff --git a/Client/Entitlements/FirefoxBetaApplication.entitlements b/Client/Entitlements/Release.entitlements similarity index 100% rename from Client/Entitlements/FirefoxBetaApplication.entitlements rename to Client/Entitlements/Release.entitlements diff --git a/Client/Frontend/Browser/BrowserViewController.swift b/Client/Frontend/Browser/BrowserViewController.swift index cc723a8406d..4fa89814006 100644 --- a/Client/Frontend/Browser/BrowserViewController.swift +++ b/Client/Frontend/Browser/BrowserViewController.swift @@ -168,7 +168,7 @@ class BrowserViewController: UIViewController { configuration = .staging } } else { - configuration = AppConstants.buildChannel == .developer ? .staging : .production + configuration = AppConstants.buildChannel == .debug ? .staging : .production } } rewards = BraveRewards(configuration: configuration) diff --git a/Client/Frontend/Browser/New Tab Page/Backgrounds/NTPDownloader.swift b/Client/Frontend/Browser/New Tab Page/Backgrounds/NTPDownloader.swift index e7fa35d2007..193658b9b3d 100644 --- a/Client/Frontend/Browser/New Tab Page/Backgrounds/NTPDownloader.swift +++ b/Client/Frontend/Browser/New Tab Page/Backgrounds/NTPDownloader.swift @@ -24,7 +24,7 @@ class NTPDownloader { var resourceBaseURL: URL? { // This should _probably_ correspond host for URP - let baseUrl = AppConstants.buildChannel == .developer + let baseUrl = AppConstants.buildChannel == .debug ? "https://mobile-data-dev.s3.brave.software" : "https://mobile-data.s3.brave.com/" diff --git a/Data/sync/Sync.swift b/Data/sync/Sync.swift index ba1dc907423..71e0496965c 100644 --- a/Data/sync/Sync.swift +++ b/Data/sync/Sync.swift @@ -111,7 +111,7 @@ public class Sync: JSInjector { /// Please note that sync initialization also happens on app launch, not only on first connection to Sync. public var syncSetupFailureCallback: (() -> Void)? - fileprivate lazy var isDebug: Bool = { return AppConstants.buildChannel == .developer }() + fileprivate lazy var isDebug: Bool = { return AppConstants.buildChannel == .debug }() fileprivate lazy var serverUrl: String = { return isDebug ? "https://sync-staging.brave.com" : "https://sync.brave.com" diff --git a/Gemfile b/Gemfile new file mode 100644 index 00000000000..b734015f820 --- /dev/null +++ b/Gemfile @@ -0,0 +1,10 @@ +# Autogenerated by fastlane +# +# Ensure this file is checked in to source control! + +source "https://rubygems.org" + +gem 'fastlane' + +plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') +eval_gemfile(plugins_path) if File.exist?(plugins_path) diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000000..3ddd06c9e0a --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,181 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + atomos (0.1.3) + aws-eventstream (1.1.0) + aws-partitions (1.324.0) + aws-sdk-core (3.97.1) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.239.0) + aws-sigv4 (~> 1.1) + jmespath (~> 1.0) + aws-sdk-kms (1.33.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.67.1) + aws-sdk-core (~> 3, >= 3.96.1) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.1.4) + aws-eventstream (~> 1.0, >= 1.0.2) + babosa (1.0.3) + claide (1.0.3) + colored (1.2) + colored2 (3.1.2) + commander-fastlane (4.4.6) + highline (~> 1.7.2) + declarative (0.0.10) + declarative-option (0.1.0) + digest-crc (0.5.1) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + dotenv (2.7.5) + emoji_regex (1.0.1) + excon (0.73.0) + faraday (1.0.1) + multipart-post (>= 1.2, < 3) + faraday-cookie_jar (0.0.6) + faraday (>= 0.7.4) + http-cookie (~> 1.0.0) + faraday_middleware (1.0.0) + faraday (~> 1.0) + fastimage (2.1.7) + fastlane (2.149.0) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.3, < 3.0.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.2, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored + commander-fastlane (>= 4.4.6, < 5.0.0) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 2.0) + excon (>= 0.71.0, < 1.0.0) + faraday (>= 0.17, < 2.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (>= 0.13.1, < 2.0) + fastimage (>= 2.1.0, < 3.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-api-client (>= 0.37.0, < 0.39.0) + google-cloud-storage (>= 1.15.0, < 2.0.0) + highline (>= 1.7.2, < 2.0.0) + json (< 3.0.0) + jwt (~> 2.1.0) + mini_magick (>= 4.9.4, < 5.0.0) + multi_xml (~> 0.5) + multipart-post (~> 2.0.0) + plist (>= 3.1.0, < 4.0.0) + public_suffix (~> 2.0.0) + rubyzip (>= 1.3.0, < 2.0.0) + security (= 0.1.3) + simctl (~> 1.6.3) + slack-notifier (>= 2.0.0, < 3.0.0) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (>= 1.4.5, < 2.0.0) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.3.0) + xcpretty-travis-formatter (>= 0.0.3) + fastlane-plugin-appcenter (1.9.0) + gh_inspector (1.1.3) + google-api-client (0.38.0) + addressable (~> 2.5, >= 2.5.1) + googleauth (~> 0.9) + httpclient (>= 2.8.1, < 3.0) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.0) + signet (~> 0.12) + google-cloud-core (1.5.0) + google-cloud-env (~> 1.0) + google-cloud-errors (~> 1.0) + google-cloud-env (1.3.2) + faraday (>= 0.17.3, < 2.0) + google-cloud-errors (1.0.1) + google-cloud-storage (1.26.2) + addressable (~> 2.5) + digest-crc (~> 0.4) + google-api-client (~> 0.33) + google-cloud-core (~> 1.2) + googleauth (~> 0.9) + mini_mime (~> 1.0) + googleauth (0.12.0) + faraday (>= 0.17.3, < 2.0) + jwt (>= 1.4, < 3.0) + memoist (~> 0.16) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (~> 0.14) + highline (1.7.10) + http-cookie (1.0.3) + domain_name (~> 0.5) + httpclient (2.8.3) + jmespath (1.4.0) + json (2.3.0) + jwt (2.1.0) + memoist (0.16.2) + mini_magick (4.10.1) + mini_mime (1.0.2) + multi_json (1.14.1) + multi_xml (0.6.0) + multipart-post (2.0.0) + nanaimo (0.2.6) + naturally (2.2.0) + os (1.1.0) + plist (3.5.0) + public_suffix (2.0.5) + representable (3.0.4) + declarative (< 0.1.0) + declarative-option (< 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rouge (2.0.7) + rubyzip (1.3.0) + security (0.1.3) + signet (0.14.0) + addressable (~> 2.3) + faraday (>= 0.17.3, < 2.0) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simctl (1.6.8) + CFPropertyList + naturally + slack-notifier (2.3.2) + terminal-notifier (2.0.0) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + tty-cursor (0.7.1) + tty-screen (0.8.0) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.7) + unicode-display_width (1.7.0) + word_wrap (1.0.0) + xcodeproj (1.16.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.2.6) + xcpretty (0.3.0) + rouge (~> 2.0.7) + xcpretty-travis-formatter (1.0.0) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + ruby + +DEPENDENCIES + fastlane + fastlane-plugin-appcenter + +BUNDLED WITH + 2.1.2 diff --git a/Shared/AppConstants.swift b/Shared/AppConstants.swift index 00b2d136b67..600089e2a1f 100644 --- a/Shared/AppConstants.swift +++ b/Shared/AppConstants.swift @@ -5,10 +5,11 @@ import UIKit public enum AppBuildChannel: String { - case release = "release" - case beta = "beta" - case enterprise = "enterprise" - case developer = "developer" + case release + case beta + case dev + case enterprise + case debug /// Whether this release channel is used/seen by external users (app store or testers) public var isPublic: Bool { @@ -18,7 +19,7 @@ public enum AppBuildChannel: String { switch self { case .release, .beta: return true - case .enterprise, .developer: + case .dev, .debug, .enterprise: return false } } @@ -29,10 +30,10 @@ public enum AppBuildChannel: String { return "release" case .beta: return "beta" - case .enterprise: + case .dev: // This is designed to follow desktop platform return "developer" - case .developer: + case .debug, .enterprise: return "invalid" } } @@ -59,10 +60,12 @@ public struct AppConstants { return AppBuildChannel.release #elseif MOZ_CHANNEL_BETA return AppBuildChannel.beta + #elseif MOZ_CHANNEL_DEV + return AppBuildChannel.dev #elseif MOZ_CHANNEL_ENTERPRISE return AppBuildChannel.enterprise - #elseif MOZ_CHANNEL_FENNEC - return AppBuildChannel.developer + #elseif MOZ_CHANNEL_DEBUG + return AppBuildChannel.debug #endif }() @@ -89,7 +92,7 @@ public struct AppConstants { return false #elseif MOZ_CHANNEL_BETA return true - #elseif MOZ_CHANNEL_FENNEC + #elseif MOZ_CHANNEL_DEBUG return true #else return true diff --git a/Storage/SQL/BrowserDB.swift b/Storage/SQL/BrowserDB.swift index 52c6581d817..f4f4eb297a0 100644 --- a/Storage/SQL/BrowserDB.swift +++ b/Storage/SQL/BrowserDB.swift @@ -25,7 +25,7 @@ open class BrowserDB { // swiftlint:disable:next force_try let file = URL(fileURLWithPath: (try! files.getAndEnsureDirectory())).appendingPathComponent(filename).path - if AppConstants.buildChannel == .developer && secretKey != nil { + if AppConstants.buildChannel == .debug && secretKey != nil { log.debug("Will attempt to use encrypted DB: \(file) with secret = \(secretKey ?? "nil")") } diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 4b3988a3ad9..d9aa012db05 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -95,6 +95,36 @@ platform :ios do defaultParams = gym_params() gym(defaultParams.merge!(options[:overrideParams])) end + + desc "All enterprise releases use this as the foundation" + lane :enterprise do |options| + carthage( + platform: "iOS", + cache_builds: true, + configuration: "Release", + ) + + build_app( + scheme: "Enterprise", + clean: true, + output_directory: "build", + export_options: { + method: "enterprise", + provisioningProfiles: { + "com.brave.ios.enterprise.Browser" => "BraveEnt", + "com.brave.ios.enterprise.Browser.BraveShareTo" => "Ent-ShareTo" + } + }, + xcargs: "-allowProvisioningUpdates BRAVE_API_KEY=\"#{ENV['BRAVE_STATS_API_KEY']}\" BRAVE_VERSION=\"#{git_branch}\" GENERATED_BUILD_ID=\"#{get_build_number_repository}\"" + ) + + appcenter_upload( + owner_type: "organization", + file: "./build/Client.ipa", + dsym: "./build/Client.app.dSYM.zip", + notify_testers: false + ) + end # Private helper methods --------------------------------------- @@ -104,7 +134,7 @@ platform :ios do sdk: "iphoneos", clean: true, skip_package_ipa: true, - xcargs: "-allowProvisioningUpdates BRAVE_API_KEY=\"#{sh("head", "-1", "#{ENV['HOME']}/.brave-api-key")}\"" + xcargs: "-allowProvisioningUpdates BRAVE_API_KEY=\"#{ENV['BRAVE_STATS_API_KEY']}\"" } end diff --git a/fastlane/Pluginfile b/fastlane/Pluginfile new file mode 100644 index 00000000000..756bff8e135 --- /dev/null +++ b/fastlane/Pluginfile @@ -0,0 +1,5 @@ +# Autogenerated by fastlane +# +# Ensure this file is checked in to source control! + +gem 'fastlane-plugin-appcenter'