From 1e1c01d4a530f635250300ee53514d50fd290734 Mon Sep 17 00:00:00 2001 From: Mubarak Sadoon Date: Wed, 1 Feb 2023 20:44:49 -0500 Subject: [PATCH] [Regression Fix] Braze Segment Integration Crash (#1785) --- Kickstarter-iOS/AppDelegate.swift | 15 +- Kickstarter.xcodeproj/project.pbxproj | 161 +++++++++++++----- .../xcshareddata/swiftpm/Package.resolved | 14 +- KsApi/lib/KsApiNotification.swift | 2 - 4 files changed, 132 insertions(+), 60 deletions(-) diff --git a/Kickstarter-iOS/AppDelegate.swift b/Kickstarter-iOS/AppDelegate.swift index a1b048c085..cd7984309f 100644 --- a/Kickstarter-iOS/AppDelegate.swift +++ b/Kickstarter-iOS/AppDelegate.swift @@ -1,4 +1,4 @@ -import AppboyUI +import AppboyKit import AppCenter import AppCenterDistribute import FBSDKCoreKit @@ -265,7 +265,7 @@ internal final class AppDelegate: UIResponder, UIApplicationDelegate { guard let strongSelf = self else { return } let factoryInstance = SEGAppboyIntegrationFactory.instance() - factoryInstance?.saveLaunchOptions(launchOptions) + factoryInstance?.appboyOptions = [ ABKInAppMessageControllerDelegateKey: strongSelf, ABKMinimumTriggerTimeIntervalKey: 5 @@ -301,17 +301,6 @@ internal final class AppDelegate: UIResponder, UIApplicationDelegate { self?.viewModel.inputs.perimeterXCaptchaTriggeredWithUserInfo(note.userInfo) } - NotificationCenter.default - .addObserver( - forName: Notification.Name.ksr_appboyCreated, - object: nil, - queue: nil - ) { [weak self] _ in - guard let strongSelf = self else { return } - - Appboy.sharedInstance()?.inAppMessageController.delegate = strongSelf - } - self.window?.tintColor = .ksr_create_700 self.viewModel.inputs.applicationDidFinishLaunching( diff --git a/Kickstarter.xcodeproj/project.pbxproj b/Kickstarter.xcodeproj/project.pbxproj index 8923fe965b..8959baec06 100644 --- a/Kickstarter.xcodeproj/project.pbxproj +++ b/Kickstarter.xcodeproj/project.pbxproj @@ -266,8 +266,6 @@ 1998BCA828F60E8900D04077 /* ReactiveExtensions in Frameworks */ = {isa = PBXBuildFile; productRef = 1998BCA728F60E8900D04077 /* ReactiveExtensions */; }; 1998BCB028F60EC300D04077 /* ReactiveExtensions-TestHelpers in Frameworks */ = {isa = PBXBuildFile; productRef = 1998BCAF28F60EC300D04077 /* ReactiveExtensions-TestHelpers */; }; 1998BCB228F60ED400D04077 /* ReactiveExtensions in Frameworks */ = {isa = PBXBuildFile; productRef = 1998BCB128F60ED400D04077 /* ReactiveExtensions */; }; - 19A824AE28DA54ED00325124 /* AppboySegment in Frameworks */ = {isa = PBXBuildFile; productRef = 19A824AD28DA54ED00325124 /* AppboySegment */; }; - 19A824B028DA562800325124 /* AppboySegment in Frameworks */ = {isa = PBXBuildFile; productRef = 19A824AF28DA562800325124 /* AppboySegment */; }; 19A97CE228C7DA7B0031B857 /* ActivitiesDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = A75AB1F81C8A84B5002FC3E6 /* ActivitiesDataSource.swift */; }; 19A97CF228C7E2D30031B857 /* CategoryPillCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A97CF128C7E2D30031B857 /* CategoryPillCell.swift */; }; 19A97D1928C7F0E30031B857 /* DiscoveryPageViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7ED202E1E8323E900BFFA01 /* DiscoveryPageViewControllerTests.swift */; }; @@ -495,6 +493,12 @@ 60DA512928CA580B002E2DF1 /* Optimizely in Frameworks */ = {isa = PBXBuildFile; productRef = 60DA512828CA580B002E2DF1 /* Optimizely */; }; 60EAD1B528D0EE45009F9474 /* iOSSnapshotTestCase in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 60EAD1B328D0EE45009F9474 /* iOSSnapshotTestCase */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 60EAD1C728D25A36009F9474 /* AppCenterDistribute in Frameworks */ = {isa = PBXBuildFile; productRef = 60EAD1C628D25A36009F9474 /* AppCenterDistribute */; }; + 70CEC164298B2A2A0009D67A /* AppboyKit in Frameworks */ = {isa = PBXBuildFile; productRef = 70CEC163298B2A2A0009D67A /* AppboyKit */; }; + 70CEC166298B2A2A0009D67A /* AppboyUI in Frameworks */ = {isa = PBXBuildFile; productRef = 70CEC165298B2A2A0009D67A /* AppboyUI */; }; + 70CEC168298B2A770009D67A /* AppboyKit in Frameworks */ = {isa = PBXBuildFile; productRef = 70CEC167298B2A770009D67A /* AppboyKit */; }; + 70CEC16A298B2A810009D67A /* AppboyUI in Frameworks */ = {isa = PBXBuildFile; productRef = 70CEC169298B2A810009D67A /* AppboyUI */; }; + 70CEC16D298B2ACA0009D67A /* AppboySegment in Frameworks */ = {isa = PBXBuildFile; productRef = 70CEC16C298B2ACA0009D67A /* AppboySegment */; }; + 70CEC16F298B2B010009D67A /* AppboySegment in Frameworks */ = {isa = PBXBuildFile; productRef = 70CEC16E298B2B010009D67A /* AppboySegment */; }; 770187C022FDCFCA0019129D /* PledgeViewControllerMessageDisplaying.swift in Sources */ = {isa = PBXBuildFile; fileRef = 770187BE22FDCF960019129D /* PledgeViewControllerMessageDisplaying.swift */; }; 7703B42223217D4F00169EF3 /* EnvironmentType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7703B42123217D4F00169EF3 /* EnvironmentType.swift */; }; 7703B4242321844900169EF3 /* PKPaymentRequest+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7703B4232321844900169EF3 /* PKPaymentRequest+Helpers.swift */; }; @@ -3175,18 +3179,20 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 70CEC168298B2A770009D67A /* AppboyKit in Frameworks */, 60DA50FE28C38DDB002E2DF1 /* AlamofireImage in Frameworks */, 60DA512928CA580B002E2DF1 /* Optimizely in Frameworks */, 06634FC72807A4EB00950F60 /* Prelude_UIKit in Frameworks */, 191A4B4028FF386C009D62A5 /* ReactiveSwift in Frameworks */, - 19A824B028DA562800325124 /* AppboySegment in Frameworks */, D0D10BB81EEB394D005EBAD0 /* KsApi.framework in Frameworks */, 198E574B28E2705100D5B8A9 /* PerimeterX in Frameworks */, 1981AC90289075D900BB4897 /* Stripe in Frameworks */, 60DA510F28C7E04B002E2DF1 /* Kingfisher in Frameworks */, 191A4B4228FF3897009D62A5 /* ReactiveExtensions in Frameworks */, + 70CEC16A298B2A810009D67A /* AppboyUI in Frameworks */, 606754BF28CF91DD0033CD5E /* FacebookLogin in Frameworks */, 606754BD28CF91D60033CD5E /* FacebookCore in Frameworks */, + 70CEC16F298B2B010009D67A /* AppboySegment in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3217,15 +3223,17 @@ buildActionMask = 2147483647; files = ( 19BF226528D10497007F4197 /* FirebasePerformance in Frameworks */, + 70CEC166298B2A2A0009D67A /* AppboyUI in Frameworks */, 19BF226128D10497007F4197 /* FirebaseAnalytics in Frameworks */, + 70CEC16D298B2ACA0009D67A /* AppboySegment in Frameworks */, 60EAD1C728D25A36009F9474 /* AppCenterDistribute in Frameworks */, 06EA2D4C280F76B700F4DE2E /* Prelude in Frameworks */, A73924001D27230B004524C3 /* Kickstarter_Framework.framework in Frameworks */, - 19A824AE28DA54ED00325124 /* AppboySegment in Frameworks */, 191EDC6728E29BB9009B41B2 /* PerimeterX in Frameworks */, 19BF226328D10497007F4197 /* FirebaseCrashlytics in Frameworks */, 1905787B28F8CD2500428375 /* ReactiveSwift in Frameworks */, 1998BCA828F60E8900D04077 /* ReactiveExtensions in Frameworks */, + 70CEC164298B2A2A0009D67A /* AppboyKit in Frameworks */, D0B45B6B1EF858C00020A8DA /* KsApi.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -7221,10 +7229,12 @@ 60DA512828CA580B002E2DF1 /* Optimizely */, 606754BC28CF91D60033CD5E /* FacebookCore */, 606754BE28CF91DD0033CD5E /* FacebookLogin */, - 19A824AF28DA562800325124 /* AppboySegment */, 198E574A28E2705100D5B8A9 /* PerimeterX */, 191A4B3F28FF386C009D62A5 /* ReactiveSwift */, 191A4B4128FF3897009D62A5 /* ReactiveExtensions */, + 70CEC167298B2A770009D67A /* AppboyKit */, + 70CEC169298B2A810009D67A /* AppboyUI */, + 70CEC16E298B2B010009D67A /* AppboySegment */, ); productName = "Library-iOS"; productReference = A755113C1C8642B3005355CF /* Library.framework */; @@ -7301,10 +7311,12 @@ 19BF226228D10497007F4197 /* FirebaseCrashlytics */, 19BF226428D10497007F4197 /* FirebasePerformance */, 60EAD1C628D25A36009F9474 /* AppCenterDistribute */, - 19A824AD28DA54ED00325124 /* AppboySegment */, 191EDC6628E29BB9009B41B2 /* PerimeterX */, 1998BCA728F60E8900D04077 /* ReactiveExtensions */, 1905787A28F8CD2500428375 /* ReactiveSwift */, + 70CEC163298B2A2A0009D67A /* AppboyKit */, + 70CEC165298B2A2A0009D67A /* AppboyUI */, + 70CEC16C298B2ACA0009D67A /* AppboySegment */, ); productName = Kickstarter; productReference = A7D1F9451C850B7C000D41D5 /* KickDebug.app */; @@ -7395,7 +7407,6 @@ A755113B1C8642B3005355CF = { CreatedOnToolsVersion = 7.2.1; LastSwiftMigration = 1000; - ProvisioningStyle = Manual; }; A75511441C8642B3005355CF = { CreatedOnToolsVersion = 7.2.1; @@ -7404,7 +7415,6 @@ A7C7959D1C873A870081977F = { CreatedOnToolsVersion = 7.2.1; LastSwiftMigration = 1000; - ProvisioningStyle = Manual; }; A7D1F9441C850B7C000D41D5 = { CreatedOnToolsVersion = 7.2.1; @@ -7430,9 +7440,7 @@ }; D015874F1EEB2DE4006E7684 = { CreatedOnToolsVersion = 8.3.3; - DevelopmentTeam = 48YBP49Y5N; LastSwiftMigration = 1000; - ProvisioningStyle = Manual; }; D01587571EEB2DE4006E7684 = { CreatedOnToolsVersion = 8.3.3; @@ -7466,10 +7474,11 @@ 19BF225F28D10497007F4197 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, 60EAD1B028D0EE24009F9474 /* XCRemoteSwiftPackageReference "ios-snapshot-test-case" */, 60EAD1C528D25A36009F9474 /* XCRemoteSwiftPackageReference "appcenter-sdk-apple" */, - 19A824AC28DA54ED00325124 /* XCRemoteSwiftPackageReference "appboy-segment-ios" */, 602C97D628DB787900919CA8 /* XCRemoteSwiftPackageReference "px-iOS-Framework" */, 194C593E28F5E7FF00453249 /* XCRemoteSwiftPackageReference "Kickstarter-ReactiveExtensions" */, 1905787928F8CD2500428375 /* XCRemoteSwiftPackageReference "ReactiveSwift" */, + 70CEC162298B2A290009D67A /* XCRemoteSwiftPackageReference "braze-ios-sdk" */, + 70CEC16B298B2AC90009D67A /* XCRemoteSwiftPackageReference "appboy-segment-ios" */, ); productRefGroup = A7E06C7A1C5A6EB300EBDCC2 /* Products */; projectDirPath = ""; @@ -9260,8 +9269,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = "app-icon-beta"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = "Kickstarter-iOS/Beta.entitlements"; - CODE_SIGN_IDENTITY = "iPhone Distribution"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 5DAN4UM3NC; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -9275,7 +9284,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.kickstarter.kickstarter.beta; PRODUCT_MODULE_NAME = Kickstarter_iOS; PRODUCT_NAME = KickBeta; - PROVISIONING_PROFILE_SPECIFIER = "match InHouse com.kickstarter.kickstarter.beta"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; VALIDATE_WORKSPACE = NO; }; @@ -9285,6 +9294,8 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = NO; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = 5DAN4UM3NC; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "Kickstarter-iOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( @@ -9294,6 +9305,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.KickstarterTests; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SUPPORTS_MACCATALYST = NO; SWIFT_VERSION = 5.0; @@ -9303,8 +9315,11 @@ A745D1D71CAAD0A400C12802 /* AppCenter Beta */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 5DAN4UM3NC; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -9332,6 +9347,8 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = NO; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = 5DAN4UM3NC; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "Kickstarter-iOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( @@ -9342,6 +9359,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "com.Library-iOSTests"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SUPPORTS_MACCATALYST = NO; SWIFT_VERSION = 5.0; @@ -9351,8 +9369,11 @@ A745D1D91CAAD0A400C12802 /* AppCenter Beta */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 5DAN4UM3NC; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -9384,8 +9405,11 @@ A755114D1C8642B3005355CF /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 48YBP49Y5N; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -9412,8 +9436,11 @@ A755114E1C8642B3005355CF /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 48YBP49Y5N; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -9460,6 +9487,8 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = NO; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = 48YBP49Y5N; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "Kickstarter-iOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( @@ -9470,6 +9499,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "com.Library-iOSTests"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SUPPORTS_MACCATALYST = NO; SWIFT_VERSION = 5.0; @@ -9512,8 +9542,11 @@ A7C795A81C873A870081977F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 5DAN4UM3NC; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -9549,8 +9582,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = "app-icon-debug"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = "Kickstarter-iOS/Debug.entitlements"; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 48YBP49Y5N; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -9564,7 +9597,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.kickstarter.kickstarter.debug; PRODUCT_MODULE_NAME = Kickstarter_iOS; PRODUCT_NAME = KickDebug; - PROVISIONING_PROFILE_SPECIFIER = "match Development com.kickstarter.kickstarter.debug"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; VALIDATE_WORKSPACE = NO; @@ -9621,6 +9654,8 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = NO; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = 5DAN4UM3NC; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "Kickstarter-iOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( @@ -9630,6 +9665,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.KickstarterTests; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SUPPORTS_MACCATALYST = NO; SWIFT_VERSION = 5.0; @@ -9823,10 +9859,13 @@ CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_ENABLE_MODULES = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 5DAN4UM3NC; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -9858,10 +9897,13 @@ CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_ENABLE_MODULES = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 5DAN4UM3NC; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -10042,8 +10084,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = "app-icon-alpha"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = "Kickstarter-iOS/Alpha.entitlements"; - CODE_SIGN_IDENTITY = "iPhone Distribution"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 5DAN4UM3NC; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -10057,7 +10099,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.kickstarter.kickstarter.kickalpha; PRODUCT_MODULE_NAME = Kickstarter_iOS; PRODUCT_NAME = KickAlpha; - PROVISIONING_PROFILE_SPECIFIER = "match InHouse com.kickstarter.kickstarter.kickalpha"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; VALIDATE_WORKSPACE = NO; }; @@ -10066,8 +10108,11 @@ D083B1051F27EF0400BEC742 /* AppCenter Alpha */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 5DAN4UM3NC; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -10095,6 +10140,8 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = NO; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = 5DAN4UM3NC; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "Kickstarter-iOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( @@ -10105,6 +10152,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "com.Library-iOSTests"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SUPPORTS_MACCATALYST = NO; SWIFT_VERSION = 5.0; @@ -10114,8 +10162,11 @@ D083B1071F27EF0400BEC742 /* AppCenter Alpha */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 5DAN4UM3NC; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -10148,6 +10199,8 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = NO; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = 5DAN4UM3NC; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "Kickstarter-iOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( @@ -10157,6 +10210,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.KickstarterTests; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SUPPORTS_MACCATALYST = NO; SWIFT_VERSION = 5.0; @@ -10170,10 +10224,13 @@ CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_ENABLE_MODULES = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 5DAN4UM3NC; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -10359,14 +10416,6 @@ kind = branch; }; }; - 19A824AC28DA54ED00325124 /* XCRemoteSwiftPackageReference "appboy-segment-ios" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/Appboy/appboy-segment-ios"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 4.6.0; - }; - }; 19BF225F28D10497007F4197 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git"; @@ -10439,6 +10488,22 @@ minimumVersion = 4.0.0; }; }; + 70CEC162298B2A290009D67A /* XCRemoteSwiftPackageReference "braze-ios-sdk" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/braze-inc/braze-ios-sdk.git"; + requirement = { + kind = exactVersion; + version = 4.5.1; + }; + }; + 70CEC16B298B2AC90009D67A /* XCRemoteSwiftPackageReference "appboy-segment-ios" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/Appboy/appboy-segment-ios.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 4.0.0; + }; + }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ @@ -10552,16 +10617,6 @@ package = 194C593E28F5E7FF00453249 /* XCRemoteSwiftPackageReference "Kickstarter-ReactiveExtensions" */; productName = ReactiveExtensions; }; - 19A824AD28DA54ED00325124 /* AppboySegment */ = { - isa = XCSwiftPackageProductDependency; - package = 19A824AC28DA54ED00325124 /* XCRemoteSwiftPackageReference "appboy-segment-ios" */; - productName = AppboySegment; - }; - 19A824AF28DA562800325124 /* AppboySegment */ = { - isa = XCSwiftPackageProductDependency; - package = 19A824AC28DA54ED00325124 /* XCRemoteSwiftPackageReference "appboy-segment-ios" */; - productName = AppboySegment; - }; 19BF226028D10497007F4197 /* FirebaseAnalytics */ = { isa = XCSwiftPackageProductDependency; package = 19BF225F28D10497007F4197 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; @@ -10622,6 +10677,36 @@ package = 60EAD1C528D25A36009F9474 /* XCRemoteSwiftPackageReference "appcenter-sdk-apple" */; productName = AppCenterDistribute; }; + 70CEC163298B2A2A0009D67A /* AppboyKit */ = { + isa = XCSwiftPackageProductDependency; + package = 70CEC162298B2A290009D67A /* XCRemoteSwiftPackageReference "braze-ios-sdk" */; + productName = AppboyKit; + }; + 70CEC165298B2A2A0009D67A /* AppboyUI */ = { + isa = XCSwiftPackageProductDependency; + package = 70CEC162298B2A290009D67A /* XCRemoteSwiftPackageReference "braze-ios-sdk" */; + productName = AppboyUI; + }; + 70CEC167298B2A770009D67A /* AppboyKit */ = { + isa = XCSwiftPackageProductDependency; + package = 70CEC162298B2A290009D67A /* XCRemoteSwiftPackageReference "braze-ios-sdk" */; + productName = AppboyKit; + }; + 70CEC169298B2A810009D67A /* AppboyUI */ = { + isa = XCSwiftPackageProductDependency; + package = 70CEC162298B2A290009D67A /* XCRemoteSwiftPackageReference "braze-ios-sdk" */; + productName = AppboyUI; + }; + 70CEC16C298B2ACA0009D67A /* AppboySegment */ = { + isa = XCSwiftPackageProductDependency; + package = 70CEC16B298B2AC90009D67A /* XCRemoteSwiftPackageReference "appboy-segment-ios" */; + productName = AppboySegment; + }; + 70CEC16E298B2B010009D67A /* AppboySegment */ = { + isa = XCSwiftPackageProductDependency; + package = 70CEC16B298B2AC90009D67A /* XCRemoteSwiftPackageReference "appboy-segment-ios" */; + productName = AppboySegment; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = A7E06C711C5A6EB300EBDCC2 /* Project object */; diff --git a/Kickstarter.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Kickstarter.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index f033b22245..6458f75c67 100644 --- a/Kickstarter.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Kickstarter.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/segmentio/analytics-ios.git", "state" : { - "revision" : "fc64997865619f73bbab196c164f7845a13da110", - "version" : "4.1.6" + "revision" : "78423aaae2e48e32a07246850f37c76f3d34cb84", + "version" : "4.1.8" } }, { @@ -48,7 +48,7 @@ { "identity" : "appboy-segment-ios", "kind" : "remoteSourceControl", - "location" : "https://github.com/Appboy/appboy-segment-ios", + "location" : "https://github.com/Appboy/appboy-segment-ios.git", "state" : { "revision" : "08a061113e8a7e835e6bc9c0e1629d94e63aa29e", "version" : "4.6.0" @@ -77,8 +77,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/braze-inc/braze-ios-sdk.git", "state" : { - "revision" : "f9ebcd2442ee4ab986a609b90d1153ca556f6027", - "version" : "4.5.2" + "revision" : "ddd02f32ab3f546f13582f8a2f7b0334c49382f3", + "version" : "4.5.1" } }, { @@ -257,8 +257,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/SDWebImage/SDWebImage.git", "state" : { - "revision" : "484bc774e1091f622c4856e576ff957b29403676", - "version" : "5.13.3" + "revision" : "6c6b951845a520fa7e8356e28adb5339c0f008d3", + "version" : "5.15.0" } }, { diff --git a/KsApi/lib/KsApiNotification.swift b/KsApi/lib/KsApiNotification.swift index 022307950b..92d006370c 100644 --- a/KsApi/lib/KsApiNotification.swift +++ b/KsApi/lib/KsApiNotification.swift @@ -2,6 +2,4 @@ import Foundation extension Notification.Name { public static let ksr_perimeterXCaptcha = Notification.Name(rawValue: "KsApiNotification.PerimeterXCaptcha") - public static let ksr_appboyCreated = Notification - .Name(rawValue: "io.segment.analytics.integration.did.start") }