Fix #7172: Removed Adjust Library (#1720)

Blockzilla.xcodeproj/project.pbxproj

@@ -168,8 +168,6 @@
 		E44A34761E0A198000BFD777 /* SnapshotHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = E44A34751E0A198000BFD777 /* SnapshotHelper.swift */; };
 		E47F9AE71DB929D800A93285 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E47F9AE51DB929D800A93285 /* AdSupport.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		E47F9AE81DB929D800A93285 /* iAd.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E47F9AE61DB929D800A93285 /* iAd.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
-		E47F9AEA1DB9329D00A93285 /* Adjust-Focus.plist in Resources */ = {isa = PBXBuildFile; fileRef = E47F9AE91DB9329D00A93285 /* Adjust-Focus.plist */; };
-		E47F9AEE1DB9338600A93285 /* AdjustIntegration.swift in Sources */ = {isa = PBXBuildFile; fileRef = E47F9AED1DB9338600A93285 /* AdjustIntegration.swift */; };
 		E4BC84F11E2A862400833B45 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = E4BC84F31E2A862400833B45 /* InfoPlist.strings */; };
 		E4BC84F61E2A862600833B45 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = E4BC84F81E2A862600833B45 /* InfoPlist.strings */; };
 		E4BC84FB1E2A862700833B45 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = E4BC84FD1E2A862700833B45 /* InfoPlist.strings */; };
@@ -766,8 +764,6 @@
 		E47DBB791E5535A50027DE08 /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		E47F9AE51DB929D800A93285 /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; };
 		E47F9AE61DB929D800A93285 /* iAd.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iAd.framework; path = System/Library/Frameworks/iAd.framework; sourceTree = SDKROOT; };
-		E47F9AE91DB9329D00A93285 /* Adjust-Focus.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Adjust-Focus.plist"; sourceTree = "<group>"; };
-		E47F9AED1DB9338600A93285 /* AdjustIntegration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdjustIntegration.swift; sourceTree = "<group>"; };
 		E4870BEA1E50ECE200F5F491 /* is */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = is; path = is.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		E4870BEB1E50ECE200F5F491 /* is */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = is; path = is.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		E4870BEC1E50ECE300F5F491 /* is */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = is; path = is.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -1273,7 +1269,6 @@
 				D3E54FD41DEFB25B003E1AFF /* SearchPlugins */,
 				D30179C51BCD78E1009AD388 /* Blockzilla-Bridging-Header.h */,
 				D3DA778B1DC2C60E009C114E /* errorPage.html */,
-				E47F9AE91DB9329D00A93285 /* Adjust-Focus.plist */,
 				E4BF2DE21BACE8CA00DA9D68 /* Info.plist */,
 				D3C047BC1DCBD8ED00402FFB /* SearchEngines.plist */,
 				F84AFE721DE77FE6005C4DD1 /* LaunchScreen.png */,
@@ -1286,7 +1281,6 @@
 				747ADA171FC38EFC00970132 /* IntroViewController.swift */,
 				D30179C21BCC6F65009AD388 /* AboutViewController.swift */,
 				74584E341FA1077000AF2582 /* SettingsContentViewController.swift */,
-				E47F9AED1DB9338600A93285 /* AdjustIntegration.swift */,
 				7460BD661F58B1B10096B745 /* GradientProgressBar.swift */,
 				D5ABA3D81FCC846800D5C060 /* AutocompleteSettingViewController.swift */,
 				E4BF2DD61BACE8CA00DA9D68 /* AppDelegate.swift */,
@@ -1468,7 +1462,6 @@
 				E4BF2DD11BACE8CA00DA9D68 /* Resources */,
 				E4BF2DF91BACE92400DA9D68 /* Embed App Extensions */,
 				D38D693F1C471AC7003EF211 /* Run Script (Carthage) */,
-				D02817331ECF37D900240CAA /* Run Script (Carthage - Focus Only) */,
 			);
 			buildRules = (
 			);
@@ -1724,7 +1717,6 @@
 				F84AFE751DE77FE6005C4DD1 /* LaunchScreen.png in Resources */,
 				D3DA778C1DC2C60E009C114E /* errorPage.html in Resources */,
 				F84AFE761DE77FE6005C4DD1 /* [email protected] in Resources */,
-				E47F9AEA1DB9329D00A93285 /* Adjust-Focus.plist in Resources */,
 				D38EDB961DCA8A9400E28196 /* LaunchScreen.storyboard in Resources */,
 				E40AFC741DDDE96D00DA5651 /* InfoPlist.strings in Resources */,
 				D343DCC21C44356500D7EEE8 /* Localizable.strings in Resources */,
