witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Move from Pod to SPM for linphone-sdk

Browse source
This commit is contained in:
Christophe Deschamps 2025-03-03 13:53:24 +01:00
parent 512ca5afe8
commit 03bd42d750
26 changed files with 61 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
Linphone.xcodeproj/project.pbxproj
View file

@ -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 */;
}

6
Linphone.xcodeproj/xcshareddata/xcschemes/Linphone.xcscheme
View file

@ -17,7 +17,7 @@
BlueprintIdentifier = "D719ABB22ABC67BF00B41C10"
BuildableName = "Linphone.app"
BlueprintName = "Linphone"
ReferencedContainer = "container:Linphone.xcodeproj">
ReferencedContainer = "container:linphone.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
@ -46,7 +46,7 @@
BlueprintIdentifier = "D719ABB22ABC67BF00B41C10"
BuildableName = "Linphone.app"
BlueprintName = "Linphone"
ReferencedContainer = "container:Linphone.xcodeproj">
ReferencedContainer = "container:linphone.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
@ -63,7 +63,7 @@
BlueprintIdentifier = "D719ABB22ABC67BF00B41C10"
BuildableName = "Linphone.app"
BlueprintName = "Linphone"
ReferencedContainer = "container:Linphone.xcodeproj">
ReferencedContainer = "container:linphone.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>

1
Linphone/Core/CoreContext.swift
View file

@ -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

1
Linphone/UI/Assistant/Viewmodel/RegisterViewModel.swift
View file

@ -20,6 +20,7 @@
import Foundation
import linphonesw
import Combine
import SwiftUI
// swiftlint:disable line_length
// swiftlint:disable type_body_length

1
Linphone/UI/Call/Model/CallMediaEncryptionModel.swift
View file

@ -19,6 +19,7 @@
import Foundation
import linphonesw
import SwiftUI
class CallMediaEncryptionModel: ObservableObject {
var coreContext = CoreContext.shared

1
Linphone/UI/Call/Model/CallStatsModel.swift
View file

@ -19,6 +19,7 @@
import Foundation
import linphonesw
import SwiftUI
class SentVideoWindow: ObservableObject {
var widthFactor: CGFloat = 1

1
Linphone/UI/Call/Model/ParticipantModel.swift
View file

@ -19,6 +19,7 @@
import Foundation
import linphonesw
import SwiftUI
class ParticipantModel: ObservableObject {

1
Linphone/UI/Call/ViewModel/CallViewModel.swift
View file

@ -21,6 +21,7 @@ import SwiftUI
import linphonesw
import AVFAudio
import Combine
import SwiftUI
// swiftlint:disable line_length
// swiftlint:disable type_body_length

1
Linphone/UI/Main/Contacts/ViewModel/ContactViewModel.swift
View file

@ -19,6 +19,7 @@
import linphonesw
import Combine
import SwiftUI
// swiftlint:disable line_length
class ContactViewModel: ObservableObject {

1
Linphone/UI/Main/Contacts/ViewModel/ContactsListViewModel.swift
View file

@ -18,6 +18,7 @@
*/
import linphonesw
import SwiftUI
class ContactsListViewModel: ObservableObject {

1
Linphone/UI/Main/Contacts/ViewModel/EditContactViewModel.swift
View file

@ -18,6 +18,7 @@
*/
import linphonesw
import SwiftUI
class EditContactViewModel: ObservableObject {

1
Linphone/UI/Main/Contacts/ViewModel/FavoriteContactsListViewModel.swift
View file

@ -18,6 +18,7 @@
*/
import linphonesw
import SwiftUI
class FavoriteContactsListViewModel: ObservableObject {

1
Linphone/UI/Main/Conversations/ViewModel/ConversationForwardMessageViewModel.swift
View file

@ -19,6 +19,7 @@
import linphonesw
import Combine
import SwiftUI
// swiftlint:disable line_length
class ConversationForwardMessageViewModel: ObservableObject {

1
Linphone/UI/Main/Conversations/ViewModel/ConversationsListViewModel.swift
View file

@ -20,6 +20,7 @@
import Foundation
import linphonesw
import Combine
import SwiftUI
// swiftlint:disable line_length
class ConversationsListViewModel: ObservableObject {

1
Linphone/UI/Main/Conversations/ViewModel/StartConversationViewModel.swift
View file

@ -19,6 +19,7 @@
import linphonesw
import Combine
import SwiftUI
// swiftlint:disable line_length
class StartConversationViewModel: ObservableObject {

1
Linphone/UI/Main/Help/ViewModel/HelpViewModel.swift
View file

@ -18,6 +18,7 @@
*/
import linphonesw
import SwiftUI
class HelpViewModel: ObservableObject {
private let TAG = "[HelpViewModel]"

1
Linphone/UI/Main/History/ViewModel/HistoryListViewModel.swift
View file

@ -19,6 +19,7 @@
import linphonesw
import Combine
import SwiftUI
class HistoryListViewModel: ObservableObject {

1
Linphone/UI/Main/History/ViewModel/StartCallViewModel.swift
View file

@ -19,6 +19,7 @@
import linphonesw
import Combine
import SwiftUI
// swiftlint:disable line_length
class StartCallViewModel: ObservableObject {

1
Linphone/UI/Main/Meetings/Models/MeetingModel.swift
View file

@ -18,6 +18,7 @@
*/
import linphonesw
import SwiftUI
class MeetingModel: ObservableObject {

1
Linphone/UI/Main/Settings/ViewModel/AccountProfileViewModel.swift
View file

@ -18,6 +18,7 @@
*/
import linphonesw
import SwiftUI
class AccountProfileViewModel: ObservableObject {

1
Linphone/UI/Main/Settings/ViewModel/AccountSettingsViewModel.swift
View file

@ -18,6 +18,7 @@
*/
import linphonesw
import SwiftUI
class AccountSettingsViewModel: ObservableObject {

1
Linphone/UI/Main/Settings/ViewModel/SettingsViewModel.swift
View file

@ -18,6 +18,7 @@
*/
import linphonesw
import SwiftUI
class SettingsViewModel: ObservableObject {

1
Linphone/UI/Main/Viewmodel/SharedMainViewModel.swift
View file

@ -18,6 +18,7 @@
*/
import linphonesw
import SwiftUI
class SharedMainViewModel: ObservableObject {

2
Linphone/Utils/Log.swift
View file

@ -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)
}

1
Linphone/Utils/MagicSearchSingleton.swift
View file

@ -19,6 +19,7 @@
import linphonesw
import Combine
import SwiftUI
final class MagicSearchSingleton: ObservableObject {

6
Podfile
View file

@ -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