diff --git a/androidVariant/src/main/AndroidManifest.xml b/androidVariant/src/main/AndroidManifest.xml index da9867b..a9b05e5 100644 --- a/androidVariant/src/main/AndroidManifest.xml +++ b/androidVariant/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + + + + diff --git a/iosVariant/Variant.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/iosVariant/Variant.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000..7202858 --- /dev/null +++ b/iosVariant/Variant.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,33 @@ +{ + "originHash" : "1af23a1bf574f0d95a78247871a5978438d9088e944f9fdcf715fc8e7ff8d705", + "pins" : [ + { + "identity" : "kmp-nativecoroutines", + "kind" : "remoteSourceControl", + "location" : "https://github.com/rickclephas/KMP-NativeCoroutines.git", + "state" : { + "branch" : "master", + "revision" : "26487987d20ef9b5c8972eba72fac01a5200477c" + } + }, + { + "identity" : "kmp-observableviewmodel", + "kind" : "remoteSourceControl", + "location" : "https://github.com/rickclephas/KMP-ObservableViewModel.git", + "state" : { + "branch" : "master", + "revision" : "49087e10854d1c79f13c14bea4a83aa84f8eaa09" + } + }, + { + "identity" : "rxswift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/ReactiveX/RxSwift.git", + "state" : { + "revision" : "5dd1907d64f0d36f158f61a466bab75067224893", + "version" : "6.9.0" + } + } + ], + "version" : 3 +} diff --git a/iosVariant/iosVariant/Data/ImageLoader.swift b/iosVariant/iosVariant/Data/ImageLoader.swift index 536ef70..fc864b9 100644 --- a/iosVariant/iosVariant/Data/ImageLoader.swift +++ b/iosVariant/iosVariant/Data/ImageLoader.swift @@ -18,7 +18,7 @@ import KMPObservableViewModelSwiftUI import SwiftUI -import Variant +import shared private let TAG = "ImageLoader" diff --git a/iosVariant/iosVariant/Data/KMPObservableViewModel.swift b/iosVariant/iosVariant/Data/KMPObservableViewModel.swift index 9cc0cd6..bd6d71a 100644 --- a/iosVariant/iosVariant/Data/KMPObservableViewModel.swift +++ b/iosVariant/iosVariant/Data/KMPObservableViewModel.swift @@ -17,6 +17,6 @@ */ import KMPObservableViewModelCore -import Variant +import shared extension Kmp_observableviewmodel_coreViewModel: ViewModel { } diff --git a/iosVariant/iosVariant/HomeView.swift b/iosVariant/iosVariant/HomeView.swift index c1492d2..2c87b05 100644 --- a/iosVariant/iosVariant/HomeView.swift +++ b/iosVariant/iosVariant/HomeView.swift @@ -18,7 +18,7 @@ import KMPObservableViewModelSwiftUI import SwiftUI -import Variant +import shared private let TAG = "HomeView" diff --git a/iosVariant/iosVariant/Koin.swift b/iosVariant/iosVariant/Koin.swift index c8cb044..bf940e5 100644 --- a/iosVariant/iosVariant/Koin.swift +++ b/iosVariant/iosVariant/Koin.swift @@ -16,7 +16,7 @@ * along with this program. If not, see */ -import Variant +import shared final class Koin { private var core: Koin_coreKoin? diff --git a/iosVariant/iosVariant/Models/DirectoryEntry.swift b/iosVariant/iosVariant/Models/DirectoryEntry.swift index 09763e8..c447c34 100644 --- a/iosVariant/iosVariant/Models/DirectoryEntry.swift +++ b/iosVariant/iosVariant/Models/DirectoryEntry.swift @@ -16,7 +16,7 @@ * along with this program. If not, see */ -import Variant +import shared extension DirectoryEntry : @retroactive Identifiable { public var id: String { diff --git a/iosVariant/iosVariant/Testing/Fixtures.swift b/iosVariant/iosVariant/Testing/Fixtures.swift index 6724fa6..7190ad6 100644 --- a/iosVariant/iosVariant/Testing/Fixtures.swift +++ b/iosVariant/iosVariant/Testing/Fixtures.swift @@ -16,7 +16,7 @@ * along with this program. If not, see */ -import Variant +import shared public var DIRECTORY_LIST = [ DirectoryEntry( diff --git a/iosVariant/iosVariant/Views/Comics/ComicBookListItemView.swift b/iosVariant/iosVariant/Views/Comics/ComicBookListItemView.swift index b966b78..08d6c45 100644 --- a/iosVariant/iosVariant/Views/Comics/ComicBookListItemView.swift +++ b/iosVariant/iosVariant/Views/Comics/ComicBookListItemView.swift @@ -18,7 +18,7 @@ import KMPObservableViewModelSwiftUI import SwiftUI -import Variant +import shared private let TAG = "ComicBookListItemView" diff --git a/iosVariant/iosVariant/Views/Comics/ComicBookListView.swift b/iosVariant/iosVariant/Views/Comics/ComicBookListView.swift index b450949..23467d0 100644 --- a/iosVariant/iosVariant/Views/Comics/ComicBookListView.swift +++ b/iosVariant/iosVariant/Views/Comics/ComicBookListView.swift @@ -18,7 +18,7 @@ import KMPObservableViewModelSwiftUI import SwiftUI -import Variant +import shared private let TAG = "ComicBookListView" diff --git a/iosVariant/iosVariant/Views/Comics/ComicBooksView.swift b/iosVariant/iosVariant/Views/Comics/ComicBooksView.swift index 3375eef..1b9fd38 100644 --- a/iosVariant/iosVariant/Views/Comics/ComicBooksView.swift +++ b/iosVariant/iosVariant/Views/Comics/ComicBooksView.swift @@ -18,7 +18,7 @@ import KMPObservableViewModelSwiftUI import SwiftUI -import Variant +import shared struct ComicBooksView: View { @EnvironmentViewModel var variantViewModel: VariantViewModel diff --git a/iosVariant/iosVariant/Views/Servers/BrowseServerView.swift b/iosVariant/iosVariant/Views/Servers/BrowseServerView.swift index c28c409..8b4633c 100644 --- a/iosVariant/iosVariant/Views/Servers/BrowseServerView.swift +++ b/iosVariant/iosVariant/Views/Servers/BrowseServerView.swift @@ -18,7 +18,7 @@ import KMPObservableViewModelSwiftUI import SwiftUI -import Variant +import shared private let TAG = "BrowseServerView" diff --git a/iosVariant/iosVariant/Views/Servers/DirectoryItemView.swift b/iosVariant/iosVariant/Views/Servers/DirectoryItemView.swift index b014f8b..6bd04e4 100644 --- a/iosVariant/iosVariant/Views/Servers/DirectoryItemView.swift +++ b/iosVariant/iosVariant/Views/Servers/DirectoryItemView.swift @@ -17,7 +17,7 @@ */ import SwiftUI -import Variant +import shared private let TAG = "DirectoryItemView" diff --git a/iosVariant/iosVariant/Views/Servers/FileItemView.swift b/iosVariant/iosVariant/Views/Servers/FileItemView.swift index aeee810..5de161a 100644 --- a/iosVariant/iosVariant/Views/Servers/FileItemView.swift +++ b/iosVariant/iosVariant/Views/Servers/FileItemView.swift @@ -17,7 +17,7 @@ */ import SwiftUI -import Variant +import shared private let TAG = "FileItemView" diff --git a/iosVariant/iosVariant/Views/Servers/ServerView.swift b/iosVariant/iosVariant/Views/Servers/ServerView.swift index 6ccc1b6..187fcee 100644 --- a/iosVariant/iosVariant/Views/Servers/ServerView.swift +++ b/iosVariant/iosVariant/Views/Servers/ServerView.swift @@ -18,7 +18,7 @@ import KMPObservableViewModelSwiftUI import SwiftUI -import Variant +import shared private let TAG = "ServerView" diff --git a/iosVariant/iosVariant/Views/Settings/EditServerView.swift b/iosVariant/iosVariant/Views/Settings/EditServerView.swift index 6e577ba..aec4112 100644 --- a/iosVariant/iosVariant/Views/Settings/EditServerView.swift +++ b/iosVariant/iosVariant/Views/Settings/EditServerView.swift @@ -18,7 +18,7 @@ import KMPObservableViewModelSwiftUI import SwiftUI -import Variant +import shared private let TAG = "EditServerView" diff --git a/iosVariant/iosVariant/Views/Settings/SettingsView.swift b/iosVariant/iosVariant/Views/Settings/SettingsView.swift index 55441ea..8bc7fb7 100644 --- a/iosVariant/iosVariant/Views/Settings/SettingsView.swift +++ b/iosVariant/iosVariant/Views/Settings/SettingsView.swift @@ -18,7 +18,7 @@ import KMPObservableViewModelSwiftUI import SwiftUI -import Variant +import shared private let TAG = "SettingsView" diff --git a/iosVariant/iosVariant/iOSApp.swift b/iosVariant/iosVariant/iOSApp.swift index d6726eb..7f83d5c 100644 --- a/iosVariant/iosVariant/iOSApp.swift +++ b/iosVariant/iosVariant/iOSApp.swift @@ -19,7 +19,7 @@ import Foundation import KMPObservableViewModelSwiftUI import SwiftUI -import Variant +import shared private let TAG = "IOSApp" diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 78d991b..00342aa 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -25,7 +25,7 @@ kotlin { iosSimulatorArm64() ).forEach { it.binaries.framework { - baseName = "Variant" + baseName = "shared" } }