@@ -1760,21 +1752,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		D02817331ECF37D900240CAA /* Run Script (Carthage - Focus Only) */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"$(SRCROOT)/Carthage/Build/iOS/AdjustSdk.framework",
-			);
-			name = "Run Script (Carthage - Focus Only)";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "if echo $SWIFT_ACTIVE_COMPILATION_CONDITIONS | grep -q -e \"FOCUS\"; then\n  echo \"Copying Focus-only Carthage frameworks\"\n  /usr/local/bin/carthage copy-frameworks\nelse\n  echo \"Skipping Build Phase for copying Focus-only Carthage frameworks\"\nfi\n";
-		};
 		D38D693F1C471AC7003EF211 /* Run Script (Carthage) */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -1940,7 +1917,6 @@
 				D30AEEBB1DE4CB1B0096A2E7 /* FileManagerExtensions.swift in Sources */,
 				D36C1BAA1DB02EBB0073C1AB /* OpenUtils.swift in Sources */,
 				D364DC261DC4163700562991 /* BrowserToolset.swift in Sources */,
-				E47F9AEE1DB9338600A93285 /* AdjustIntegration.swift in Sources */,
 				D3E54FD11DEFB063003E1AFF /* SearchEngineManager.swift in Sources */,
 				D392881D1BC5CF180016A9A0 /* UIColorExtensions.swift in Sources */,
 				EB84F96F209380CE00BA6739 /* URLExtensions.swift in Sources */,

Blockzilla/AppDelegate.swift

@@ -386,16 +386,6 @@ extension AppDelegate {
 
         // Start the telemetry session and record an event indicating that we have entered the
         Telemetry.default.recordEvent(category: TelemetryEventCategory.action, method: TelemetryEventMethod.foreground, object: TelemetryEventObject.app)
-
-        // Only include Adjust SDK in Focus and NOT in Klar builds.
-        #if FOCUS
-            // Always initialize Adjust, otherwise the SDK is in a bad state. We disable it
-            // immediately so that no data is collected or sent.
-            AdjustIntegration.applicationDidFinishLaunching()
-            if !Settings.getToggle(.sendAnonymousUsageData) {
-                AdjustIntegration.enabled = false
-            }
-        #endif
     }
 
     func presentModal(viewController: UIViewController, animated: Bool) {

Blockzilla/Settings.bundle/com.mono0926.LicensePlist.latest_result.txt

@@ -4,8 +4,6 @@ name: onepassword-extension, nameSpecified: , owner: AgileBits, version: 04f146a
 
 name: SnapKit, nameSpecified: , owner: SnapKit, version: 4.0.0
 
-name: ios_sdk, nameSpecified: Adjust, owner: adjust, version: v4.11.5
-
 name: Fuzi, nameSpecified: , owner: cezheng, version: 53e3f15
 
 name: sentry-cocoa, nameSpecified: Sentry, owner: getsentry, version: 3.2.1

Blockzilla/Settings.bundle/com.mono0926.LicensePlist.plist

@@ -36,14 +36,6 @@
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
-		<dict>
-			<key>File</key>
-			<string>com.mono0926.LicensePlist/ios_sdk</string>
-			<key>Title</key>
-			<string>Adjust</string>
-			<key>Type</key>
-			<string>PSChildPaneSpecifier</string>
-		</dict>
 		<dict>
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/onepassword-extension</string>

Cartfile

@@ -1,6 +1,5 @@
 github "swisspol/GCDWebServer" ~> 3.3.3
 github "SnapKit/SnapKit" "4.0.0"
-github "adjust/ios_sdk" "v4.14.2"
 github "cezheng/Fuzi" "master"
 github "mozilla-mobile/AutocompleteTextField" "master"
 github "mozilla-mobile/telemetry-ios" ~> 1.1

Cartfile.resolved

@@ -1,6 +1,5 @@
 github "AgileBits/onepassword-extension" "a614e290396346e3cb69e4951656eb8033390f8c"
 github "SnapKit/SnapKit" "4.0.0"
-github "adjust/ios_sdk" "v4.14.2"
 github "cezheng/Fuzi" "8bb9034e336a2d863f279411469f538f548f5874"
 github "getsentry/sentry-cocoa" "3.12.4"
 github "mozilla-mobile/AutocompleteTextField" "f5614c04a1fc3f2fa29fbb2e149e0083070fcf1b"