Remove dependency from Mixpanel, remove core folder for foundation pod #5294

AlphaWallet.xcodeproj/project.pbxproj

@@ -669,6 +669,8 @@
 		87B1ACDB28C0D55D0072A5E2 /* tokens.json in Resources */ = {isa = PBXBuildFile; fileRef = 87B1ACDA28C0D55D0072A5E2 /* tokens.json */; };
 		87B1AD3728C1FE030072A5E2 /* KeychainStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87B1AD3628C1FE030072A5E2 /* KeychainStorage.swift */; };
 		87B1B5D928C73C170072A5E2 /* WalletConnectSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 87B1B5D828C73C170072A5E2 /* WalletConnectSwift */; };
+		87B1B5EE28C870D60072A5E2 /* MixpanelService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87B1B5EC28C870D60072A5E2 /* MixpanelService.swift */; };
+		87B1B5EF28C870D60072A5E2 /* AnalyticsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87B1B5ED28C870D60072A5E2 /* AnalyticsService.swift */; };
 		87B651F7256D4BFE000EF927 /* ClaimPaidOrderCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87B651F6256D4BFE000EF927 /* ClaimPaidOrderCoordinator.swift */; };
 		87B93B0E2726A46500F6EA73 /* BrowserStorageSubscription.js in Resources */ = {isa = PBXBuildFile; fileRef = 87B93B0D2726A46500F6EA73 /* BrowserStorageSubscription.js */; };
 		87B93B0F2726C59D00F6EA73 /* content.js in Resources */ = {isa = PBXBuildFile; fileRef = 8703FC0A270366DA0062C416 /* content.js */; };
