diff --git a/GoogleService-Info.plist b/GoogleService-Info.plist index f996be8f2..1f91965cb 100644 --- a/GoogleService-Info.plist +++ b/GoogleService-Info.plist @@ -17,20 +17,20 @@ PROJECT_ID linphone-iphone STORAGE_BUCKET - linphone-iphone.appspot.com + linphone-iphone.firebasestorage.app IS_ADS_ENABLED - + IS_ANALYTICS_ENABLED - + IS_APPINVITE_ENABLED - + IS_GCM_ENABLED - + IS_SIGNIN_ENABLED - + GOOGLE_APP_ID 1:221368768663:ios:a2c822bc087b5a219431d2 DATABASE_URL https://linphone-iphone.firebaseio.com - + \ No newline at end of file diff --git a/Linphone/Core/CoreContext.swift b/Linphone/Core/CoreContext.swift index f85c5be80..cfad9d5e9 100644 --- a/Linphone/Core/CoreContext.swift +++ b/Linphone/Core/CoreContext.swift @@ -26,6 +26,7 @@ import linphone // needed for unwrapped function linphone_core_set_push_and_app_ import Combine import UniformTypeIdentifiers import Network +import SwiftUI #if USE_CRASHLYTICS import Firebase diff --git a/Linphone/UI/Assistant/Viewmodel/RegisterViewModel.swift b/Linphone/UI/Assistant/Viewmodel/RegisterViewModel.swift index 205d5f4d5..6993992c1 100644 --- a/Linphone/UI/Assistant/Viewmodel/RegisterViewModel.swift +++ b/Linphone/UI/Assistant/Viewmodel/RegisterViewModel.swift @@ -20,6 +20,7 @@ import Foundation import linphonesw import Combine +import SwiftUI // swiftlint:disable line_length // swiftlint:disable type_body_length diff --git a/Linphone/UI/Call/Model/CallMediaEncryptionModel.swift b/Linphone/UI/Call/Model/CallMediaEncryptionModel.swift index 6795591e1..6bb362a1f 100644 --- a/Linphone/UI/Call/Model/CallMediaEncryptionModel.swift +++ b/Linphone/UI/Call/Model/CallMediaEncryptionModel.swift @@ -19,6 +19,7 @@ import Foundation import linphonesw +import SwiftUI class CallMediaEncryptionModel: ObservableObject { var coreContext = CoreContext.shared diff --git a/Linphone/UI/Call/Model/CallStatsModel.swift b/Linphone/UI/Call/Model/CallStatsModel.swift index cdc8950ad..a92a951d5 100644 --- a/Linphone/UI/Call/Model/CallStatsModel.swift +++ b/Linphone/UI/Call/Model/CallStatsModel.swift @@ -19,6 +19,7 @@ import Foundation import linphonesw +import SwiftUI class SentVideoWindow: ObservableObject { var widthFactor: CGFloat = 1 diff --git a/Linphone/UI/Call/Model/ParticipantModel.swift b/Linphone/UI/Call/Model/ParticipantModel.swift index 007d0ac9a..19e22432c 100644 --- a/Linphone/UI/Call/Model/ParticipantModel.swift +++ b/Linphone/UI/Call/Model/ParticipantModel.swift @@ -19,6 +19,7 @@ import Foundation import linphonesw +import SwiftUI class ParticipantModel: ObservableObject { diff --git a/Linphone/UI/Call/ViewModel/CallViewModel.swift b/Linphone/UI/Call/ViewModel/CallViewModel.swift index 2d7d591e2..89254489e 100644 --- a/Linphone/UI/Call/ViewModel/CallViewModel.swift +++ b/Linphone/UI/Call/ViewModel/CallViewModel.swift @@ -21,6 +21,7 @@ import SwiftUI import linphonesw import AVFAudio import Combine +import SwiftUI // swiftlint:disable line_length // swiftlint:disable type_body_length diff --git a/Linphone/UI/Main/Contacts/ViewModel/ContactViewModel.swift b/Linphone/UI/Main/Contacts/ViewModel/ContactViewModel.swift index 061e60269..da1285b32 100644 --- a/Linphone/UI/Main/Contacts/ViewModel/ContactViewModel.swift +++ b/Linphone/UI/Main/Contacts/ViewModel/ContactViewModel.swift @@ -19,6 +19,7 @@ import linphonesw import Combine +import SwiftUI // swiftlint:disable line_length class ContactViewModel: ObservableObject { diff --git a/Linphone/UI/Main/Contacts/ViewModel/ContactsListViewModel.swift b/Linphone/UI/Main/Contacts/ViewModel/ContactsListViewModel.swift index 3c59661d2..5381e8d82 100644 --- a/Linphone/UI/Main/Contacts/ViewModel/ContactsListViewModel.swift +++ b/Linphone/UI/Main/Contacts/ViewModel/ContactsListViewModel.swift @@ -18,6 +18,7 @@ */ import linphonesw +import SwiftUI class ContactsListViewModel: ObservableObject { diff --git a/Linphone/UI/Main/Contacts/ViewModel/EditContactViewModel.swift b/Linphone/UI/Main/Contacts/ViewModel/EditContactViewModel.swift index 25fa52755..0769741ae 100644 --- a/Linphone/UI/Main/Contacts/ViewModel/EditContactViewModel.swift +++ b/Linphone/UI/Main/Contacts/ViewModel/EditContactViewModel.swift @@ -18,6 +18,7 @@ */ import linphonesw +import SwiftUI class EditContactViewModel: ObservableObject { diff --git a/Linphone/UI/Main/Contacts/ViewModel/FavoriteContactsListViewModel.swift b/Linphone/UI/Main/Contacts/ViewModel/FavoriteContactsListViewModel.swift index 852da7946..8cd9f0224 100644 --- a/Linphone/UI/Main/Contacts/ViewModel/FavoriteContactsListViewModel.swift +++ b/Linphone/UI/Main/Contacts/ViewModel/FavoriteContactsListViewModel.swift @@ -18,6 +18,7 @@ */ import linphonesw +import SwiftUI class FavoriteContactsListViewModel: ObservableObject { diff --git a/Linphone/UI/Main/Conversations/ViewModel/ConversationForwardMessageViewModel.swift b/Linphone/UI/Main/Conversations/ViewModel/ConversationForwardMessageViewModel.swift index 90e866cc4..66463fab6 100644 --- a/Linphone/UI/Main/Conversations/ViewModel/ConversationForwardMessageViewModel.swift +++ b/Linphone/UI/Main/Conversations/ViewModel/ConversationForwardMessageViewModel.swift @@ -19,6 +19,7 @@ import linphonesw import Combine +import SwiftUI // swiftlint:disable line_length class ConversationForwardMessageViewModel: ObservableObject { diff --git a/Linphone/UI/Main/Conversations/ViewModel/ConversationsListViewModel.swift b/Linphone/UI/Main/Conversations/ViewModel/ConversationsListViewModel.swift index 009e2470d..1d480c823 100644 --- a/Linphone/UI/Main/Conversations/ViewModel/ConversationsListViewModel.swift +++ b/Linphone/UI/Main/Conversations/ViewModel/ConversationsListViewModel.swift @@ -20,6 +20,7 @@ import Foundation import linphonesw import Combine +import SwiftUI // swiftlint:disable line_length class ConversationsListViewModel: ObservableObject { diff --git a/Linphone/UI/Main/Conversations/ViewModel/StartConversationViewModel.swift b/Linphone/UI/Main/Conversations/ViewModel/StartConversationViewModel.swift index 760dce214..a3f8e7904 100644 --- a/Linphone/UI/Main/Conversations/ViewModel/StartConversationViewModel.swift +++ b/Linphone/UI/Main/Conversations/ViewModel/StartConversationViewModel.swift @@ -19,6 +19,7 @@ import linphonesw import Combine +import SwiftUI // swiftlint:disable line_length class StartConversationViewModel: ObservableObject { diff --git a/Linphone/UI/Main/Help/ViewModel/HelpViewModel.swift b/Linphone/UI/Main/Help/ViewModel/HelpViewModel.swift index 282314d62..00886b1a6 100644 --- a/Linphone/UI/Main/Help/ViewModel/HelpViewModel.swift +++ b/Linphone/UI/Main/Help/ViewModel/HelpViewModel.swift @@ -18,6 +18,7 @@ */ import linphonesw +import SwiftUI class HelpViewModel: ObservableObject { private let TAG = "[HelpViewModel]" diff --git a/Linphone/UI/Main/History/ViewModel/HistoryListViewModel.swift b/Linphone/UI/Main/History/ViewModel/HistoryListViewModel.swift index 5024321bf..002175504 100644 --- a/Linphone/UI/Main/History/ViewModel/HistoryListViewModel.swift +++ b/Linphone/UI/Main/History/ViewModel/HistoryListViewModel.swift @@ -19,6 +19,7 @@ import linphonesw import Combine +import SwiftUI class HistoryListViewModel: ObservableObject { diff --git a/Linphone/UI/Main/History/ViewModel/StartCallViewModel.swift b/Linphone/UI/Main/History/ViewModel/StartCallViewModel.swift index 2d920b253..9efe8afe2 100644 --- a/Linphone/UI/Main/History/ViewModel/StartCallViewModel.swift +++ b/Linphone/UI/Main/History/ViewModel/StartCallViewModel.swift @@ -19,6 +19,7 @@ import linphonesw import Combine +import SwiftUI // swiftlint:disable line_length class StartCallViewModel: ObservableObject { diff --git a/Linphone/UI/Main/Meetings/Models/MeetingModel.swift b/Linphone/UI/Main/Meetings/Models/MeetingModel.swift index d363a2dcd..2f63b2cb7 100644 --- a/Linphone/UI/Main/Meetings/Models/MeetingModel.swift +++ b/Linphone/UI/Main/Meetings/Models/MeetingModel.swift @@ -18,6 +18,7 @@ */ import linphonesw +import SwiftUI class MeetingModel: ObservableObject { diff --git a/Linphone/UI/Main/Settings/ViewModel/AccountProfileViewModel.swift b/Linphone/UI/Main/Settings/ViewModel/AccountProfileViewModel.swift index d78c9ed41..a741d5247 100644 --- a/Linphone/UI/Main/Settings/ViewModel/AccountProfileViewModel.swift +++ b/Linphone/UI/Main/Settings/ViewModel/AccountProfileViewModel.swift @@ -18,6 +18,7 @@ */ import linphonesw +import SwiftUI class AccountProfileViewModel: ObservableObject { diff --git a/Linphone/UI/Main/Settings/ViewModel/AccountSettingsViewModel.swift b/Linphone/UI/Main/Settings/ViewModel/AccountSettingsViewModel.swift index 92dfc499b..77b8b3208 100644 --- a/Linphone/UI/Main/Settings/ViewModel/AccountSettingsViewModel.swift +++ b/Linphone/UI/Main/Settings/ViewModel/AccountSettingsViewModel.swift @@ -18,6 +18,7 @@ */ import linphonesw +import SwiftUI class AccountSettingsViewModel: ObservableObject { diff --git a/Linphone/UI/Main/Settings/ViewModel/SettingsViewModel.swift b/Linphone/UI/Main/Settings/ViewModel/SettingsViewModel.swift index 7ac6830d5..61a110e41 100644 --- a/Linphone/UI/Main/Settings/ViewModel/SettingsViewModel.swift +++ b/Linphone/UI/Main/Settings/ViewModel/SettingsViewModel.swift @@ -18,6 +18,7 @@ */ import linphonesw +import SwiftUI class SettingsViewModel: ObservableObject { diff --git a/Linphone/UI/Main/Viewmodel/SharedMainViewModel.swift b/Linphone/UI/Main/Viewmodel/SharedMainViewModel.swift index a6870165e..4a63baf7e 100644 --- a/Linphone/UI/Main/Viewmodel/SharedMainViewModel.swift +++ b/Linphone/UI/Main/Viewmodel/SharedMainViewModel.swift @@ -18,6 +18,7 @@ */ import linphonesw +import SwiftUI class SharedMainViewModel: ObservableObject { diff --git a/Linphone/Utils/Log.swift b/Linphone/Utils/Log.swift index a2351724c..28257cf37 100644 --- a/Linphone/Utils/Log.swift +++ b/Linphone/Utils/Log.swift @@ -96,7 +96,7 @@ class Log: LoggingServiceDelegate { #endif } - func onLogMessageWritten(logService: linphonesw.LoggingService, domain: String, level: linphonesw.LogLevel, message: String) { + func onLogMessageWritten(logService: LoggingService, domain: String, level: LogLevel, message: String) { output(message, level.rawValue, domain) } diff --git a/Linphone/Utils/MagicSearchSingleton.swift b/Linphone/Utils/MagicSearchSingleton.swift index f1d3b25e0..8db271542 100644 --- a/Linphone/Utils/MagicSearchSingleton.swift +++ b/Linphone/Utils/MagicSearchSingleton.swift @@ -19,6 +19,7 @@ import linphonesw import Combine +import SwiftUI final class MagicSearchSingleton: ObservableObject { diff --git a/Linphone.xcodeproj/project.pbxproj b/LinphoneApp.xcodeproj/project.pbxproj similarity index 95% rename from Linphone.xcodeproj/project.pbxproj rename to LinphoneApp.xcodeproj/project.pbxproj index 6b4c665ad..7e16c8174 100644 --- a/Linphone.xcodeproj/project.pbxproj +++ b/LinphoneApp.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 4ED1F0A881A9ACB5977A8987 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; 660AAF7F2B839272004C0FA6 /* msgNotificationService.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 660AAF7B2B839271004C0FA6 /* msgNotificationService.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 660D8A712B517D260092694D /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 660D8A702B517D260092694D /* GoogleService-Info.plist */; }; 6613A0AE2BAEB7DF008923A4 /* MeetingFragment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6613A0AD2BAEB7DF008923A4 /* MeetingFragment.swift */; }; @@ -42,6 +41,8 @@ 66FBFC4B2B83BD7B00BC6AB1 /* CoreExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66C491FA2B24D32600CEA16D /* CoreExtension.swift */; }; 66FDB7812C7C689A00561566 /* EventEditViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66FDB7802C7C689A00561566 /* EventEditViewController.swift */; }; C60E8F192C0F649200A06DB8 /* UIApplicationExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C60E8F182C0F649200A06DB8 /* UIApplicationExtension.swift */; }; + C618BF562D75CA03005A00E0 /* linphonesw in Frameworks */ = {isa = PBXBuildFile; productRef = C618BF552D75CA03005A00E0 /* linphonesw */; }; + C618BF582D75CA0D005A00E0 /* linphonesw in Frameworks */ = {isa = PBXBuildFile; productRef = C618BF572D75CA0D005A00E0 /* linphonesw */; }; C62817282C1B389700DBA646 /* SideMenuAccountRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = C62817272C1B389700DBA646 /* SideMenuAccountRow.swift */; }; C628172E2C1C3A3600DBA646 /* AccountExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C628172D2C1C3A3600DBA646 /* AccountExtension.swift */; }; C62817302C1C3DCC00DBA646 /* AccountModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C628172F2C1C3DCC00DBA646 /* AccountModel.swift */; }; @@ -174,6 +175,11 @@ D7D24D162AC1B4E800C6F35B /* NotoSans-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D7D24D102AC1B4E800C6F35B /* NotoSans-SemiBold.ttf */; }; D7D24D172AC1B4E800C6F35B /* NotoSans-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D7D24D112AC1B4E800C6F35B /* NotoSans-Bold.ttf */; }; D7D24D182AC1B4E800C6F35B /* NotoSans-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D7D24D122AC1B4E800C6F35B /* NotoSans-ExtraBold.ttf */; }; + D7D5AD7F2DD34F0E00016721 /* AppAuth in Frameworks */ = {isa = PBXBuildFile; productRef = D7D5AD7E2DD34F0E00016721 /* AppAuth */; }; + D7D5AD812DD34F1A00016721 /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = D7D5AD802DD34F1A00016721 /* FirebaseAnalytics */; }; + D7D5AD832DD34F2300016721 /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = D7D5AD822DD34F2300016721 /* FirebaseCrashlytics */; }; + D7D5AD852DD34F3700016721 /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = D7D5AD842DD34F3700016721 /* FirebaseAnalytics */; }; + D7D5AD872DD34F3C00016721 /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = D7D5AD862DD34F3C00016721 /* FirebaseCrashlytics */; }; D7DA67622ACCB2FA00E95002 /* LoginFragment.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7DA67612ACCB2FA00E95002 /* LoginFragment.swift */; }; D7DA67642ACCB31700E95002 /* ProfileModeFragment.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7DA67632ACCB31700E95002 /* ProfileModeFragment.swift */; }; D7DC096F2CFA1D7600A6D47C /* AccountProfileFragment.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7DC096E2CFA1D7400A6D47C /* AccountProfileFragment.swift */; }; @@ -281,7 +287,7 @@ D717630C2BD7BD0E00464097 /* ParticipantsListFragment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParticipantsListFragment.swift; sourceTree = ""; }; D717A10D2CEB770D00849D92 /* ShareSheetController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareSheetController.swift; sourceTree = ""; }; D71968912B86369D00DF4459 /* ChatBubbleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatBubbleView.swift; sourceTree = ""; }; - D719ABB32ABC67BF00B41C10 /* Linphone.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Linphone.app; sourceTree = BUILT_PRODUCTS_DIR; }; + D719ABB32ABC67BF00B41C10 /* LinphoneApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LinphoneApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; D719ABB62ABC67BF00B41C10 /* LinphoneApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinphoneApp.swift; sourceTree = ""; }; D719ABB82ABC67BF00B41C10 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; D719ABBA2ABC67BF00B41C10 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -408,6 +414,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D7D5AD872DD34F3C00016721 /* FirebaseCrashlytics in Frameworks */, + D7D5AD852DD34F3700016721 /* FirebaseAnalytics in Frameworks */, + C618BF582D75CA0D005A00E0 /* linphonesw in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -415,7 +424,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4ED1F0A881A9ACB5977A8987 /* BuildFile in Frameworks */, + D7D5AD7F2DD34F0E00016721 /* AppAuth in Frameworks */, + C618BF562D75CA03005A00E0 /* linphonesw in Frameworks */, + D7D5AD832DD34F2300016721 /* FirebaseCrashlytics in Frameworks */, + D7D5AD812DD34F1A00016721 /* FirebaseAnalytics in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -512,13 +524,6 @@ path = Models; sourceTree = ""; }; - A31AF2AB8C6A3D7B7EA3B424 /* Pods */ = { - isa = PBXGroup; - children = ( - ); - path = Pods; - sourceTree = ""; - }; C6A5A9462C10B64A0070FEA4 /* SingleSignOn */ = { isa = PBXGroup; children = ( @@ -571,14 +576,13 @@ D719ABB52ABC67BF00B41C10 /* Linphone */, 660AAF7C2B839272004C0FA6 /* msgNotificationService */, D719ABB42ABC67BF00B41C10 /* Products */, - A31AF2AB8C6A3D7B7EA3B424 /* Pods */, ); sourceTree = ""; }; D719ABB42ABC67BF00B41C10 /* Products */ = { isa = PBXGroup; children = ( - D719ABB32ABC67BF00B41C10 /* Linphone.app */, + D719ABB32ABC67BF00B41C10 /* LinphoneApp.app */, 660AAF7B2B839271004C0FA6 /* msgNotificationService.appex */, ); name = Products; @@ -1019,7 +1023,6 @@ 660AAF772B839271004C0FA6 /* Sources */, 660AAF782B839271004C0FA6 /* Frameworks */, 660AAF792B839271004C0FA6 /* Resources */, - 6677CE082C73D71A0020FD0E /* Crashlytics */, ); buildRules = ( ); @@ -1030,25 +1033,24 @@ productReference = 660AAF7B2B839271004C0FA6 /* msgNotificationService.appex */; productType = "com.apple.product-type.app-extension"; }; - D719ABB22ABC67BF00B41C10 /* Linphone */ = { + D719ABB22ABC67BF00B41C10 /* LinphoneApp */ = { isa = PBXNativeTarget; - buildConfigurationList = D719ABC22ABC67BF00B41C10 /* Build configuration list for PBXNativeTarget "Linphone" */; + buildConfigurationList = D719ABC22ABC67BF00B41C10 /* Build configuration list for PBXNativeTarget "LinphoneApp" */; buildPhases = ( D719ABAF2ABC67BF00B41C10 /* Sources */, D719ABB02ABC67BF00B41C10 /* Frameworks */, 660AAF802B839272004C0FA6 /* Embed Foundation Extensions */, D719ABB12ABC67BF00B41C10 /* Resources */, - D7FB55122AD53FE200A5AB15 /* Run Script */, - 66BF2D4B2B558A3100A5F2E3 /* Crashlytics */, + D72F04F52DDB2CB800F4C713 /* ShellScript */, ); buildRules = ( ); dependencies = ( 660AAF7E2B839272004C0FA6 /* PBXTargetDependency */, ); - name = Linphone; + name = LinphoneApp; productName = Linphone; - productReference = D719ABB32ABC67BF00B41C10 /* Linphone.app */; + productReference = D719ABB32ABC67BF00B41C10 /* LinphoneApp.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -1070,7 +1072,7 @@ }; }; }; - buildConfigurationList = D719ABAE2ABC67BF00B41C10 /* Build configuration list for PBXProject "Linphone" */; + buildConfigurationList = D719ABAE2ABC67BF00B41C10 /* Build configuration list for PBXProject "LinphoneApp" */; compatibilityVersion = "Xcode 14.0"; developmentRegion = en; hasScannedForEncodings = 0; @@ -1080,11 +1082,16 @@ fr, ); mainGroup = D719ABAA2ABC67BF00B41C10; + packageReferences = ( + C618BF542D75CA03005A00E0 /* XCRemoteSwiftPackageReference "linphone-sdk-swift-ios" */, + D7D5AD7B2DD34E4D00016721 /* XCRemoteSwiftPackageReference "AppAuth-iOS" */, + D7D5AD7C2DD34E7C00016721 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, + ); productRefGroup = D719ABB42ABC67BF00B41C10 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - D719ABB22ABC67BF00B41C10 /* Linphone */, + D719ABB22ABC67BF00B41C10 /* LinphoneApp */, 660AAF7A2B839271004C0FA6 /* msgNotificationService */, ); }; @@ -1125,72 +1132,22 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 6677CE082C73D71A0020FD0E /* Crashlytics */ = { + D72F04F52DDB2CB800F4C713 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( ); inputPaths = ( - "${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}", - "${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${PRODUCT_NAME}", - "${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Info.plist", - "$(TARGET_BUILD_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/GoogleService-Info.plist", - "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)", ); - name = Crashlytics; outputFileListPaths = ( ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "val=`expr \"$GCC_PREPROCESSOR_DEFINITIONS\" : \".*USE_CRASHLYTICS=\\([0-9]*\\)\"`\nif [ $val = 1 ]; then\n ${PODS_ROOT}/FirebaseCrashlytics/run\nfi\n"; - }; - 66BF2D4B2B558A3100A5F2E3 /* Crashlytics */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}", - "${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${PRODUCT_NAME}", - "${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Info.plist", - "$(TARGET_BUILD_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/GoogleService-Info.plist", - "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)", - ); - name = Crashlytics; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "val=`expr \"$GCC_PREPROCESSOR_DEFINITIONS\" : \".*USE_CRASHLYTICS=\\([0-9]*\\)\"`\nif [ $val = 1 ]; then\n ${PODS_ROOT}/FirebaseCrashlytics/run\nfi\n\n"; - }; - D7FB55122AD53FE200A5AB15 /* Run Script */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 12; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "Run Script"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "if [[ \"$(uname -m)\" == arm64 ]]; then\n export PATH=\"/opt/homebrew/bin:$PATH\"\nfi\n\nif which swiftlint > /dev/null; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n"; + shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n\"${BUILD_DIR%/Build/*}/SourcePackages/checkouts/firebase-ios-sdk/Crashlytics/run\"\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -1406,7 +1363,7 @@ CODE_SIGN_ENTITLEMENTS = msgNotificationService/msgNotificationService.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 73; + CURRENT_PROJECT_VERSION = 74; DEVELOPMENT_TEAM = Z2V957B3D6; ENABLE_USER_SCRIPT_SANDBOXING = NO; GCC_C_LANGUAGE_STANDARD = gnu17; @@ -1449,7 +1406,7 @@ CODE_SIGN_ENTITLEMENTS = msgNotificationService/msgNotificationService.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 73; + CURRENT_PROJECT_VERSION = 74; DEVELOPMENT_TEAM = Z2V957B3D6; ENABLE_USER_SCRIPT_SANDBOXING = NO; GCC_C_LANGUAGE_STANDARD = gnu17; @@ -1515,7 +1472,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; + COPY_PHASE_STRIP = YES; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -1538,6 +1495,7 @@ MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = LinphoneApp; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; @@ -1576,7 +1534,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; + COPY_PHASE_STRIP = YES; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; @@ -1592,6 +1550,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; + PRODUCT_NAME = LinphoneApp; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; }; @@ -1606,7 +1565,7 @@ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; CODE_SIGN_ENTITLEMENTS = Linphone/Linphone.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 73; + CURRENT_PROJECT_VERSION = 74; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = "\"Linphone/Preview Content\""; @@ -1666,7 +1625,7 @@ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; CODE_SIGN_ENTITLEMENTS = Linphone/Linphone.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 73; + CURRENT_PROJECT_VERSION = 74; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"Linphone/Preview Content\""; DEVELOPMENT_TEAM = Z2V957B3D6; @@ -1727,7 +1686,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - D719ABAE2ABC67BF00B41C10 /* Build configuration list for PBXProject "Linphone" */ = { + D719ABAE2ABC67BF00B41C10 /* Build configuration list for PBXProject "LinphoneApp" */ = { isa = XCConfigurationList; buildConfigurations = ( D719ABC02ABC67BF00B41C10 /* Debug */, @@ -1736,7 +1695,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - D719ABC22ABC67BF00B41C10 /* Build configuration list for PBXNativeTarget "Linphone" */ = { + D719ABC22ABC67BF00B41C10 /* Build configuration list for PBXNativeTarget "LinphoneApp" */ = { isa = XCConfigurationList; buildConfigurations = ( D719ABC32ABC67BF00B41C10 /* Debug */, @@ -1746,6 +1705,71 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + C618BF542D75CA03005A00E0 /* XCRemoteSwiftPackageReference "linphone-sdk-swift-ios" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://gitlab.linphone.org/BC/public/linphone-sdk-swift-ios.git"; + requirement = { + branch = stable; + kind = branch; + }; + }; + D7D5AD7B2DD34E4D00016721 /* XCRemoteSwiftPackageReference "AppAuth-iOS" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/openid/AppAuth-iOS.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 2.0.0; + }; + }; + D7D5AD7C2DD34E7C00016721 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 11.12.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + C618BF552D75CA03005A00E0 /* linphonesw */ = { + isa = XCSwiftPackageProductDependency; + package = C618BF542D75CA03005A00E0 /* XCRemoteSwiftPackageReference "linphone-sdk-swift-ios" */; + productName = linphonesw; + }; + C618BF572D75CA0D005A00E0 /* linphonesw */ = { + isa = XCSwiftPackageProductDependency; + package = C618BF542D75CA03005A00E0 /* XCRemoteSwiftPackageReference "linphone-sdk-swift-ios" */; + productName = linphonesw; + }; + D7D5AD7E2DD34F0E00016721 /* AppAuth */ = { + isa = XCSwiftPackageProductDependency; + package = D7D5AD7B2DD34E4D00016721 /* XCRemoteSwiftPackageReference "AppAuth-iOS" */; + productName = AppAuth; + }; + D7D5AD802DD34F1A00016721 /* FirebaseAnalytics */ = { + isa = XCSwiftPackageProductDependency; + package = D7D5AD7C2DD34E7C00016721 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseAnalytics; + }; + D7D5AD822DD34F2300016721 /* FirebaseCrashlytics */ = { + isa = XCSwiftPackageProductDependency; + package = D7D5AD7C2DD34E7C00016721 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseCrashlytics; + }; + D7D5AD842DD34F3700016721 /* FirebaseAnalytics */ = { + isa = XCSwiftPackageProductDependency; + package = D7D5AD7C2DD34E7C00016721 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseAnalytics; + }; + D7D5AD862DD34F3C00016721 /* FirebaseCrashlytics */ = { + isa = XCSwiftPackageProductDependency; + package = D7D5AD7C2DD34E7C00016721 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseCrashlytics; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = D719ABAB2ABC67BF00B41C10 /* Project object */; } diff --git a/Linphone.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/LinphoneApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from Linphone.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to LinphoneApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/Linphone.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/LinphoneApp.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from Linphone.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to LinphoneApp.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/LinphoneApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/LinphoneApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 000000000..25acacce3 --- /dev/null +++ b/LinphoneApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,141 @@ +{ + "originHash" : "5293adb495d47691babe33d739eb8e74cee00c05a442b57ef6079701fee324f1", + "pins" : [ + { + "identity" : "abseil-cpp-binary", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/abseil-cpp-binary.git", + "state" : { + "revision" : "bbe8b69694d7873315fd3a4ad41efe043e1c07c5", + "version" : "1.2024072200.0" + } + }, + { + "identity" : "app-check", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/app-check.git", + "state" : { + "revision" : "61b85103a1aeed8218f17c794687781505fbbef5", + "version" : "11.2.0" + } + }, + { + "identity" : "appauth-ios", + "kind" : "remoteSourceControl", + "location" : "https://github.com/openid/AppAuth-iOS.git", + "state" : { + "revision" : "145104f5ea9d58ae21b60add007c33c1cc0c948e", + "version" : "2.0.0" + } + }, + { + "identity" : "firebase-ios-sdk", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/firebase-ios-sdk.git", + "state" : { + "revision" : "fbd463894af94d90eb4d6a4e54080459a8179519", + "version" : "11.12.0" + } + }, + { + "identity" : "googleappmeasurement", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/GoogleAppMeasurement.git", + "state" : { + "revision" : "f7460ea630bddf172115c28493ae8b3798d95ce3", + "version" : "11.12.0" + } + }, + { + "identity" : "googledatatransport", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/GoogleDataTransport.git", + "state" : { + "revision" : "617af071af9aa1d6a091d59a202910ac482128f9", + "version" : "10.1.0" + } + }, + { + "identity" : "googleutilities", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/GoogleUtilities.git", + "state" : { + "revision" : "60da361632d0de02786f709bdc0c4df340f7613e", + "version" : "8.1.0" + } + }, + { + "identity" : "grpc-binary", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/grpc-binary.git", + "state" : { + "revision" : "cc0001a0cf963aa40501d9c2b181e7fc9fd8ec71", + "version" : "1.69.0" + } + }, + { + "identity" : "gtm-session-fetcher", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/gtm-session-fetcher.git", + "state" : { + "revision" : "c756a29784521063b6a1202907e2cc47f41b667c", + "version" : "4.5.0" + } + }, + { + "identity" : "interop-ios-for-google-sdks", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/interop-ios-for-google-sdks.git", + "state" : { + "revision" : "040d087ac2267d2ddd4cca36c757d1c6a05fdbfe", + "version" : "101.0.0" + } + }, + { + "identity" : "leveldb", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/leveldb.git", + "state" : { + "revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1", + "version" : "1.22.5" + } + }, + { + "identity" : "linphone-sdk-swift-ios", + "kind" : "remoteSourceControl", + "location" : "https://gitlab.linphone.org/BC/public/linphone-sdk-swift-ios.git", + "state" : { + "branch" : "stable", + "revision" : "8ad69fc6e52277446458f2f067533895246e1edf" + } + }, + { + "identity" : "nanopb", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/nanopb.git", + "state" : { + "revision" : "b7e1104502eca3a213b46303391ca4d3bc8ddec1", + "version" : "2.30910.0" + } + }, + { + "identity" : "promises", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/promises.git", + "state" : { + "revision" : "540318ecedd63d883069ae7f1ed811a2df00b6ac", + "version" : "2.4.0" + } + }, + { + "identity" : "swift-protobuf", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-protobuf.git", + "state" : { + "revision" : "d72aed98f8253ec1aa9ea1141e28150f408cf17f", + "version" : "1.29.0" + } + } + ], + "version" : 3 +} diff --git a/Linphone.xcodeproj/xcshareddata/xcschemes/Linphone.xcscheme b/LinphoneApp.xcodeproj/xcshareddata/xcschemes/Linphone.xcscheme similarity index 83% rename from Linphone.xcodeproj/xcshareddata/xcschemes/Linphone.xcscheme rename to LinphoneApp.xcodeproj/xcshareddata/xcschemes/Linphone.xcscheme index f5986b566..1b4ab3ccf 100644 --- a/Linphone.xcodeproj/xcshareddata/xcschemes/Linphone.xcscheme +++ b/LinphoneApp.xcodeproj/xcshareddata/xcschemes/Linphone.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "LinphoneApp.app" + BlueprintName = "LinphoneApp" + ReferencedContainer = "container:LinphoneApp.xcodeproj"> @@ -44,9 +44,9 @@ + BuildableName = "LinphoneApp.app" + BlueprintName = "LinphoneApp" + ReferencedContainer = "container:LinphoneApp.xcodeproj"> @@ -61,9 +61,9 @@ + BuildableName = "LinphoneApp.app" + BlueprintName = "LinphoneApp" + ReferencedContainer = "container:LinphoneApp.xcodeproj"> diff --git a/Podfile b/Podfile deleted file mode 100644 index 196e3f81f..000000000 --- a/Podfile +++ /dev/null @@ -1,75 +0,0 @@ -# Uncomment the next line to define a global platform for your project -platform :ios, '15.0' -source "https://gitlab.linphone.org/BC/public/podspec.git" -source "https://github.com/CocoaPods/Specs.git" - -def basic_pods - if ENV['PODFILE_PATH'].nil? - pod 'linphone-sdk', '~> 5.4.0-alpha' - else - pod 'linphone-sdk', :path => ENV['PODFILE_PATH'] # local sdk - end - - crashlytics -end - -def crashlytics - if not ENV['USE_CRASHLYTICS'].nil? - pod 'Firebase/Analytics' - pod 'Firebase/Crashlytics' - end -end - -target 'Linphone' do - # Comment the next line if you don't want to use dynamic frameworks - use_frameworks! - - # Pods for Linphone - pod 'SwiftLint' - pod 'AppAuth' - basic_pods - -end - -target 'msgNotificationService' do - # Uncomment the next line if you're using Swift or would like to use dynamic frameworks - use_frameworks! - - # Pods for messagesNotification - basic_pods - -end - -post_install do |installer| - app_project = Xcodeproj::Project.open(Dir.glob("*.xcodeproj")[0]) - app_project.native_targets.each do |target| - target.build_configurations.each do |config| - if target.name == "Linphone" || target.name == 'msgNotificationService' || target.name == 'msgNotificationContent' - if ENV['USE_CRASHLYTICS'].nil? - if config.name == "Debug" then - config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) DEBUG=1' - else - config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited)' - end - config.build_settings['OTHER_SWIFT_FLAGS'] = '$(inherited)' - else - # activate crashlytics - if config.name == "Debug" then - config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) DEBUG=1 USE_CRASHLYTICS=1' - else - config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) USE_CRASHLYTICS=1' - end - config.build_settings['OTHER_SWIFT_FLAGS'] = '$(inherited) -DUSE_CRASHLYTICS' - end - end - - app_project.save - end - end - installer.pods_project.targets.each do |target| - target.build_configurations.each do |config| - config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '15.0' - end - end -end - diff --git a/msgNotificationService/GoogleService-Info.plist b/msgNotificationService/GoogleService-Info.plist index b493c102e..82ef7bb8f 100644 --- a/msgNotificationService/GoogleService-Info.plist +++ b/msgNotificationService/GoogleService-Info.plist @@ -17,7 +17,7 @@ PROJECT_ID linphone-iphone STORAGE_BUCKET - linphone-iphone.appspot.com + linphone-iphone.firebasestorage.app IS_ADS_ENABLED IS_ANALYTICS_ENABLED