diff --git a/Linphone.xcodeproj/project.pbxproj b/Linphone.xcodeproj/project.pbxproj index 39574aad9..deeba9559 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 */; }; @@ -51,6 +51,8 @@ C67586AE2C09F23C002E77BF /* URLExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C67586AD2C09F23C002E77BF /* URLExtension.swift */; }; C67586B02C09F247002E77BF /* URIHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C67586AF2C09F247002E77BF /* URIHandler.swift */; }; C67586B52C09F617002E77BF /* SingleSignOnManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C67586B22C09F617002E77BF /* SingleSignOnManager.swift */; }; + C67D3C112D43C9B8001E5181 /* linphonesw in Frameworks */ = {isa = PBXBuildFile; productRef = C67D3C102D43C9B8001E5181 /* linphonesw */; }; + C696D2212D1961C900ECC5E5 /* linphonesw in Frameworks */ = {isa = PBXBuildFile; productRef = C696D2202D1961C900ECC5E5 /* linphonesw */; }; C6A5A9412C10B5D50070FEA4 /* EncodableExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6A5A9402C10B5D50070FEA4 /* EncodableExtension.swift */; }; C6A5A9432C10B5ED0070FEA4 /* DecodableExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6A5A9422C10B5ED0070FEA4 /* DecodableExtension.swift */; }; C6A5A9452C10B6270070FEA4 /* OIDAuthStateExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6A5A9442C10B6270070FEA4 /* OIDAuthStateExtension.swift */; }; @@ -405,6 +407,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + C696D2212D1961C900ECC5E5 /* linphonesw in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -412,7 +415,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4ED1F0A881A9ACB5977A8987 /* BuildFile in Frameworks */, + 4ED1F0A881A9ACB5977A8987 /* (null) in Frameworks */, + C67D3C112D43C9B8001E5181 /* linphonesw 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 = ( + C67D3C0F2D43C9B8001E5181 /* XCRemoteSwiftPackageReference "linphone-sdk-swift" */, + ); productRefGroup = D719ABB42ABC67BF00B41C10 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -1701,7 +1708,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - D719ABAE2ABC67BF00B41C10 /* Build configuration list for PBXProject "Linphone" */ = { + D719ABAE2ABC67BF00B41C10 /* Build configuration list for PBXProject "linphone" */ = { isa = XCConfigurationList; buildConfigurations = ( D719ABC02ABC67BF00B41C10 /* Debug */, @@ -1720,6 +1727,38 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + C67D3C0F2D43C9B8001E5181 /* XCRemoteSwiftPackageReference "linphone-sdk-swift" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://gitlab.linphone.org/BC/public/linphone-sdk-swift.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 5.4.0; + }; + }; + C696D21D2D1961B400ECC5E5 /* XCRemoteSwiftPackageReference "swift-linphone-sdk-ios" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://gitlab.linphone.org/BC/public/swift-linphone-sdk-ios.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 5.4.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + C67D3C102D43C9B8001E5181 /* linphonesw */ = { + isa = XCSwiftPackageProductDependency; + package = C67D3C0F2D43C9B8001E5181 /* XCRemoteSwiftPackageReference "linphone-sdk-swift" */; + productName = linphonesw; + }; + C696D2202D1961C900ECC5E5 /* linphonesw */ = { + isa = XCSwiftPackageProductDependency; + package = C696D21D2D1961B400ECC5E5 /* XCRemoteSwiftPackageReference "swift-linphone-sdk-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 1d8adeafa..033d901d7 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/Main/Contacts/ViewModel/ContactViewModel.swift b/Linphone/UI/Main/Contacts/ViewModel/ContactViewModel.swift index 38390ac93..2b778ae6b 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 eaabb4f48..c9bc56884 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 875080ca7..c2d1f6458 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 6a97f2282..99c659117 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/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 20bd0d262..9dd8a7171 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/Viewmodel/SharedMainViewModel.swift b/Linphone/UI/Main/Viewmodel/SharedMainViewModel.swift index abb48824b..afee605a3 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 c3d217578..db81a2b3d 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