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

Move to linphonesw Swift Package

Browse source
This commit is contained in:
Christophe Deschamps 2024-12-23 10:19:42 +01:00
parent ac0e70f719
commit 71c60318c4
18 changed files with 61 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
Linphone.xcodeproj/project.pbxproj
View file

@ -7,7 +7,7 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* 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, ); }; }; 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 */; }; 660D8A712B517D260092694D /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 660D8A702B517D260092694D /* GoogleService-Info.plist */; };
6613A0AE2BAEB7DF008923A4 /* MeetingFragment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6613A0AD2BAEB7DF008923A4 /* MeetingFragment.swift */; }; 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 */; }; C67586AE2C09F23C002E77BF /* URLExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C67586AD2C09F23C002E77BF /* URLExtension.swift */; };
C67586B02C09F247002E77BF /* URIHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C67586AF2C09F247002E77BF /* URIHandler.swift */; }; C67586B02C09F247002E77BF /* URIHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = C67586AF2C09F247002E77BF /* URIHandler.swift */; };
C67586B52C09F617002E77BF /* SingleSignOnManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C67586B22C09F617002E77BF /* SingleSignOnManager.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 */; }; C6A5A9412C10B5D50070FEA4 /* EncodableExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6A5A9402C10B5D50070FEA4 /* EncodableExtension.swift */; };
C6A5A9432C10B5ED0070FEA4 /* DecodableExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6A5A9422C10B5ED0070FEA4 /* DecodableExtension.swift */; }; C6A5A9432C10B5ED0070FEA4 /* DecodableExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6A5A9422C10B5ED0070FEA4 /* DecodableExtension.swift */; };
C6A5A9452C10B6270070FEA4 /* OIDAuthStateExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6A5A9442C10B6270070FEA4 /* OIDAuthStateExtension.swift */; }; C6A5A9452C10B6270070FEA4 /* OIDAuthStateExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6A5A9442C10B6270070FEA4 /* OIDAuthStateExtension.swift */; };
@ -405,6 +407,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
C696D2212D1961C900ECC5E5 /* linphonesw in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -412,7 +415,8 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
4ED1F0A881A9ACB5977A8987 /* BuildFile in Frameworks */, 4ED1F0A881A9ACB5977A8987 /* (null) in Frameworks */,
C67D3C112D43C9B8001E5181 /* linphonesw in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; 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"; compatibilityVersion = "Xcode 14.0";
developmentRegion = en; developmentRegion = en;
hasScannedForEncodings = 0; hasScannedForEncodings = 0;
@ -1075,6 +1079,9 @@
Base, Base,
); );
mainGroup = D719ABAA2ABC67BF00B41C10; mainGroup = D719ABAA2ABC67BF00B41C10;
packageReferences = (
C67D3C0F2D43C9B8001E5181 /* XCRemoteSwiftPackageReference "linphone-sdk-swift" */,
);
productRefGroup = D719ABB42ABC67BF00B41C10 /* Products */; productRefGroup = D719ABB42ABC67BF00B41C10 /* Products */;
projectDirPath = ""; projectDirPath = "";
projectRoot = ""; projectRoot = "";
@ -1701,7 +1708,7 @@
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
D719ABAE2ABC67BF00B41C10 /* Build configuration list for PBXProject "Linphone" */ = { D719ABAE2ABC67BF00B41C10 /* Build configuration list for PBXProject "linphone" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
D719ABC02ABC67BF00B41C10 /* Debug */, D719ABC02ABC67BF00B41C10 /* Debug */,
@ -1720,6 +1727,38 @@
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
/* End XCConfigurationList section */ /* 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 */; rootObject = D719ABAB2ABC67BF00B41C10 /* Project object */;
} }

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

@ -17,7 +17,7 @@
BlueprintIdentifier = "D719ABB22ABC67BF00B41C10" BlueprintIdentifier = "D719ABB22ABC67BF00B41C10"
BuildableName = "Linphone.app" BuildableName = "Linphone.app"
BlueprintName = "Linphone" BlueprintName = "Linphone"
ReferencedContainer = "container:Linphone.xcodeproj"> ReferencedContainer = "container:linphone.xcodeproj">
</BuildableReference> </BuildableReference>
</BuildActionEntry> </BuildActionEntry>
</BuildActionEntries> </BuildActionEntries>
@ -46,7 +46,7 @@
BlueprintIdentifier = "D719ABB22ABC67BF00B41C10" BlueprintIdentifier = "D719ABB22ABC67BF00B41C10"
BuildableName = "Linphone.app" BuildableName = "Linphone.app"
BlueprintName = "Linphone" BlueprintName = "Linphone"
ReferencedContainer = "container:Linphone.xcodeproj"> ReferencedContainer = "container:linphone.xcodeproj">
</BuildableReference> </BuildableReference>
</BuildableProductRunnable> </BuildableProductRunnable>
</LaunchAction> </LaunchAction>
@ -63,7 +63,7 @@
BlueprintIdentifier = "D719ABB22ABC67BF00B41C10" BlueprintIdentifier = "D719ABB22ABC67BF00B41C10"
BuildableName = "Linphone.app" BuildableName = "Linphone.app"
BlueprintName = "Linphone" BlueprintName = "Linphone"
ReferencedContainer = "container:Linphone.xcodeproj"> ReferencedContainer = "container:linphone.xcodeproj">
</BuildableReference> </BuildableReference>
</BuildableProductRunnable> </BuildableProductRunnable>
</ProfileAction> </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 Combine
import UniformTypeIdentifiers import UniformTypeIdentifiers
import Network import Network
import SwiftUI
#if USE_CRASHLYTICS #if USE_CRASHLYTICS
import Firebase import Firebase

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

2
Linphone/Utils/Log.swift
View file

@ -96,7 +96,7 @@ class Log: LoggingServiceDelegate {
#endif #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) output(message, level.rawValue, domain)
} }

1
Linphone/Utils/MagicSearchSingleton.swift
View file

@ -19,6 +19,7 @@
import linphonesw import linphonesw
import Combine import Combine
import SwiftUI
final class MagicSearchSingleton: ObservableObject { 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" source "https://github.com/CocoaPods/Specs.git"
def basic_pods 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 crashlytics
end end