From 03bd42d7504e5352a699b25946f69ecff762e7a8 Mon Sep 17 00:00:00 2001 From: Christophe Deschamps Date: Mon, 3 Mar 2025 13:53:24 +0100 Subject: [PATCH 1/9] Move from Pod to SPM for linphone-sdk --- Linphone.xcodeproj/project.pbxproj | 39 +++++++++++++++++-- .../xcshareddata/xcschemes/Linphone.xcscheme | 6 +-- Linphone/Core/CoreContext.swift | 1 + .../Viewmodel/RegisterViewModel.swift | 1 + .../Call/Model/CallMediaEncryptionModel.swift | 1 + Linphone/UI/Call/Model/CallStatsModel.swift | 1 + Linphone/UI/Call/Model/ParticipantModel.swift | 1 + .../UI/Call/ViewModel/CallViewModel.swift | 1 + .../Contacts/ViewModel/ContactViewModel.swift | 1 + .../ViewModel/ContactsListViewModel.swift | 1 + .../ViewModel/EditContactViewModel.swift | 1 + .../FavoriteContactsListViewModel.swift | 1 + .../ConversationForwardMessageViewModel.swift | 1 + .../ConversationsListViewModel.swift | 1 + .../StartConversationViewModel.swift | 1 + .../Main/Help/ViewModel/HelpViewModel.swift | 1 + .../ViewModel/HistoryListViewModel.swift | 1 + .../ViewModel/StartCallViewModel.swift | 1 + .../Main/Meetings/Models/MeetingModel.swift | 1 + .../ViewModel/AccountProfileViewModel.swift | 1 + .../ViewModel/AccountSettingsViewModel.swift | 1 + .../ViewModel/SettingsViewModel.swift | 1 + .../Main/Viewmodel/SharedMainViewModel.swift | 1 + Linphone/Utils/Log.swift | 2 +- Linphone/Utils/MagicSearchSingleton.swift | 1 + Podfile | 6 --- 26 files changed, 61 insertions(+), 14 deletions(-) diff --git a/Linphone.xcodeproj/project.pbxproj b/Linphone.xcodeproj/project.pbxproj index 3d03fb826..d19a401d5 100644 --- a/Linphone.xcodeproj/project.pbxproj +++ b/Linphone.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 4ED1F0A881A9ACB5977A8987 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + 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 */; }; @@ -43,6 +43,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 */; }; @@ -405,6 +407,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + C618BF582D75CA0D005A00E0 /* linphonesw in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -412,7 +415,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4ED1F0A881A9ACB5977A8987 /* (null) in Frameworks */, + C618BF562D75CA03005A00E0 /* linphonesw in Frameworks */, + 4ED1F0A881A9ACB5977A8987 /* BuildFile in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1066,7 +1070,7 @@ }; }; }; - buildConfigurationList = D719ABAE2ABC67BF00B41C10 /* Build configuration list for PBXProject "Linphone" */; + buildConfigurationList = D719ABAE2ABC67BF00B41C10 /* Build configuration list for PBXProject "linphone" */; compatibilityVersion = "Xcode 14.0"; developmentRegion = en; hasScannedForEncodings = 0; @@ -1075,6 +1079,9 @@ Base, ); mainGroup = D719ABAA2ABC67BF00B41C10; + packageReferences = ( + C618BF542D75CA03005A00E0 /* XCRemoteSwiftPackageReference "linphone-sdk-swift-ios" */, + ); productRefGroup = D719ABB42ABC67BF00B41C10 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -1709,7 +1716,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - D719ABAE2ABC67BF00B41C10 /* Build configuration list for PBXProject "Linphone" */ = { + D719ABAE2ABC67BF00B41C10 /* Build configuration list for PBXProject "linphone" */ = { isa = XCConfigurationList; buildConfigurations = ( D719ABC02ABC67BF00B41C10 /* Debug */, @@ -1728,6 +1735,30 @@ 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 = beta; + kind = branch; + }; + }; +/* 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; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = D719ABAB2ABC67BF00B41C10 /* Project object */; } diff --git a/Linphone.xcodeproj/xcshareddata/xcschemes/Linphone.xcscheme b/Linphone.xcodeproj/xcshareddata/xcschemes/Linphone.xcscheme index f5986b566..6c21053ec 100644 --- a/Linphone.xcodeproj/xcshareddata/xcschemes/Linphone.xcscheme +++ b/Linphone.xcodeproj/xcshareddata/xcschemes/Linphone.xcscheme @@ -17,7 +17,7 @@ BlueprintIdentifier = "D719ABB22ABC67BF00B41C10" BuildableName = "Linphone.app" BlueprintName = "Linphone" - ReferencedContainer = "container:Linphone.xcodeproj"> + ReferencedContainer = "container:linphone.xcodeproj"> @@ -46,7 +46,7 @@ BlueprintIdentifier = "D719ABB22ABC67BF00B41C10" BuildableName = "Linphone.app" BlueprintName = "Linphone" - ReferencedContainer = "container:Linphone.xcodeproj"> + ReferencedContainer = "container:linphone.xcodeproj"> @@ -63,7 +63,7 @@ BlueprintIdentifier = "D719ABB22ABC67BF00B41C10" BuildableName = "Linphone.app" BlueprintName = "Linphone" - ReferencedContainer = "container:Linphone.xcodeproj"> + ReferencedContainer = "container:linphone.xcodeproj"> diff --git a/Linphone/Core/CoreContext.swift b/Linphone/Core/CoreContext.swift index f01e2f2ac..275a64c19 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 e6ca80fbe..d5476194a 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 71b303f3b..64c0f8d00 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 588994bcf..721107cfe 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/Podfile b/Podfile index 196e3f81f..68caea8e4 100644 --- a/Podfile +++ b/Podfile @@ -4,12 +4,6 @@ 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 From 0179c12b073aab735d1bd343e89a405f0cbcd7a6 Mon Sep 17 00:00:00 2001 From: Christophe Deschamps Date: Tue, 25 Mar 2025 16:42:27 +0100 Subject: [PATCH 2/9] Moved to SPM stable branch (release/5.4 sdk) --- Linphone.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Linphone.xcodeproj/project.pbxproj b/Linphone.xcodeproj/project.pbxproj index d19a401d5..c2211630b 100644 --- a/Linphone.xcodeproj/project.pbxproj +++ b/Linphone.xcodeproj/project.pbxproj @@ -1741,7 +1741,7 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://gitlab.linphone.org/BC/public/linphone-sdk-swift-ios.git"; requirement = { - branch = beta; + branch = stable; kind = branch; }; }; From 9c2ce60b047c673c5891926888a1b221b778be9e Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Tue, 13 May 2025 15:23:17 +0200 Subject: [PATCH 3/9] Use Swift Package Manager instead Cocoapods --- Linphone.xcodeproj/project.pbxproj | 119 +++++++-------- .../xcshareddata/swiftpm/Package.resolved | 141 ++++++++++++++++++ .../xcshareddata/xcschemes/Linphone.xcscheme | 6 +- Podfile | 69 --------- 4 files changed, 201 insertions(+), 134 deletions(-) create mode 100644 Linphone.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved delete mode 100644 Podfile diff --git a/Linphone.xcodeproj/project.pbxproj b/Linphone.xcodeproj/project.pbxproj index c2211630b..e4bab3e80 100644 --- a/Linphone.xcodeproj/project.pbxproj +++ b/Linphone.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 4ED1F0A881A9ACB5977A8987 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; + 4ED1F0A881A9ACB5977A8987 /* (null) 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 */; }; @@ -176,6 +176,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 */; }; @@ -407,6 +412,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D7D5AD872DD34F3C00016721 /* FirebaseCrashlytics in Frameworks */, + D7D5AD852DD34F3700016721 /* FirebaseAnalytics in Frameworks */, C618BF582D75CA0D005A00E0 /* linphonesw in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -415,8 +422,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D7D5AD7F2DD34F0E00016721 /* AppAuth in Frameworks */, C618BF562D75CA03005A00E0 /* linphonesw in Frameworks */, - 4ED1F0A881A9ACB5977A8987 /* BuildFile in Frameworks */, + D7D5AD832DD34F2300016721 /* FirebaseCrashlytics in Frameworks */, + D7D5AD812DD34F1A00016721 /* FirebaseAnalytics in Frameworks */, + 4ED1F0A881A9ACB5977A8987 /* (null) in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -513,13 +523,6 @@ path = Models; sourceTree = ""; }; - A31AF2AB8C6A3D7B7EA3B424 /* Pods */ = { - isa = PBXGroup; - children = ( - ); - path = Pods; - sourceTree = ""; - }; C6A5A9462C10B64A0070FEA4 /* SingleSignOn */ = { isa = PBXGroup; children = ( @@ -571,7 +574,6 @@ D719ABB52ABC67BF00B41C10 /* Linphone */, 660AAF7C2B839272004C0FA6 /* msgNotificationService */, D719ABB42ABC67BF00B41C10 /* Products */, - A31AF2AB8C6A3D7B7EA3B424 /* Pods */, ); sourceTree = ""; }; @@ -1019,7 +1021,6 @@ 660AAF772B839271004C0FA6 /* Sources */, 660AAF782B839271004C0FA6 /* Frameworks */, 660AAF792B839271004C0FA6 /* Resources */, - 6677CE082C73D71A0020FD0E /* Crashlytics */, ); buildRules = ( ); @@ -1039,7 +1040,6 @@ 660AAF802B839272004C0FA6 /* Embed Foundation Extensions */, D719ABB12ABC67BF00B41C10 /* Resources */, D7FB55122AD53FE200A5AB15 /* Run Script */, - 66BF2D4B2B558A3100A5F2E3 /* Crashlytics */, ); buildRules = ( ); @@ -1070,7 +1070,7 @@ }; }; }; - buildConfigurationList = D719ABAE2ABC67BF00B41C10 /* Build configuration list for PBXProject "linphone" */; + buildConfigurationList = D719ABAE2ABC67BF00B41C10 /* Build configuration list for PBXProject "Linphone" */; compatibilityVersion = "Xcode 14.0"; developmentRegion = en; hasScannedForEncodings = 0; @@ -1081,6 +1081,8 @@ mainGroup = D719ABAA2ABC67BF00B41C10; packageReferences = ( C618BF542D75CA03005A00E0 /* XCRemoteSwiftPackageReference "linphone-sdk-swift-ios" */, + D7D5AD7B2DD34E4D00016721 /* XCRemoteSwiftPackageReference "AppAuth-iOS" */, + D7D5AD7C2DD34E7C00016721 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, ); productRefGroup = D719ABB42ABC67BF00B41C10 /* Products */; projectDirPath = ""; @@ -1127,54 +1129,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 6677CE082C73D71A0020FD0E /* 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"; - }; - 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; @@ -1716,7 +1670,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - D719ABAE2ABC67BF00B41C10 /* Build configuration list for PBXProject "linphone" */ = { + D719ABAE2ABC67BF00B41C10 /* Build configuration list for PBXProject "Linphone" */ = { isa = XCConfigurationList; buildConfigurations = ( D719ABC02ABC67BF00B41C10 /* Debug */, @@ -1745,6 +1699,22 @@ 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 */ @@ -1758,6 +1728,31 @@ 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/xcshareddata/swiftpm/Package.resolved b/Linphone.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 000000000..9a775bc30 --- /dev/null +++ b/Linphone.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,141 @@ +{ + "originHash" : "e39a18fba1473ec1dc31402001b017593f3d3d95f4752f193a0b73b2eb6dd0d9", + "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/Linphone.xcodeproj/xcshareddata/xcschemes/Linphone.xcscheme index 6c21053ec..f5986b566 100644 --- a/Linphone.xcodeproj/xcshareddata/xcschemes/Linphone.xcscheme +++ b/Linphone.xcodeproj/xcshareddata/xcschemes/Linphone.xcscheme @@ -17,7 +17,7 @@ BlueprintIdentifier = "D719ABB22ABC67BF00B41C10" BuildableName = "Linphone.app" BlueprintName = "Linphone" - ReferencedContainer = "container:linphone.xcodeproj"> + ReferencedContainer = "container:Linphone.xcodeproj"> @@ -46,7 +46,7 @@ BlueprintIdentifier = "D719ABB22ABC67BF00B41C10" BuildableName = "Linphone.app" BlueprintName = "Linphone" - ReferencedContainer = "container:linphone.xcodeproj"> + ReferencedContainer = "container:Linphone.xcodeproj"> @@ -63,7 +63,7 @@ BlueprintIdentifier = "D719ABB22ABC67BF00B41C10" BuildableName = "Linphone.app" BlueprintName = "Linphone" - ReferencedContainer = "container:linphone.xcodeproj"> + ReferencedContainer = "container:Linphone.xcodeproj"> diff --git a/Podfile b/Podfile deleted file mode 100644 index 68caea8e4..000000000 --- a/Podfile +++ /dev/null @@ -1,69 +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 - 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 - From de03c3e7595587a5299e2d312583f91f96e07a29 Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Tue, 13 May 2025 16:28:49 +0200 Subject: [PATCH 4/9] Update .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 7226bb73f..d3a513d82 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,6 @@ xcuserdata/ Pods/ .DS_Store build +GoogleService-Info.plist +msgNotificationService/GoogleService-Info.plist Linphone.xcodeproj/xcuserdata \ No newline at end of file From db437bccf36d0c024dce5f16ac3b4973d2b8e8c5 Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Tue, 13 May 2025 16:14:54 +0000 Subject: [PATCH 5/9] Update GoogleService-Info.plist --- GoogleService-Info.plist | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/GoogleService-Info.plist b/GoogleService-Info.plist index f996be8f2..721a7983f 100644 --- a/GoogleService-Info.plist +++ b/GoogleService-Info.plist @@ -1,36 +1 @@ - - - - - CLIENT_ID - 221368768663-0ufgu96cel0auk4v0me863lgm252b9n2.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.221368768663-0ufgu96cel0auk4v0me863lgm252b9n2 - API_KEY - AIzaSyDJTtlRCM7IqdVUU2dSIYq2YIsTz6bqnkI - GCM_SENDER_ID - 221368768663 - PLIST_VERSION - 1 - BUNDLE_ID - org.linphone.phone - PROJECT_ID - linphone-iphone - STORAGE_BUCKET - linphone-iphone.appspot.com - 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 - - +// Replace with your own GoogleService-Info.plist From c8dc64b7fdacdb6dbe05314bfcfa5a58a0fed2aa Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Tue, 13 May 2025 16:15:40 +0000 Subject: [PATCH 6/9] Update msgNotificationService/GoogleService-Info.plist --- .../GoogleService-Info.plist | 37 +------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/msgNotificationService/GoogleService-Info.plist b/msgNotificationService/GoogleService-Info.plist index b493c102e..721a7983f 100644 --- a/msgNotificationService/GoogleService-Info.plist +++ b/msgNotificationService/GoogleService-Info.plist @@ -1,36 +1 @@ - - - - - CLIENT_ID - 221368768663-b8e48em01it3pt04vp1k0ddrgrcrju65.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.221368768663-b8e48em01it3pt04vp1k0ddrgrcrju65 - API_KEY - AIzaSyDJTtlRCM7IqdVUU2dSIYq2YIsTz6bqnkI - GCM_SENDER_ID - 221368768663 - PLIST_VERSION - 1 - BUNDLE_ID - org.linphone.phone.msgNotificationService - PROJECT_ID - linphone-iphone - STORAGE_BUCKET - linphone-iphone.appspot.com - IS_ADS_ENABLED - - IS_ANALYTICS_ENABLED - - IS_APPINVITE_ENABLED - - IS_GCM_ENABLED - - IS_SIGNIN_ENABLED - - GOOGLE_APP_ID - 1:221368768663:ios:ccf2c32eadcd3a0f9431d2 - DATABASE_URL - https://linphone-iphone.firebaseio.com - - \ No newline at end of file +// Replace with your own GoogleService-Info.plist From dd4284162c3387f761ba3512fb5df9094a079986 Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Mon, 19 May 2025 11:20:16 +0200 Subject: [PATCH 7/9] Fix Swift Package Manager Change App name to LinphoneApp Update build version to (74) --- .../project.pbxproj | 44 +++++++++---------- .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcshareddata/swiftpm/Package.resolved | 2 +- .../xcshareddata/xcschemes/Linphone.xcscheme | 18 ++++---- 5 files changed, 32 insertions(+), 32 deletions(-) rename {Linphone.xcodeproj => LinphoneApp.xcodeproj}/project.pbxproj (99%) rename {Linphone.xcodeproj => LinphoneApp.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (100%) rename {Linphone.xcodeproj => LinphoneApp.xcodeproj}/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename {Linphone.xcodeproj => LinphoneApp.xcodeproj}/project.xcworkspace/xcshareddata/swiftpm/Package.resolved (98%) rename {Linphone.xcodeproj => LinphoneApp.xcodeproj}/xcshareddata/xcschemes/Linphone.xcscheme (83%) diff --git a/Linphone.xcodeproj/project.pbxproj b/LinphoneApp.xcodeproj/project.pbxproj similarity index 99% rename from Linphone.xcodeproj/project.pbxproj rename to LinphoneApp.xcodeproj/project.pbxproj index e4bab3e80..4bdcb3e74 100644 --- a/Linphone.xcodeproj/project.pbxproj +++ b/LinphoneApp.xcodeproj/project.pbxproj @@ -287,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 = ""; }; @@ -580,7 +580,7 @@ D719ABB42ABC67BF00B41C10 /* Products */ = { isa = PBXGroup; children = ( - D719ABB32ABC67BF00B41C10 /* Linphone.app */, + D719ABB32ABC67BF00B41C10 /* LinphoneApp.app */, 660AAF7B2B839271004C0FA6 /* msgNotificationService.appex */, ); name = Products; @@ -1031,24 +1031,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 */, + 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 +1070,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; @@ -1088,7 +1088,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - D719ABB22ABC67BF00B41C10 /* Linphone */, + D719ABB22ABC67BF00B41C10 /* LinphoneApp */, 660AAF7A2B839271004C0FA6 /* msgNotificationService */, ); }; @@ -1129,24 +1129,22 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - D7FB55122AD53FE200A5AB15 /* Run Script */ = { + D72F04F52DDB2CB800F4C713 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 12; + buildActionMask = 2147483647; 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 */ @@ -1349,7 +1347,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; @@ -1392,7 +1390,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; @@ -1458,7 +1456,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; @@ -1481,6 +1479,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"; }; @@ -1519,7 +1518,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; @@ -1535,6 +1534,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"; }; @@ -1549,7 +1549,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\""; @@ -1609,7 +1609,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; @@ -1670,7 +1670,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - D719ABAE2ABC67BF00B41C10 /* Build configuration list for PBXProject "Linphone" */ = { + D719ABAE2ABC67BF00B41C10 /* Build configuration list for PBXProject "LinphoneApp" */ = { isa = XCConfigurationList; buildConfigurations = ( D719ABC02ABC67BF00B41C10 /* Debug */, @@ -1679,7 +1679,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - D719ABC22ABC67BF00B41C10 /* Build configuration list for PBXNativeTarget "Linphone" */ = { + D719ABC22ABC67BF00B41C10 /* Build configuration list for PBXNativeTarget "LinphoneApp" */ = { isa = XCConfigurationList; buildConfigurations = ( D719ABC32ABC67BF00B41C10 /* Debug */, 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/Linphone.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/LinphoneApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved similarity index 98% rename from Linphone.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved rename to LinphoneApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 9a775bc30..25acacce3 100644 --- a/Linphone.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/LinphoneApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "e39a18fba1473ec1dc31402001b017593f3d3d95f4752f193a0b73b2eb6dd0d9", + "originHash" : "5293adb495d47691babe33d739eb8e74cee00c05a442b57ef6079701fee324f1", "pins" : [ { "identity" : "abseil-cpp-binary", 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"> From 90d79c01dbdde700dc412d1ac00aee12aa498fc9 Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Mon, 19 May 2025 13:25:28 +0200 Subject: [PATCH 8/9] Untrack GoogleService-Info.plist files --- GoogleService-Info.plist | 1 - msgNotificationService/GoogleService-Info.plist | 1 - 2 files changed, 2 deletions(-) delete mode 100644 GoogleService-Info.plist delete mode 100644 msgNotificationService/GoogleService-Info.plist diff --git a/GoogleService-Info.plist b/GoogleService-Info.plist deleted file mode 100644 index 721a7983f..000000000 --- a/GoogleService-Info.plist +++ /dev/null @@ -1 +0,0 @@ -// Replace with your own GoogleService-Info.plist diff --git a/msgNotificationService/GoogleService-Info.plist b/msgNotificationService/GoogleService-Info.plist deleted file mode 100644 index 721a7983f..000000000 --- a/msgNotificationService/GoogleService-Info.plist +++ /dev/null @@ -1 +0,0 @@ -// Replace with your own GoogleService-Info.plist From 323987f1d9d7ff9a18a016374304eba1895a72e3 Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Mon, 19 May 2025 13:38:49 +0200 Subject: [PATCH 9/9] Restore GoogleService-Info.plist files and remove them from .gitignore --- .gitignore | 2 -- GoogleService-Info.plist | 36 +++++++++++++++++++ .../GoogleService-Info.plist | 36 +++++++++++++++++++ 3 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 GoogleService-Info.plist create mode 100644 msgNotificationService/GoogleService-Info.plist diff --git a/.gitignore b/.gitignore index d3a513d82..7226bb73f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,4 @@ xcuserdata/ Pods/ .DS_Store build -GoogleService-Info.plist -msgNotificationService/GoogleService-Info.plist Linphone.xcodeproj/xcuserdata \ No newline at end of file diff --git a/GoogleService-Info.plist b/GoogleService-Info.plist new file mode 100644 index 000000000..1f91965cb --- /dev/null +++ b/GoogleService-Info.plist @@ -0,0 +1,36 @@ + + + + + CLIENT_ID + 221368768663-0ufgu96cel0auk4v0me863lgm252b9n2.apps.googleusercontent.com + REVERSED_CLIENT_ID + com.googleusercontent.apps.221368768663-0ufgu96cel0auk4v0me863lgm252b9n2 + API_KEY + AIzaSyDJTtlRCM7IqdVUU2dSIYq2YIsTz6bqnkI + GCM_SENDER_ID + 221368768663 + PLIST_VERSION + 1 + BUNDLE_ID + org.linphone.phone + PROJECT_ID + linphone-iphone + STORAGE_BUCKET + 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/msgNotificationService/GoogleService-Info.plist b/msgNotificationService/GoogleService-Info.plist new file mode 100644 index 000000000..82ef7bb8f --- /dev/null +++ b/msgNotificationService/GoogleService-Info.plist @@ -0,0 +1,36 @@ + + + + + CLIENT_ID + 221368768663-b8e48em01it3pt04vp1k0ddrgrcrju65.apps.googleusercontent.com + REVERSED_CLIENT_ID + com.googleusercontent.apps.221368768663-b8e48em01it3pt04vp1k0ddrgrcrju65 + API_KEY + AIzaSyDJTtlRCM7IqdVUU2dSIYq2YIsTz6bqnkI + GCM_SENDER_ID + 221368768663 + PLIST_VERSION + 1 + BUNDLE_ID + org.linphone.phone.msgNotificationService + PROJECT_ID + linphone-iphone + STORAGE_BUCKET + 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:ccf2c32eadcd3a0f9431d2 + DATABASE_URL + https://linphone-iphone.firebaseio.com + + \ No newline at end of file