@@ -1505,6 +1507,8 @@
 		87B1ACD828C0D45B0072A5E2 /* chains.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; name = chains.zip; path = AlphaWallet/Resources/chains.zip; sourceTree = SOURCE_ROOT; };
 		87B1ACDA28C0D55D0072A5E2 /* tokens.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = tokens.json; path = AlphaWallet/Resources/tokens.json; sourceTree = SOURCE_ROOT; };
 		87B1AD3628C1FE030072A5E2 /* KeychainStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainStorage.swift; sourceTree = "<group>"; };
+		87B1B5EC28C870D60072A5E2 /* MixpanelService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MixpanelService.swift; sourceTree = "<group>"; };
+		87B1B5ED28C870D60072A5E2 /* AnalyticsService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnalyticsService.swift; sourceTree = "<group>"; };
 		87B651F6256D4BFE000EF927 /* ClaimPaidOrderCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ClaimPaidOrderCoordinator.swift; sourceTree = "<group>"; };
 		87B93B0D2726A46500F6EA73 /* BrowserStorageSubscription.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = BrowserStorageSubscription.js; sourceTree = "<group>"; };
 		87B93B122726C75900F6EA73 /* helpers.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = helpers.js; sourceTree = "<group>"; };
@@ -3775,6 +3779,7 @@
 		87B1ACDD28C0D5C50072A5E2 /* Services */ = {
 			isa = PBXGroup;
 			children = (
+				87B1B5F228C8715F0072A5E2 /* Analytics */,
 				5E7C7FC75FF544B1DF0B0D8B /* PushNotificationsService.swift */,
 				875CA90828BF2B720020FA48 /* LocalNotificationService.swift */,
 				874ED68F27DB48FE001AB374 /* DappRequestHandler.swift */,
@@ -3800,6 +3805,15 @@
 			path = Resources;
 			sourceTree = "<group>";
 		};
+		87B1B5F228C8715F0072A5E2 /* Analytics */ = {
+			isa = PBXGroup;
+			children = (
+				87B1B5ED28C870D60072A5E2 /* AnalyticsService.swift */,
+				87B1B5EC28C870D60072A5E2 /* MixpanelService.swift */,
+			);
+			path = Analytics;
+			sourceTree = "<group>";
+		};
 		87BBF9682563DD7500FF4846 /* WalletConnect */ = {
 			isa = PBXGroup;
 			children = (
@@ -4353,7 +4367,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Don't run this during index builds\nif [ $ACTION = \"indexbuild\" ]; then exit 0; fi\n\nSCRIPT_PATH=\"${PODS_ROOT}/Apollo/scripts\"\nSCHEMA_PATH=\"${SRCROOT}/modules/AlphaWalletFoundation/AlphaWalletFoundation/Core/NFT/Enjin\"\n\ncd \"${SCHEMA_PATH}\"\n\"${SCRIPT_PATH}\"/run-bundled-codegen.sh codegen:generate --target=swift --includes=./**/*.graphql --localSchemaFile=\"${SCHEMA_PATH}/schema.json\" API.swift\n#Download graphql scheme \n#\"${SCRIPT_PATH}\"/run-bundled-codegen.sh schema:download --endpoint=\"https://cloud.enjin.io/graphql/default\" API.swift\n";
+			shellScript = "# Don't run this during index builds\nif [ $ACTION = \"indexbuild\" ]; then exit 0; fi\n\nSCRIPT_PATH=\"${PODS_ROOT}/Apollo/scripts\"\nSCHEMA_PATH=\"${SRCROOT}/modules/AlphaWalletFoundation/AlphaWalletFoundation/NFT/Enjin\"\n\ncd \"${SCHEMA_PATH}\"\n\"${SCRIPT_PATH}\"/run-bundled-codegen.sh codegen:generate --target=swift --includes=./**/*.graphql --localSchemaFile=\"${SCHEMA_PATH}/schema.json\" API.swift\n#Download graphql scheme \n#\"${SCRIPT_PATH}\"/run-bundled-codegen.sh schema:download --endpoint=\"https://cloud.enjin.io/graphql/default\" API.swift\n";
 		};
 		87FBF2B828056D8600616B7D /* Upload debug symbols to Crashlytics */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -4937,6 +4951,7 @@
 				87F15AEB27F1EA4E00EB9787 /* SwapDetailsView.swift in Sources */,
 				5E7C772EC476993A170C840B /* GenerateSellMagicLinkViewController.swift in Sources */,
 				5E7C7AC88DB7EB58FDAF1B21 /* ConfirmSignMessageViewControllerViewModel.swift in Sources */,
+				87B1B5EF28C870D60072A5E2 /* AnalyticsService.swift in Sources */,
 				02334299278480CF00492080 /* AddMultipleCustomRpcModel.swift in Sources */,
 				87442BD827D615B500EA2209 /* CheckTransactionStateViewController.swift in Sources */,
 				5E7C7A67B6143DFB9B1CF02B /* ConfirmSignMessageTableViewCell.swift in Sources */,
@@ -5184,6 +5199,7 @@
 				5E7C75BA61A6F4D300D1DA3E /* WhatsNew.swift in Sources */,
 				5E7C73A66AD0CF28767CC142 /* WhatsNewListingCoordinator.swift in Sources */,
 				5E7C793EEF16E1689FE62543 /* WhatsNewListingViewController.swift in Sources */,
+				87B1B5EE28C870D60072A5E2 /* MixpanelService.swift in Sources */,
 				5E7C7FF312AB61DBEBD86C94 /* WhatsNewViewModels.swift in Sources */,
 				02F4E8B627715EA000D89C19 /* SaveCustomRpcOverallViewController.swift in Sources */,
 				5E7C7CC1E06FFC3A5BEBF1EC /* WhatsNewViews.swift in Sources */,

AlphaWallet/Common/Services/Analytics/AnalyticsService.swift

@@ -6,18 +6,10 @@
 //
 
 import Foundation
-import UIKit
-
-public protocol AnalyticsServiceType: AnalyticsLogger {
-    func applicationDidBecomeActive()
-    func application(continue userActivity: NSUserActivity)
-    func application(open url: URL, sourceApplication: String?, annotation: Any)
-    func application(open url: URL, options: [UIApplication.OpenURLOptionsKey: Any])
-    func application(didReceiveRemoteNotification userInfo: [AnyHashable: Any])
-}
+import AlphaWalletFoundation
 
 public final class AnalyticsService: NSObject, AnalyticsServiceType {
-    private var mixpanelService: MixpanelCoordinator?
+    private var mixpanelService: MixpanelService?
     private var config: Config
 
     public init(config: Config = .init()) {
@@ -28,7 +20,7 @@ public final class AnalyticsService: NSObject, AnalyticsServiceType {
             self.config.sendAnalyticsEnabled = Features.default.isAvailable(.isAnalyticsUIEnabled)
         }
         if Constants.Credentials.analyticsKey.nonEmpty && !Environment.isTestFlight {
-            mixpanelService = MixpanelCoordinator(withKey: Constants.Credentials.analyticsKey)
+            mixpanelService = MixpanelService(withKey: Constants.Credentials.analyticsKey)
         }
     }
 

AlphaWallet/Common/Services/Analytics/MixpanelService.swift

@@ -1,9 +1,10 @@
 // Copyright © 2020 Stormbird PTE. LTD.
 
 import Foundation
+import AlphaWalletFoundation
 import Mixpanel
 
-public class MixpanelCoordinator {
+public class MixpanelService {
     private var mixpanelInstance: MixpanelInstance {
         Mixpanel.mainInstance()
     }
@@ -18,7 +19,7 @@ public class MixpanelCoordinator {
     }
 }
 
-extension MixpanelCoordinator: AnalyticsLogger {
+extension MixpanelService: AnalyticsLogger {
     public func log(navigation: AnalyticsNavigation, properties: [String: AnalyticsEventPropertyValue]?) {
         let props: Properties? = properties?.compactMapValues(convertParameterToSdkSpecificVersion)
         mixpanelInstance.track(event: navigation.rawValue, properties: props)

AlphaWalletTests/Coordinators/MixpanelCoordinatorTests.swift

@@ -11,7 +11,7 @@ import AlphaWalletFoundation
 
 class MixpanelCoordinatorTests: XCTestCase {
     func testMixpanelSdkTypeConvertation() {
-        let coordinator = MixpanelCoordinator(withKey: "")
+        let coordinator = MixpanelService(withKey: "")
         let values: [AnalyticsEventPropertyValue] = [
             "Hello AlphaWallet",
             1,

Podfile.lock

@@ -32,7 +32,6 @@ PODS:
     - Kanna
     - Kingfisher (~> 7.0)
     - MailchimpSDK
-    - Mixpanel-swift
     - Moya (~> 10.0.1)
     - PaperTrailLumberjack/Swift
     - PromiseKit/Alamofire
@@ -307,7 +306,7 @@ SPEC CHECKSUMS:
   AlphaWalletAddress: 62a69f5ccc7d6d17abf878c4274f4c3d5fdc97ba
   AlphaWalletCore: 451c8a4dfdba1d3b59a3ac47bf0dcabcf1f4c049
   AlphaWalletENS: a93a871ad5d8a8c78cd87b60eb59fccf4b23e841
-  AlphaWalletFoundation: 53981b803199dd6d0537cbc341772c68a260105c
+  AlphaWalletFoundation: 25f271d526c6a02fcaafcd0a5caaf41e9fd00edd
   AlphaWalletGoBack: 935efdbd98fa80039f2a350cde5b3a50cea46564
   AlphaWalletOpenSea: 11ccb06ae0200dadc2b3f7c3e223f407ac3a22b4
   AlphaWalletWeb3Provider: 7ca1e1c1dc841dc1915f970daace48bf34931655

modules/AlphaWalletFoundation/AlphaWalletFoundation.podspec

@@ -19,7 +19,7 @@ Pod::Spec.new do |spec|
   spec.platform         = :ios, "13.0"
   spec.source           = { :git => 'git@github.com:AlphaWallet/alpha-wallet-ios.git', :tag => "#{spec.version}" }
   spec.source_files     = 'AlphaWalletFoundation/**/*.{h,m,swift}'
-  spec.resources = ['AlphaWalletFoundation/Core/Tokens/PopularTokens/known_contract.json']
+  spec.resource_bundles = {'AlphaWalletFoundation' => ['AlphaWalletFoundation/**/*.{graphql,json}'] }
   spec.pod_target_xcconfig = { 'SWIFT_OPTIMIZATION_LEVEL' => '-Owholemodule' }
   
   spec.dependency 'BigInt', '~> 3.1'
@@ -39,7 +39,6 @@ Pod::Spec.new do |spec|
   spec.dependency 'PromiseKit/Alamofire'
   spec.dependency 'Kanna'
   spec.dependency 'TrustWalletCore', '2.6.34'
-  spec.dependency 'Mixpanel-swift'
   spec.dependency 'EthereumABI'
   spec.dependency 'BlockiesSwift'
   spec.dependency 'PaperTrailLumberjack/Swift'

modules/AlphaWalletFoundation/AlphaWalletFoundation/Analytics/AnalyticsServiceType.swift

@@ -0,0 +1,16 @@
+//
+//  AnalyticsServiceType.swift
+//  AlphaWalletFoundation
+//
+//  Created by Vladyslav Shepitko on 07.09.2022.
+//
+
+import Foundation
+
+public protocol AnalyticsServiceType: AnalyticsLogger {
+    func applicationDidBecomeActive()
+    func application(continue userActivity: NSUserActivity)
+    func application(open url: URL, sourceApplication: String?, annotation: Any)
+    func application(open url: URL, options: [UIApplication.OpenURLOptionsKey: Any])
+    func application(didReceiveRemoteNotification userInfo: [AnyHashable: Any])
+}