From c02a72c8cbfed9811e8939183d623957e930d2b5 Mon Sep 17 00:00:00 2001 From: Francis Pepin Date: Tue, 14 Apr 2026 10:40:29 -0400 Subject: [PATCH 1/2] Bump minimum version to iOS 15 --- .tool-versions | 2 +- Trikot.podspec | 16 +- buildSrc/src/main/kotlin/Project.kt | 2 +- .../firebase/FirebaseAnalyticsService.swift | 2 +- .../mixpanel/MixpanelAnalyticsService.swift | 2 +- ...TrikotAttributeProfileCharacteristic.swift | 2 +- .../TrikotAttributeProfileService.swift | 2 +- .../TrikotBluetoothDevice.swift | 2 +- .../TrikotBluetoothExtensions.swift | 2 +- .../TrikotBluetoothManager.swift | 2 +- .../TrikotBluetoothScanResult.swift | 2 +- .../TrikotConnectivityService.swift | 2 +- .../swift-extensions/TrikotHttpRequest.swift | 2 +- .../TrikotHttpRequestFactory.swift | 2 +- .../swift-extensions/TrikotHttpResponse.swift | 2 +- trikot-kword/sample/.gitignore | 2 +- trikot-kword/sample/common/build.gradle.kts | 2 +- trikot-kword/sample/ios/Podfile | 8 +- .../ios/Sample.xcodeproj/project.pbxproj | 4 +- .../sample/ios/Sample/Collector.swift | 2 +- .../sample/ios/Sample/ContentView.swift | 2 +- .../sample/ios/Sample/FlowUtils.swift | 2 +- .../sample/ios/Sample/SampleApp.swift | 2 +- .../swift-extensions/TrikotKword.swift | 2 +- .../TrikotPublisherExtensions.swift | 2 +- .../combine/CombineExensions.swift | 16 +- .../common/SampleTrikotFrameworkName.podspec | 57 +++ .../common/TRIKOT_FRAMEWORK_NAME.podspec | 2 +- .../sample/ios/Gemfile | 2 +- .../sample/ios/Gemfile.lock | 70 +-- .../sample/ios/Podfile | 6 +- .../sample/ios/Podfile.lock | 32 +- .../ios/Sample.xcodeproj/project.pbxproj | 4 +- .../sample/ios/Sample/AppBootstrap.swift | 2 +- .../ios/Sample/SampleImageProvider.swift | 2 +- .../ios/Sample/SampleSpanStyleProvider.swift | 2 +- .../sample/ios/Sample/SceneDelegate.swift | 2 +- .../UI/BaseViewModelViewController.swift | 2 +- .../sample/ios/Sample/UI/Home/HomeView.swift | 2 +- .../Sample/UI/Home/HomeViewController.swift | 2 +- .../UI/Home/ListItem/HomeListItemView.swift | 2 +- .../Types/AnimationTypeSectionView.swift | 2 +- .../Types/AnimationTypesShowcaseView.swift | 2 +- ...AnimationTypesShowcaseViewController.swift | 2 +- .../Button/ButtonShowcaseView.swift | 2 +- .../Button/ButtonShowcaseViewController.swift | 2 +- .../Components/Image/ImageShowcaseView.swift | 2 +- .../Image/ImageShowcaseViewController.swift | 2 +- .../Picker/PickerShowcaseView.swift | 2 +- .../Picker/PickerShowcaseViewController.swift | 2 +- .../Progress/ProgressShowcaseView.swift | 2 +- .../ProgressShowcaseViewController.swift | 2 +- .../Snackbar/SnackbarShowcaseView.swift | 4 +- .../SnackbarShowcaseViewController.swift | 2 +- .../Components/Snackbar/SnackbarView.swift | 2 +- .../Components/Text/TextShowcaseView.swift | 4 +- .../Text/TextShowcaseViewController.swift | 2 +- .../TextField/TextFieldShowcaseView.swift | 15 +- .../TextFieldShowcaseViewController.swift | 2 +- .../Toggle/ToggleShowcaseView.swift | 2 +- .../Toggle/ToggleShowcaseViewController.swift | 2 +- .../ComponentShowcaseSectionView.swift | 2 +- .../ios/Sample/UI/ViewControllerFactory.swift | 2 +- .../swift/core/VMDFlowUtils.swift | 2 +- .../core/VMDImageDescriptor+Utilities.swift | 2 +- .../VMDKeyboardAutoCapitalization+UIKit.swift | 2 +- .../core/VMDKeyboardReturnKeyType+UIKit.swift | 2 +- .../swift/core/VMDKeyboardType+UIKit.swift | 2 +- .../swift/core/VMDTextContentType+UIKit.swift | 14 +- .../Snackbar/VMDSnackBarStateObject.swift | 2 +- .../Components/Snackbar/VMDSnackbar.swift | 2 +- .../Components/VMDButton+Configuration.swift | 2 +- .../swift/swiftui/Components/VMDButton.swift | 2 +- .../swift/swiftui/Components/VMDForEach.swift | 2 +- .../swiftui/Components/VMDHtmlText.swift | 2 +- .../Components/VMDImage+Configuration.swift | 2 +- .../swift/swiftui/Components/VMDImage.swift | 2 +- .../swiftui/Components/VMDImageButton.swift | 2 +- .../swift/swiftui/Components/VMDList.swift | 2 +- .../swift/swiftui/Components/VMDPicker.swift | 2 +- .../swiftui/Components/VMDProgressView.swift | 2 +- .../swift/swiftui/Components/VMDText.swift | 8 +- .../swiftui/Components/VMDTextField.swift | 103 ++--- .../swift/swiftui/Components/VMDToggle.swift | 2 +- .../Extensions/VMDAnimation+Extensions.swift | 2 +- .../VMDImageResource+Extensions.swift | 2 +- .../Extensions/VMDReturnKeyType+SwiftUI.swift | 3 +- .../Extensions/VMDView+Lifecycle.swift | 2 +- .../ImageResource/VMDImageProvider.swift | 2 +- .../VMDSpanStyleProvider.swift | 3 +- .../swiftui/TrikotViewModelDeclarative.swift | 2 +- .../ObservableViewModelAdapter.swift | 2 +- .../swiftui/Utilities/SwiftUIExtensions.swift | 2 +- .../Utilities/VMDCloseableExecutor.swift | 2 +- .../swift/swiftui/ViewModelView.swift | 2 +- .../swiftui/ViewModelViewController.swift | 2 +- .../swiftui/ViewModifiers/FocusModifier.swift | 2 - .../swiftui/ViewModifiers/VMDModifier.swift | 2 +- .../sample/.gitignore | 2 +- .../sample/ios/Gemfile | 2 +- .../sample/ios/Gemfile.lock | 71 ++-- .../sample/ios/Podfile | 6 +- .../sample/ios/Podfile.lock | 28 +- .../ios/Sample.xcodeproj/project.pbxproj | 52 +-- .../sample/ios/Sample/AppBootstrap.swift | 2 +- .../ios/Sample/SampleImageProvider.swift | 2 +- .../sample/ios/Sample/SceneDelegate.swift | 2 +- .../UI/BaseViewModelViewController.swift | 2 +- .../sample/ios/Sample/UI/Home/HomeView.swift | 4 +- .../Sample/UI/Home/HomeViewController.swift | 2 +- .../UI/Home/ListItem/HomeListItemView.swift | 2 +- .../Types/AnimationTypeSectionView.swift | 2 +- .../Types/AnimationTypesShowcaseView.swift | 2 +- ...AnimationTypesShowcaseViewController.swift | 2 +- .../Button/ButtonShowcaseView.swift | 2 +- .../Button/ButtonShowcaseViewController.swift | 2 +- .../Components/Image/ImageShowcaseView.swift | 2 +- .../Image/ImageShowcaseViewController.swift | 2 +- .../Picker/PickerShowcaseView.swift | 2 +- .../Picker/PickerShowcaseViewController.swift | 2 +- .../Progress/ProgressShowcaseView.swift | 2 +- .../ProgressShowcaseViewController.swift | 2 +- .../Components/Text/TextShowcaseView.swift | 2 +- .../Text/TextShowcaseViewController.swift | 2 +- .../TextField/TextFieldShowcaseView.swift | 15 +- .../TextFieldShowcaseViewController.swift | 2 +- .../Toggle/ToggleShowcaseView.swift | 2 +- .../Toggle/ToggleShowcaseViewController.swift | 2 +- .../ComponentShowcaseSectionView.swift | 2 +- .../ios/Sample/UI/ViewControllerFactory.swift | 2 +- .../combine/TrikotPublisher+Combine.swift | 12 +- .../core/VMDImageDescriptor+Utilities.swift | 2 +- .../VMDKeyboardAutoCapitalization+UIKit.swift | 2 +- .../core/VMDKeyboardReturnKeyType+UIKit.swift | 2 +- .../swift/core/VMDKeyboardType+UIKit.swift | 2 +- .../swift/core/VMDTextContentType+UIKit.swift | 14 +- .../Components/VMDButton+Configuration.swift | 2 +- .../swift/swiftui/Components/VMDButton.swift | 2 +- .../swift/swiftui/Components/VMDForEach.swift | 2 +- .../Components/VMDImage+Configuration.swift | 2 +- .../swift/swiftui/Components/VMDImage.swift | 2 +- .../swiftui/Components/VMDImageButton.swift | 2 +- .../swift/swiftui/Components/VMDList.swift | 2 +- .../swift/swiftui/Components/VMDPicker.swift | 2 +- .../swiftui/Components/VMDProgressView.swift | 2 +- .../swift/swiftui/Components/VMDText.swift | 2 +- .../swiftui/Components/VMDTextField.swift | 102 ++--- .../swift/swiftui/Components/VMDToggle.swift | 2 +- .../Extensions/VMDAnimation+Extensions.swift | 2 +- .../VMDImageResource+Extensions.swift | 2 +- .../Extensions/VMDReturnKeyType+SwiftUI.swift | 3 +- .../ImageResource/VMDImageProvider.swift | 2 +- .../ObservableViewModelAdapter.swift | 2 +- .../swiftui/Utilities/SwiftUIExtensions.swift | 2 +- .../swift/swiftui/ViewModelView.swift | 2 +- .../swiftui/ViewModelViewController.swift | 2 +- .../swiftui/ViewModifiers/FocusModifier.swift | 2 - .../swift/uikit/VMDImageProviderUIKit.swift | 2 +- .../uikit/VMDImageResourceExtensions.swift | 2 +- .../swift/uikit/VMDNSObjectExtensions.swift | 2 +- .../uikit/VMDUIBarButtonItemExtensions.swift | 2 +- .../swift/uikit/VMDUIButtonExtensions.swift | 2 +- .../swift/uikit/VMDUIControlExtensions.swift | 2 +- .../uikit/VMDUIImageViewExtensions.swift | 2 +- .../swift/uikit/VMDUISwitchExtensions.swift | 2 +- .../uikit/VMDUITextFieldExtensions.swift | 2 +- .../swift/uikit/VMDUIViewExtensions.swift | 2 +- .../swift/uikit/VMDULabelExtensions.swift | 2 +- .../swift/uikit/VMDViewModelExtensions.swift | 2 +- trikot-viewmodels/sample/.gitignore | 2 +- trikot-viewmodels/sample/ios/Gemfile.lock | 400 +++++++++++++----- trikot-viewmodels/sample/ios/Podfile | 6 +- trikot-viewmodels/sample/ios/Podfile.lock | 26 +- .../ios/iosApp.xcodeproj/project.pbxproj | 12 +- .../sample/ios/iosApp/AppDelegate.swift | 2 +- .../ios/iosApp/listitems/ButtonListItem.swift | 2 +- .../ios/iosApp/listitems/HeaderListItem.swift | 2 +- .../ios/iosApp/listitems/ImageListItem.swift | 2 +- .../iosApp/listitems/InputTextListItem.swift | 2 +- .../ios/iosApp/listitems/LabelListItem.swift | 2 +- .../iosApp/listitems/NavigableListItem.swift | 2 +- .../ios/iosApp/listitems/PickerListItem.swift | 2 +- .../ios/iosApp/listitems/SliderListItem.swift | 2 +- .../listitems/ToggleSwitchListItem.swift | 2 +- .../ios/iosApp/listitems/ViewListItem.swift | 2 +- .../sample/SampleImageResourceProvider.swift | 2 +- ...SampleTextAppearanceResourceProvider.swift | 2 +- .../sample/ios/iosApp/sample/SampleView.swift | 2 +- .../iosApp/sample/SampleViewController.swift | 2 +- .../swift-extensions/ColorExtensions.swift | 2 +- .../ImageViewModelResourceManager.swift | 2 +- .../KeyValueObservationExtensions.swift | 2 +- .../StateSelectorExtensions.swift | 2 +- ...xtAppearanceViewModelResourceManager.swift | 2 +- .../swift-extensions/UIButtonExtensions.swift | 2 +- .../UIImageViewExtensions.swift | 2 +- .../swift-extensions/UILabelExtensions.swift | 2 +- .../swift-extensions/UIPickerExtensions.swift | 2 +- .../swift-extensions/UISliderExtensions.swift | 17 +- .../swift-extensions/UISwitchExtensions.swift | 17 +- .../UITextFieldExtensions.swift | 2 +- .../UITextViewExtensions.swift | 2 +- .../swift-extensions/UIViewExtensions.swift | 2 +- .../kingfisher/KFImageViewModelHandler.swift | 2 +- 204 files changed, 843 insertions(+), 651 deletions(-) create mode 100644 trikot-viewmodels-declarative-flow/sample/common/SampleTrikotFrameworkName.podspec diff --git a/.tool-versions b/.tool-versions index a4023dc70..ca745c6d6 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -ruby 2.7.5 +ruby 3.4.4 diff --git a/Trikot.podspec b/Trikot.podspec index 5b6799545..9f7b7b4fc 100644 --- a/Trikot.podspec +++ b/Trikot.podspec @@ -16,20 +16,20 @@ Pod::Spec.new do |spec| spec.dependency ENV['TRIKOT_FRAMEWORK_NAME'] - spec.ios.deployment_target = '10.0' + spec.ios.deployment_target = '15.0' spec.tvos.deployment_target = '10.0' spec.osx.deployment_target = '10.9' # Streams spec.subspec 'streams' do |subspec| subspec.source_files = "trikot-streams/swift-extensions/*.swift" - subspec.ios.deployment_target = '8.0' + subspec.ios.deployment_target = '15.0' subspec.tvos.deployment_target = '9.0' end spec.subspec 'streams.Combine' do |subspec| subspec.source_files = 'trikot-streams/swift-extensions/combine/*.swift' - subspec.ios.deployment_target = '13.0' + subspec.ios.deployment_target = '15.0' end # Http @@ -43,7 +43,7 @@ Pod::Spec.new do |spec| subspec.source_files = "trikot-viewmodels/swift-extensions/*.swift" subspec.tvos.source_files = "trikot-viewmodels/swift-extensions/*.swift" subspec.tvos.exclude_files = "trikot-viewmodels/swift-extensions/UISliderExtensions.swift", "trikot-viewmodels/swift-extensions/UISwitchExtensions.swift", "trikot-viewmodels/swift-extensions/UIPickerExtensions.swift" - subspec.ios.deployment_target = '12.0' + subspec.ios.deployment_target = '15.0' subspec.tvos.deployment_target = '12.0' subspec.dependency 'Trikot/streams' end @@ -51,7 +51,7 @@ Pod::Spec.new do |spec| spec.subspec 'viewmodels.Kingfisher' do |subspec| subspec.source_files = 'trikot-viewmodels/swift-extensions/kingfisher/*.swift' subspec.tvos.source_files = 'trikot-viewmodels/swift-extensions/kingfisher/*.swift' - subspec.ios.deployment_target = '12.0' + subspec.ios.deployment_target = '15.0' subspec.tvos.deployment_target = '12.0' subspec.dependency 'Trikot/streams' subspec.dependency 'Trikot/viewmodels' @@ -96,13 +96,13 @@ Pod::Spec.new do |spec| # Analytics spec.subspec 'analytics.Firebase' do |subspec| subspec.source_files = 'trikot-analytics/swift-extensions/firebase/*.swift' - subspec.ios.deployment_target = '10.0' + subspec.ios.deployment_target = '15.0' subspec.dependency 'Firebase/Analytics' end spec.subspec 'analytics.Mixpanel' do |subspec| subspec.source_files = 'trikot-analytics/swift-extensions/mixpanel/*.swift' - subspec.ios.deployment_target = '10.0' + subspec.ios.deployment_target = '15.0' subspec.dependency 'Mixpanel-swift' end @@ -114,7 +114,7 @@ Pod::Spec.new do |spec| # Bluetooth spec.subspec 'bluetooth' do |subspec| subspec.source_files = "trikot-bluetooth/swift-extensions/*.swift" - subspec.ios.deployment_target = '10.0' + subspec.ios.deployment_target = '15.0' subspec.dependency ENV['TRIKOT_FRAMEWORK_NAME'] end diff --git a/buildSrc/src/main/kotlin/Project.kt b/buildSrc/src/main/kotlin/Project.kt index 59a12f4db..7cb812469 100644 --- a/buildSrc/src/main/kotlin/Project.kt +++ b/buildSrc/src/main/kotlin/Project.kt @@ -26,5 +26,5 @@ object Project { const val TRIKOT_DATASOURCES_CORE = ":trikot-datasources:datasources-core" const val TRIKOT_DATASOURCES_STREAMS = ":trikot-datasources:datasources-streams" const val TRIKOT_DATASOURCES_FLOW = ":trikot-datasources:datasources-flow" - const val TRIKOT_SAMPLES_FRAMEWORK_NAME = "TRIKOT_FRAMEWORK_NAME" + const val TRIKOT_SAMPLES_FRAMEWORK_NAME = "SampleTrikotFrameworkName" } diff --git a/trikot-analytics/swift-extensions/firebase/FirebaseAnalyticsService.swift b/trikot-analytics/swift-extensions/firebase/FirebaseAnalyticsService.swift index a01e0f8c2..34d110b78 100644 --- a/trikot-analytics/swift-extensions/firebase/FirebaseAnalyticsService.swift +++ b/trikot-analytics/swift-extensions/firebase/FirebaseAnalyticsService.swift @@ -1,6 +1,6 @@ import FirebaseAnalytics import Foundation -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public class FirebaseAnalyticsService: AnalyticsService { public var name: String = "FirebaseAnalytics" diff --git a/trikot-analytics/swift-extensions/mixpanel/MixpanelAnalyticsService.swift b/trikot-analytics/swift-extensions/mixpanel/MixpanelAnalyticsService.swift index ee4c3ef06..1b0a6c458 100644 --- a/trikot-analytics/swift-extensions/mixpanel/MixpanelAnalyticsService.swift +++ b/trikot-analytics/swift-extensions/mixpanel/MixpanelAnalyticsService.swift @@ -1,6 +1,6 @@ import Foundation import Mixpanel -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public class MixpanelAnalyticsService: AnalyticsService { public init(enableAnalytics: Bool = true) { diff --git a/trikot-bluetooth/swift-extensions/TrikotAttributeProfileCharacteristic.swift b/trikot-bluetooth/swift-extensions/TrikotAttributeProfileCharacteristic.swift index ee19f433f..ec1e85b4c 100644 --- a/trikot-bluetooth/swift-extensions/TrikotAttributeProfileCharacteristic.swift +++ b/trikot-bluetooth/swift-extensions/TrikotAttributeProfileCharacteristic.swift @@ -1,4 +1,4 @@ -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName import CoreBluetooth class TrikotAttributeProfileCharacteristic: NSObject, AttributeProfileCharacteristic { diff --git a/trikot-bluetooth/swift-extensions/TrikotAttributeProfileService.swift b/trikot-bluetooth/swift-extensions/TrikotAttributeProfileService.swift index f939b52cd..db5f34b35 100644 --- a/trikot-bluetooth/swift-extensions/TrikotAttributeProfileService.swift +++ b/trikot-bluetooth/swift-extensions/TrikotAttributeProfileService.swift @@ -1,4 +1,4 @@ -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName import CoreBluetooth class TrikotAttributeProfileService: NSObject, AttributeProfileService { diff --git a/trikot-bluetooth/swift-extensions/TrikotBluetoothDevice.swift b/trikot-bluetooth/swift-extensions/TrikotBluetoothDevice.swift index 3a440fff7..fac1330fd 100644 --- a/trikot-bluetooth/swift-extensions/TrikotBluetoothDevice.swift +++ b/trikot-bluetooth/swift-extensions/TrikotBluetoothDevice.swift @@ -1,4 +1,4 @@ -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName import CoreBluetooth class TrikotBluetoothDevice: NSObject, BluetoothDevice, CBPeripheralDelegate { diff --git a/trikot-bluetooth/swift-extensions/TrikotBluetoothExtensions.swift b/trikot-bluetooth/swift-extensions/TrikotBluetoothExtensions.swift index 91d60399e..07aa25d6e 100644 --- a/trikot-bluetooth/swift-extensions/TrikotBluetoothExtensions.swift +++ b/trikot-bluetooth/swift-extensions/TrikotBluetoothExtensions.swift @@ -1,5 +1,5 @@ import Foundation -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName extension Publisher { func asBehaviorSubject() -> BehaviorSubject { diff --git a/trikot-bluetooth/swift-extensions/TrikotBluetoothManager.swift b/trikot-bluetooth/swift-extensions/TrikotBluetoothManager.swift index d2c7287e6..850112275 100644 --- a/trikot-bluetooth/swift-extensions/TrikotBluetoothManager.swift +++ b/trikot-bluetooth/swift-extensions/TrikotBluetoothManager.swift @@ -1,4 +1,4 @@ -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName import CoreBluetooth import Dispatch diff --git a/trikot-bluetooth/swift-extensions/TrikotBluetoothScanResult.swift b/trikot-bluetooth/swift-extensions/TrikotBluetoothScanResult.swift index 852656202..f01460112 100644 --- a/trikot-bluetooth/swift-extensions/TrikotBluetoothScanResult.swift +++ b/trikot-bluetooth/swift-extensions/TrikotBluetoothScanResult.swift @@ -1,4 +1,4 @@ -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName import CoreBluetooth class TrikotBluetoothScanResult: NSObject, BluetoothScanResult { diff --git a/trikot-http/swift-extensions/TrikotConnectivityService.swift b/trikot-http/swift-extensions/TrikotConnectivityService.swift index e964b0a5a..636b0a92e 100644 --- a/trikot-http/swift-extensions/TrikotConnectivityService.swift +++ b/trikot-http/swift-extensions/TrikotConnectivityService.swift @@ -1,6 +1,6 @@ import Foundation import Reachability -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public class TrikotConnectivityService { public static let shared = TrikotConnectivityService() diff --git a/trikot-http/swift-extensions/TrikotHttpRequest.swift b/trikot-http/swift-extensions/TrikotHttpRequest.swift index f32fa3b5d..27a01f976 100644 --- a/trikot-http/swift-extensions/TrikotHttpRequest.swift +++ b/trikot-http/swift-extensions/TrikotHttpRequest.swift @@ -1,5 +1,5 @@ import Foundation -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public class TrikotHttpRequest: NSObject, HttpRequest { private struct Constants { diff --git a/trikot-http/swift-extensions/TrikotHttpRequestFactory.swift b/trikot-http/swift-extensions/TrikotHttpRequestFactory.swift index 31ea3fa4a..9068fa9ad 100644 --- a/trikot-http/swift-extensions/TrikotHttpRequestFactory.swift +++ b/trikot-http/swift-extensions/TrikotHttpRequestFactory.swift @@ -1,5 +1,5 @@ import Foundation -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName open class TrikotHttpRequestFactory: NSObject, HttpRequestFactory { private let httpLogLevel: TrikotHttpLogLevel diff --git a/trikot-http/swift-extensions/TrikotHttpResponse.swift b/trikot-http/swift-extensions/TrikotHttpResponse.swift index 11baa81cc..6443f6940 100644 --- a/trikot-http/swift-extensions/TrikotHttpResponse.swift +++ b/trikot-http/swift-extensions/TrikotHttpResponse.swift @@ -1,5 +1,5 @@ import Foundation -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public class TrikotHttpResponse: NSObject, HttpResponse { diff --git a/trikot-kword/sample/.gitignore b/trikot-kword/sample/.gitignore index 70f3470fb..2b27eb4ed 100644 --- a/trikot-kword/sample/.gitignore +++ b/trikot-kword/sample/.gitignore @@ -1,3 +1,3 @@ # Generated /common/src/commonMain/generated -/common/TRIKOT_FRAMEWORK_NAME.podspec +/common/SampleTrikotFrameworkName.podspec diff --git a/trikot-kword/sample/common/build.gradle.kts b/trikot-kword/sample/common/build.gradle.kts index 2afc86dec..7f361e564 100644 --- a/trikot-kword/sample/common/build.gradle.kts +++ b/trikot-kword/sample/common/build.gradle.kts @@ -10,7 +10,7 @@ plugins { group = "com.mirego.sample" -val frameworkName = "TRIKOT_FRAMEWORK_NAME" +val frameworkName = Project.TRIKOT_SAMPLES_FRAMEWORK_NAME configurations { create("testApi") {} diff --git a/trikot-kword/sample/ios/Podfile b/trikot-kword/sample/ios/Podfile index afd00d51e..741eb0895 100644 --- a/trikot-kword/sample/ios/Podfile +++ b/trikot-kword/sample/ios/Podfile @@ -1,13 +1,13 @@ -platformVersion = '14.0' +platformVersion = '15.0' platform :ios, platformVersion -ENV['TRIKOT_FRAMEWORK_NAME']='TRIKOT_FRAMEWORK_NAME' +ENV['TRIKOT_FRAMEWORK_NAME']='SampleTrikotFrameworkName' target 'Sample' do use_frameworks! - pod 'TRIKOT_FRAMEWORK_NAME', :path => '../common' + pod 'SampleTrikotFrameworkName', :path => '../common' pod 'Trikot/kword', :path => '../../..' pod 'SwiftLint' end @@ -18,7 +18,7 @@ post_install do |installer| config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = platformVersion end - if target.name == "TRIKOT_FRAMEWORK_NAME" + if target.name == "SampleTrikotFrameworkName" target.build_configurations.each do |config| config.build_settings['COCOAPODS_SKIP_KOTLIN_BUILD'] = '$ENABLE_PREVIEWS' end diff --git a/trikot-kword/sample/ios/Sample.xcodeproj/project.pbxproj b/trikot-kword/sample/ios/Sample.xcodeproj/project.pbxproj index 240c575f5..50350c077 100644 --- a/trikot-kword/sample/ios/Sample.xcodeproj/project.pbxproj +++ b/trikot-kword/sample/ios/Sample.xcodeproj/project.pbxproj @@ -289,7 +289,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.4; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -343,7 +343,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.4; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; diff --git a/trikot-kword/sample/ios/Sample/Collector.swift b/trikot-kword/sample/ios/Sample/Collector.swift index 0d1e62a78..f478f554a 100644 --- a/trikot-kword/sample/ios/Sample/Collector.swift +++ b/trikot-kword/sample/ios/Sample/Collector.swift @@ -1,4 +1,4 @@ -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName class Collector: FlowCollector { let callback:(T) -> Void diff --git a/trikot-kword/sample/ios/Sample/ContentView.swift b/trikot-kword/sample/ios/Sample/ContentView.swift index e13701e0b..7f970efe2 100644 --- a/trikot-kword/sample/ios/Sample/ContentView.swift +++ b/trikot-kword/sample/ios/Sample/ContentView.swift @@ -1,5 +1,5 @@ import SwiftUI -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName struct ContentView: View { diff --git a/trikot-kword/sample/ios/Sample/FlowUtils.swift b/trikot-kword/sample/ios/Sample/FlowUtils.swift index ab66fef54..f895c9819 100644 --- a/trikot-kword/sample/ios/Sample/FlowUtils.swift +++ b/trikot-kword/sample/ios/Sample/FlowUtils.swift @@ -1,5 +1,5 @@ import Foundation -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public class ObservableFlowWrapper: ObservableObject { @Published public var value: T diff --git a/trikot-kword/sample/ios/Sample/SampleApp.swift b/trikot-kword/sample/ios/Sample/SampleApp.swift index 09f903d79..bb7909965 100644 --- a/trikot-kword/sample/ios/Sample/SampleApp.swift +++ b/trikot-kword/sample/ios/Sample/SampleApp.swift @@ -1,5 +1,5 @@ import SwiftUI -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName @main struct SampleApp: App { diff --git a/trikot-kword/swift-extensions/TrikotKword.swift b/trikot-kword/swift-extensions/TrikotKword.swift index cb728b9bf..560b7fe1a 100644 --- a/trikot-kword/swift-extensions/TrikotKword.swift +++ b/trikot-kword/swift-extensions/TrikotKword.swift @@ -1,6 +1,6 @@ import Foundation import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public class TrikotKword: NSObject { public static let translationBasePaths = [ diff --git a/trikot-streams/swift-extensions/TrikotPublisherExtensions.swift b/trikot-streams/swift-extensions/TrikotPublisherExtensions.swift index 43debbf68..feec9e3d5 100644 --- a/trikot-streams/swift-extensions/TrikotPublisherExtensions.swift +++ b/trikot-streams/swift-extensions/TrikotPublisherExtensions.swift @@ -1,5 +1,5 @@ import Foundation -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName extension NSObject { private final class iOSCancellableManagerHolder { diff --git a/trikot-streams/swift-extensions/combine/CombineExensions.swift b/trikot-streams/swift-extensions/combine/CombineExensions.swift index 9709d541e..83f477ab8 100644 --- a/trikot-streams/swift-extensions/combine/CombineExensions.swift +++ b/trikot-streams/swift-extensions/combine/CombineExensions.swift @@ -1,8 +1,8 @@ import Combine -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public class PublisherAdapter: Combine.Publisher { - private let publisher: TRIKOT_FRAMEWORK_NAME.Publisher + private let publisher: SampleTrikotFrameworkName.Publisher public typealias Output = T @@ -12,12 +12,12 @@ public class PublisherAdapter: Combine.Publisher { publisher.subscribe(s: SubscriberAdapter(subscriber)) } - public init(_ publisher: TRIKOT_FRAMEWORK_NAME.Publisher) { + public init(_ publisher: SampleTrikotFrameworkName.Publisher) { self.publisher = publisher } } -public class SubscriberAdapter: TRIKOT_FRAMEWORK_NAME.Subscriber { +public class SubscriberAdapter: SampleTrikotFrameworkName.Subscriber { private let subscriber: S public init(_ subscriber: S) { @@ -46,15 +46,15 @@ public class SubscriberAdapter: TRIKOT_FRAMEWORK_NAME.Sub } } - public func onSubscribe(s: TRIKOT_FRAMEWORK_NAME.Subscription) { + public func onSubscribe(s: SampleTrikotFrameworkName.Subscription) { subscriber.receive(subscription: SubscriptionAdapter(s)) } } public class SubscriptionAdapter: Combine.Subscription { - private let subscription: TRIKOT_FRAMEWORK_NAME.Subscription + private let subscription: SampleTrikotFrameworkName.Subscription - init(_ subscription: TRIKOT_FRAMEWORK_NAME.Subscription) { + init(_ subscription: SampleTrikotFrameworkName.Subscription) { self.subscription = subscription } @@ -71,7 +71,7 @@ public class SubscriptionAdapter: Combine.Subscription { } } -extension TRIKOT_FRAMEWORK_NAME.Publisher { +extension SampleTrikotFrameworkName.Publisher { public func asCombinePublisher(type: T.Type) -> AnyPublisher { AnyPublisher(PublisherAdapter(self)) } diff --git a/trikot-viewmodels-declarative-flow/sample/common/SampleTrikotFrameworkName.podspec b/trikot-viewmodels-declarative-flow/sample/common/SampleTrikotFrameworkName.podspec new file mode 100644 index 000000000..ab28dd6c6 --- /dev/null +++ b/trikot-viewmodels-declarative-flow/sample/common/SampleTrikotFrameworkName.podspec @@ -0,0 +1,57 @@ +Pod::Spec.new do |spec| + spec.name = 'SampleTrikotFrameworkName' + spec.version = '6.1.0-SNAPSHOT' + spec.homepage = 'www.mirego.com' + spec.source = { :http=> ''} + spec.authors = '' + spec.license = 'BSD-3' + spec.summary = 'Trikot-viewmodels-declarative sample' + spec.vendored_frameworks = 'build/cocoapods/framework/SampleTrikotFrameworkName.framework' + spec.libraries = 'c++' + + + + if !Dir.exist?('build/cocoapods/framework/SampleTrikotFrameworkName.framework') || Dir.empty?('build/cocoapods/framework/SampleTrikotFrameworkName.framework') + raise " + + Kotlin framework 'SampleTrikotFrameworkName' doesn't exist yet, so a proper Xcode project can't be generated. + 'pod install' should be executed after running ':generateDummyFramework' Gradle task: + + ./gradlew :trikot-viewmodels-declarative-flow:sample:common:generateDummyFramework + + Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)" + end + + spec.xcconfig = { + 'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO', + } + + spec.pod_target_xcconfig = { + 'KOTLIN_PROJECT_PATH' => ':trikot-viewmodels-declarative-flow:sample:common', + 'PRODUCT_MODULE_NAME' => 'SampleTrikotFrameworkName', + } + + spec.script_phases = [ + { + :name => 'Build SampleTrikotFrameworkName', + :execution_position => :before_compile, + :shell_path => '/bin/sh', + :script => <<-SCRIPT + if [ "YES" = "$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED" ]; then + echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\"" + exit 0 + fi + set -ev + REPO_ROOT="$PODS_TARGET_SRCROOT" + "$REPO_ROOT/../../../gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \ + -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME \ + -Pkotlin.native.cocoapods.archs="$ARCHS" \ + -Pkotlin.native.cocoapods.configuration="$CONFIGURATION" + SCRIPT + } + ] + spec.resources = "src/commonMain/resources/translations/*" + spec.prepare_command = <<-CMD + ../../../gradlew :trikot-viewmodels-declarative-flow:sample:common:generateDummyFramework +CMD +end \ No newline at end of file diff --git a/trikot-viewmodels-declarative-flow/sample/common/TRIKOT_FRAMEWORK_NAME.podspec b/trikot-viewmodels-declarative-flow/sample/common/TRIKOT_FRAMEWORK_NAME.podspec index 1f6a81db0..51cab09f8 100644 --- a/trikot-viewmodels-declarative-flow/sample/common/TRIKOT_FRAMEWORK_NAME.podspec +++ b/trikot-viewmodels-declarative-flow/sample/common/TRIKOT_FRAMEWORK_NAME.podspec @@ -54,4 +54,4 @@ Pod::Spec.new do |spec| spec.prepare_command = <<-CMD ../../../gradlew :trikot-viewmodels-declarative-flow:sample:common:generateDummyFramework CMD -end +end \ No newline at end of file diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Gemfile b/trikot-viewmodels-declarative-flow/sample/ios/Gemfile index 58ccdc52a..0b2a5aec5 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Gemfile +++ b/trikot-viewmodels-declarative-flow/sample/ios/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' # Use the latest cocoapods gem -gem 'cocoapods', '1.13.0' +gem 'cocoapods', '1.16.2' gem 'activesupport', '>= 6.1.7.3', '< 7.1.0' diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Gemfile.lock b/trikot-viewmodels-declarative-flow/sample/ios/Gemfile.lock index 32d468f75..fdc820c3d 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Gemfile.lock +++ b/trikot-viewmodels-declarative-flow/sample/ios/Gemfile.lock @@ -1,26 +1,35 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.6) - rexml - activesupport (7.0.8) + CFPropertyList (3.0.8) + activesupport (7.0.10) + base64 + benchmark (>= 0.3) + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) + mutex_m + securerandom (>= 0.3) tzinfo (~> 2.0) - addressable (2.8.5) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) + base64 (0.3.0) + benchmark (0.5.0) + bigdecimal (4.1.1) claide (1.1.0) - cocoapods (1.13.0) + cocoapods (1.16.2) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.13.0) + cocoapods-core (= 1.16.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.6.0, < 2.0) + cocoapods-downloader (>= 2.1, < 3.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-trunk (>= 1.6.0, < 2.0) @@ -32,8 +41,8 @@ GEM molinillo (~> 0.8.0) nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) - xcodeproj (>= 1.23.0, < 2.0) - cocoapods-core (1.13.0) + xcodeproj (>= 1.27.0, < 2.0) + cocoapods-core (1.16.2) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -44,7 +53,7 @@ GEM public_suffix (~> 4.0) typhoeus (~> 1.0) cocoapods-deintegrate (1.0.5) - cocoapods-downloader (1.6.3) + cocoapods-downloader (2.1) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.1) @@ -53,40 +62,49 @@ GEM netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.2.2) + concurrent-ruby (1.3.6) diff-lcs (1.1.3) + drb (2.2.3) escape (0.0.4) - ethon (0.16.0) + ethon (0.18.0) ffi (>= 1.15.0) - ffi (1.16.3) + logger + ffi (1.17.4-arm64-darwin) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - httpclient (2.8.3) - i18n (1.14.1) + httpclient (2.9.0) + mutex_m + i18n (1.14.8) concurrent-ruby (~> 1.0) - json (2.6.3) - minitest (5.20.0) + json (2.19.3) + logger (1.7.0) + minitest (6.0.3) + drb (~> 2.0) + prism (~> 1.5) molinillo (0.8.0) - nanaimo (0.3.0) + mutex_m (0.3.0) + nanaimo (0.4.0) nap (1.1.0) netrc (0.11.0) + prism (1.9.0) public_suffix (4.0.7) - rexml (3.2.6) + rexml (3.4.4) rspec-expectations (2.11.2) diff-lcs (~> 1.1.3) ruby-macho (2.5.1) - typhoeus (1.4.0) - ethon (>= 0.9.0) + securerandom (0.4.1) + typhoeus (1.6.0) + ethon (>= 0.18.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - xcodeproj (1.23.0) + xcodeproj (1.27.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.3.0) - rexml (~> 3.2.4) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) PLATFORMS arm64-darwin-20 @@ -95,7 +113,7 @@ PLATFORMS DEPENDENCIES activesupport (>= 6.1.7.3, < 7.1.0) - cocoapods (= 1.13.0) + cocoapods (= 1.16.2) rspec-expectations (= 2.11.2) BUNDLED WITH diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Podfile b/trikot-viewmodels-declarative-flow/sample/ios/Podfile index c33686460..732faae87 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Podfile +++ b/trikot-viewmodels-declarative-flow/sample/ios/Podfile @@ -1,13 +1,13 @@ -platformVersion = '14.0' +platformVersion = '15.0' platform :ios, platformVersion -ENV['TRIKOT_FRAMEWORK_NAME']='TRIKOT_FRAMEWORK_NAME' +ENV['TRIKOT_FRAMEWORK_NAME']='SampleTrikotFrameworkName' target 'Sample' do use_frameworks! - pod 'TRIKOT_FRAMEWORK_NAME', :path => '../common' + pod 'SampleTrikotFrameworkName', :path => '../common' pod 'Trikot/viewmodels.declarative.flow', :path => '../../..' pod 'Trikot/viewmodels.declarative.SwiftUI.flow', :path => '../../..' pod 'Trikot/kword', :path => '../../..', :inhibit_warnings => true diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Podfile.lock b/trikot-viewmodels-declarative-flow/sample/ios/Podfile.lock index 86b8b7d74..ec6dcdece 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Podfile.lock +++ b/trikot-viewmodels-declarative-flow/sample/ios/Podfile.lock @@ -1,44 +1,40 @@ PODS: - Kingfisher (7.10.1) + - SampleTrikotFrameworkName (6.1.0-SNAPSHOT) - SwiftLint (0.52.3) - - SwiftUIIntrospect (1.0.0) - - Trikot/kword (5.4.0-SNAPSHOT): - - TRIKOT_FRAMEWORK_NAME - - Trikot/viewmodels.declarative.flow (5.4.0-SNAPSHOT): - - TRIKOT_FRAMEWORK_NAME - - Trikot/viewmodels.declarative.SwiftUI.flow (5.4.0-SNAPSHOT): + - Trikot/kword (6.1.0-SNAPSHOT): + - SampleTrikotFrameworkName + - Trikot/viewmodels.declarative.flow (6.1.0-SNAPSHOT): + - SampleTrikotFrameworkName + - Trikot/viewmodels.declarative.SwiftUI.flow (6.1.0-SNAPSHOT): - Kingfisher (~> 7.10.1) - - SwiftUIIntrospect (~> 1.0) + - SampleTrikotFrameworkName - Trikot/viewmodels.declarative.flow - - TRIKOT_FRAMEWORK_NAME - - TRIKOT_FRAMEWORK_NAME (5.4.0-SNAPSHOT) DEPENDENCIES: + - SampleTrikotFrameworkName (from `../common`) - SwiftLint - Trikot/kword (from `../../..`) - Trikot/viewmodels.declarative.flow (from `../../..`) - Trikot/viewmodels.declarative.SwiftUI.flow (from `../../..`) - - TRIKOT_FRAMEWORK_NAME (from `../common`) SPEC REPOS: trunk: - Kingfisher - SwiftLint - - SwiftUIIntrospect EXTERNAL SOURCES: + SampleTrikotFrameworkName: + :path: "../common" Trikot: :path: "../../.." - TRIKOT_FRAMEWORK_NAME: - :path: "../common" SPEC CHECKSUMS: Kingfisher: bc5abe80a8e0144537ef1dd5a0b2621b04f7f439 + SampleTrikotFrameworkName: 08041e3b74983c25ac247be37e86b11777298d76 SwiftLint: 76ec9c62ad369cff2937474cb34c9af3fa270b7b - SwiftUIIntrospect: 9f15bf51d1a7582e168a683debca38649f3e152e - Trikot: cf1117e1fef1ec0dbd6ee26e2cc564a2e467eee9 - TRIKOT_FRAMEWORK_NAME: 31367d2dcf97d4e261f892b0a668a36f81b8a2bd + Trikot: 2e3e14b931cbd1436e5b2ec62b601e0c312b68db -PODFILE CHECKSUM: 3ea922a40d3e15204de5e4af30076387b6e5f2c9 +PODFILE CHECKSUM: 0f8e5d84489357d6111d65c4132c92427642bdec -COCOAPODS: 1.13.0 +COCOAPODS: 1.16.2 diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample.xcodeproj/project.pbxproj b/trikot-viewmodels-declarative-flow/sample/ios/Sample.xcodeproj/project.pbxproj index ca48e1186..7877e41b0 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample.xcodeproj/project.pbxproj +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample.xcodeproj/project.pbxproj @@ -578,7 +578,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.5; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -633,7 +633,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.5; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/AppBootstrap.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/AppBootstrap.swift index 3b28819c5..403d22ac6 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/AppBootstrap.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/AppBootstrap.swift @@ -1,5 +1,5 @@ import Foundation -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName import Trikot class AppBootstrap { diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/SampleImageProvider.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/SampleImageProvider.swift index eb4ae3e82..0c0cd5e06 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/SampleImageProvider.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/SampleImageProvider.swift @@ -1,5 +1,5 @@ import SwiftUI -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName import Trikot class SampleImageProvider: VMDImageProvider { diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/SampleSpanStyleProvider.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/SampleSpanStyleProvider.swift index b4d7c7ca9..f137fb39a 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/SampleSpanStyleProvider.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/SampleSpanStyleProvider.swift @@ -1,5 +1,5 @@ import SwiftUI -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName import Trikot class SampleSpanStyleProvider: VMDSpanStyleProvider { diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/SceneDelegate.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/SceneDelegate.swift index 97bd6c988..d206c91d6 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/SceneDelegate.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/SceneDelegate.swift @@ -1,6 +1,6 @@ import UIKit import SwiftUI -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName class SceneDelegate: UIResponder, UIWindowSceneDelegate { diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/BaseViewModelViewController.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/BaseViewModelViewController.swift index f2a422e96..4f6f95ae4 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/BaseViewModelViewController.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/BaseViewModelViewController.swift @@ -1,5 +1,5 @@ import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName class BaseViewModelViewController, VM, V: RootViewModelView, N: VMDNavigationDelegate>: ViewModelViewController where VM == V.VM { var viewControllerFactory: ViewControllerFactory! diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Home/HomeView.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Home/HomeView.swift index abde4ab35..32bdac3e3 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Home/HomeView.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Home/HomeView.swift @@ -1,6 +1,6 @@ import SwiftUI import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName struct HomeView: RootViewModelView { typealias VM = HomeViewModel diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Home/HomeViewController.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Home/HomeViewController.swift index dda0940c0..7fdddb27d 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Home/HomeViewController.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Home/HomeViewController.swift @@ -1,6 +1,6 @@ import UIKit import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName class HomeViewController: BaseViewModelViewController {} diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Home/ListItem/HomeListItemView.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Home/ListItem/HomeListItemView.swift index b64e21f7d..4a3b674f2 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Home/ListItem/HomeListItemView.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Home/ListItem/HomeListItemView.swift @@ -1,6 +1,6 @@ import SwiftUI import Trikot_viewmodels_declarative -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName struct HomeListItemView: ViewModelView { typealias VM = HomeListItemViewModel diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Animations/Types/AnimationTypeSectionView.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Animations/Types/AnimationTypeSectionView.swift index 468ba68c4..2e065ee9b 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Animations/Types/AnimationTypeSectionView.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Animations/Types/AnimationTypeSectionView.swift @@ -1,6 +1,6 @@ import SwiftUI import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName struct AnimationTypeSectionView: ViewModelView { typealias VM = AnimationTypeShowcaseViewModel diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Animations/Types/AnimationTypesShowcaseView.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Animations/Types/AnimationTypesShowcaseView.swift index 7dc0bcdde..35c2ebe77 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Animations/Types/AnimationTypesShowcaseView.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Animations/Types/AnimationTypesShowcaseView.swift @@ -1,6 +1,6 @@ import SwiftUI import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName struct AnimationTypesShowcaseView: RootViewModelView { typealias VM = AnimationTypesShowcaseViewModel diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Animations/Types/AnimationTypesShowcaseViewController.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Animations/Types/AnimationTypesShowcaseViewController.swift index ae90f5e5f..47b5154bd 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Animations/Types/AnimationTypesShowcaseViewController.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Animations/Types/AnimationTypesShowcaseViewController.swift @@ -1,6 +1,6 @@ import UIKit import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName class AnimationTypesShowcaseViewController: BaseViewModelViewController { override var preferredStatusBarStyle: UIStatusBarStyle { diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Button/ButtonShowcaseView.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Button/ButtonShowcaseView.swift index fd7702e84..15b138409 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Button/ButtonShowcaseView.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Button/ButtonShowcaseView.swift @@ -1,6 +1,6 @@ import SwiftUI import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName struct ButtonShowcaseView: RootViewModelView { typealias VM = ButtonShowcaseViewModel diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Button/ButtonShowcaseViewController.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Button/ButtonShowcaseViewController.swift index 4cd0a4f03..c4aaf923c 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Button/ButtonShowcaseViewController.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Button/ButtonShowcaseViewController.swift @@ -1,6 +1,6 @@ import UIKit import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName class ButtonShowcaseViewController: BaseViewModelViewController { override var preferredStatusBarStyle: UIStatusBarStyle { diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Image/ImageShowcaseView.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Image/ImageShowcaseView.swift index 97420f61b..5170ad81f 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Image/ImageShowcaseView.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Image/ImageShowcaseView.swift @@ -1,6 +1,6 @@ import SwiftUI import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName struct ImageShowcaseView: RootViewModelView { typealias VM = ImageShowcaseViewModel diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Image/ImageShowcaseViewController.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Image/ImageShowcaseViewController.swift index ba28cadc2..5eab59dce 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Image/ImageShowcaseViewController.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Image/ImageShowcaseViewController.swift @@ -1,6 +1,6 @@ import UIKit import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName class ImageShowcaseViewController: BaseViewModelViewController { override var preferredStatusBarStyle: UIStatusBarStyle { diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Picker/PickerShowcaseView.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Picker/PickerShowcaseView.swift index f8c94c0c8..0e3c592bd 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Picker/PickerShowcaseView.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Picker/PickerShowcaseView.swift @@ -1,6 +1,6 @@ import SwiftUI import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName struct PickerShowcaseView: RootViewModelView { typealias VM = PickerShowcaseViewModel diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Picker/PickerShowcaseViewController.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Picker/PickerShowcaseViewController.swift index a2e265156..80a3e51eb 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Picker/PickerShowcaseViewController.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Picker/PickerShowcaseViewController.swift @@ -1,6 +1,6 @@ import UIKit import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName class PickerShowcaseViewController: BaseViewModelViewController { override var preferredStatusBarStyle: UIStatusBarStyle { diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Progress/ProgressShowcaseView.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Progress/ProgressShowcaseView.swift index e1a85d2fb..c427ad6ec 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Progress/ProgressShowcaseView.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Progress/ProgressShowcaseView.swift @@ -1,6 +1,6 @@ import SwiftUI import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName struct ProgressShowcaseView: RootViewModelView { typealias VM = ProgressShowcaseViewModel diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Progress/ProgressShowcaseViewController.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Progress/ProgressShowcaseViewController.swift index de7d95016..2f449fdca 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Progress/ProgressShowcaseViewController.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Progress/ProgressShowcaseViewController.swift @@ -1,6 +1,6 @@ import UIKit import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName class ProgressShowcaseViewController: BaseViewModelViewController { override var preferredStatusBarStyle: UIStatusBarStyle { diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Snackbar/SnackbarShowcaseView.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Snackbar/SnackbarShowcaseView.swift index add3f94d8..51ddd9c82 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Snackbar/SnackbarShowcaseView.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Snackbar/SnackbarShowcaseView.swift @@ -1,6 +1,6 @@ import SwiftUI import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName struct SnackbarShowcaseView: RootViewModelView { typealias VM = SnackbarShowcaseViewModel @@ -24,7 +24,7 @@ struct SnackbarShowcaseView: RootViewModelView { VMDButton(button) { textContent in Text(textContent.text) } - .foregroundColor(.black) + .foregroundColor(.primary) } } .frame(maxWidth: .infinity, alignment: .leading) diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Snackbar/SnackbarShowcaseViewController.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Snackbar/SnackbarShowcaseViewController.swift index dbf522cfc..7e18335c7 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Snackbar/SnackbarShowcaseViewController.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Snackbar/SnackbarShowcaseViewController.swift @@ -1,6 +1,6 @@ import UIKit import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName class SnackbarShowcaseViewController: BaseViewModelViewController { override var preferredStatusBarStyle: UIStatusBarStyle { diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Snackbar/SnackbarView.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Snackbar/SnackbarView.swift index f976de30d..480f46901 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Snackbar/SnackbarView.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Snackbar/SnackbarView.swift @@ -1,6 +1,6 @@ import SwiftUI import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName struct SnackbarView: View { diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Text/TextShowcaseView.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Text/TextShowcaseView.swift index b597fc940..58824b85d 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Text/TextShowcaseView.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Text/TextShowcaseView.swift @@ -1,6 +1,6 @@ import SwiftUI import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName struct TextShowcaseView: RootViewModelView { typealias VM = TextShowcaseViewModel @@ -93,7 +93,7 @@ struct TextShowcaseView: RootViewModelView { fontSize: 12, lineHeight: 12 ), - color: .black, + color: .primary, linkTextAttributes: [ .foregroundColor: UIColor.green ] ) } diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Text/TextShowcaseViewController.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Text/TextShowcaseViewController.swift index 9e05463d2..759886919 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Text/TextShowcaseViewController.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Text/TextShowcaseViewController.swift @@ -1,6 +1,6 @@ import UIKit import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName class TextShowcaseViewController: BaseViewModelViewController { override var preferredStatusBarStyle: UIStatusBarStyle { diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/TextField/TextFieldShowcaseView.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/TextField/TextFieldShowcaseView.swift index 3f60b40a4..29405ce3d 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/TextField/TextFieldShowcaseView.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/TextField/TextFieldShowcaseView.swift @@ -1,6 +1,6 @@ import SwiftUI import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName struct TextFieldShowcaseView: RootViewModelView { typealias VM = TextFieldShowcaseViewModel @@ -20,16 +20,11 @@ struct TextFieldShowcaseView: RootViewModelView { ScrollView { VStack(alignment: .leading) { HStack { - if #available(iOS 15, *) { - VMDTextField(viewModel.textField) { placeholder in - Text(placeholder) - .foregroundColor(.red) - } - .textFieldStyle(.roundedBorder) - } else { - VMDTextField(viewModel.textField) - .textFieldStyle(.roundedBorder) + VMDTextField(viewModel.textField) { placeholder in + Text(placeholder) + .foregroundColor(.red) } + .textFieldStyle(.roundedBorder) VMDButton(viewModel.clearButton) { textContent in Text(textContent.text) diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/TextField/TextFieldShowcaseViewController.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/TextField/TextFieldShowcaseViewController.swift index 87cfbac5f..6e7bb2909 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/TextField/TextFieldShowcaseViewController.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/TextField/TextFieldShowcaseViewController.swift @@ -1,6 +1,6 @@ import UIKit import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName class TextFieldShowcaseViewController: BaseViewModelViewController { override var preferredStatusBarStyle: UIStatusBarStyle { diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Toggle/ToggleShowcaseView.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Toggle/ToggleShowcaseView.swift index 19a95ec6f..31cd2b3ea 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Toggle/ToggleShowcaseView.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Toggle/ToggleShowcaseView.swift @@ -1,6 +1,6 @@ import SwiftUI import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName struct ToggleShowcaseView: RootViewModelView { typealias VM = ToggleShowcaseViewModel diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Toggle/ToggleShowcaseViewController.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Toggle/ToggleShowcaseViewController.swift index be1f95aa6..c0de6be89 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Toggle/ToggleShowcaseViewController.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Components/Toggle/ToggleShowcaseViewController.swift @@ -1,6 +1,6 @@ import UIKit import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName class ToggleShowcaseViewController: BaseViewModelViewController { override var preferredStatusBarStyle: UIStatusBarStyle { diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Utilities/ComponentShowcaseSectionView.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Utilities/ComponentShowcaseSectionView.swift index 5298ac863..dfa73a238 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Utilities/ComponentShowcaseSectionView.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/Showcase/Utilities/ComponentShowcaseSectionView.swift @@ -1,6 +1,6 @@ import SwiftUI import Trikot -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName struct ComponentShowcaseSectionView: View { private let titleTextViewModel: VMDTextViewModel diff --git a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/ViewControllerFactory.swift b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/ViewControllerFactory.swift index d650c2807..d14fe2583 100644 --- a/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/ViewControllerFactory.swift +++ b/trikot-viewmodels-declarative-flow/sample/ios/Sample/UI/ViewControllerFactory.swift @@ -1,5 +1,5 @@ import UIKit -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName import Trikot public class ViewControllerFactory { diff --git a/trikot-viewmodels-declarative-flow/swift/core/VMDFlowUtils.swift b/trikot-viewmodels-declarative-flow/swift/core/VMDFlowUtils.swift index b09faa63d..0925c382b 100644 --- a/trikot-viewmodels-declarative-flow/swift/core/VMDFlowUtils.swift +++ b/trikot-viewmodels-declarative-flow/swift/core/VMDFlowUtils.swift @@ -1,5 +1,5 @@ import Foundation -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public class ObservableFlowWrapper: ObservableObject { @Published public var value: T? diff --git a/trikot-viewmodels-declarative-flow/swift/core/VMDImageDescriptor+Utilities.swift b/trikot-viewmodels-declarative-flow/swift/core/VMDImageDescriptor+Utilities.swift index 30b261183..14739d29a 100644 --- a/trikot-viewmodels-declarative-flow/swift/core/VMDImageDescriptor+Utilities.swift +++ b/trikot-viewmodels-declarative-flow/swift/core/VMDImageDescriptor+Utilities.swift @@ -1,5 +1,5 @@ import Foundation -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName extension VMDImageDescriptor.Remote { var imageURL: URL? { diff --git a/trikot-viewmodels-declarative-flow/swift/core/VMDKeyboardAutoCapitalization+UIKit.swift b/trikot-viewmodels-declarative-flow/swift/core/VMDKeyboardAutoCapitalization+UIKit.swift index b65f35dde..e55058eb2 100644 --- a/trikot-viewmodels-declarative-flow/swift/core/VMDKeyboardAutoCapitalization+UIKit.swift +++ b/trikot-viewmodels-declarative-flow/swift/core/VMDKeyboardAutoCapitalization+UIKit.swift @@ -1,5 +1,5 @@ import UIKit -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public extension VMDKeyboardAutoCapitalization { public var uiTextAutocapitalizationType: UITextAutocapitalizationType { diff --git a/trikot-viewmodels-declarative-flow/swift/core/VMDKeyboardReturnKeyType+UIKit.swift b/trikot-viewmodels-declarative-flow/swift/core/VMDKeyboardReturnKeyType+UIKit.swift index 561f4be7e..144e51771 100644 --- a/trikot-viewmodels-declarative-flow/swift/core/VMDKeyboardReturnKeyType+UIKit.swift +++ b/trikot-viewmodels-declarative-flow/swift/core/VMDKeyboardReturnKeyType+UIKit.swift @@ -1,5 +1,5 @@ import UIKit -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public extension VMDKeyboardReturnKeyType { public var uiReturnKeyType: UIReturnKeyType { diff --git a/trikot-viewmodels-declarative-flow/swift/core/VMDKeyboardType+UIKit.swift b/trikot-viewmodels-declarative-flow/swift/core/VMDKeyboardType+UIKit.swift index c10f06ae2..0d7dc0198 100644 --- a/trikot-viewmodels-declarative-flow/swift/core/VMDKeyboardType+UIKit.swift +++ b/trikot-viewmodels-declarative-flow/swift/core/VMDKeyboardType+UIKit.swift @@ -1,5 +1,5 @@ import UIKit -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public extension VMDKeyboardType { var uiKeyboardType: UIKeyboardType { diff --git a/trikot-viewmodels-declarative-flow/swift/core/VMDTextContentType+UIKit.swift b/trikot-viewmodels-declarative-flow/swift/core/VMDTextContentType+UIKit.swift index 07d81e978..65808e6c2 100644 --- a/trikot-viewmodels-declarative-flow/swift/core/VMDTextContentType+UIKit.swift +++ b/trikot-viewmodels-declarative-flow/swift/core/VMDTextContentType+UIKit.swift @@ -1,5 +1,5 @@ import UIKit -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public extension VMDTextContentType { public var uiTextContentType: UITextContentType? { @@ -55,17 +55,9 @@ public extension VMDTextContentType { case .password: return .password case .newpassword: - if #available(iOS 12.0, *) { - return .newPassword - } else { - return nil - } + return .newPassword case .onetimecode: - if #available(iOS 12.0, *) { - return .oneTimeCode - } else { - return nil - } + return .oneTimeCode default: return nil } diff --git a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/Snackbar/VMDSnackBarStateObject.swift b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/Snackbar/VMDSnackBarStateObject.swift index b40d25c9e..090c9fd6b 100644 --- a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/Snackbar/VMDSnackBarStateObject.swift +++ b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/Snackbar/VMDSnackBarStateObject.swift @@ -1,5 +1,5 @@ import SwiftUI -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public class VMDSnackBarStateObject: ObservableObject { @Published public var message = "" diff --git a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/Snackbar/VMDSnackbar.swift b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/Snackbar/VMDSnackbar.swift index 06a5c2564..55636017d 100644 --- a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/Snackbar/VMDSnackbar.swift +++ b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/Snackbar/VMDSnackbar.swift @@ -1,5 +1,5 @@ import SwiftUI -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public struct VMDSnackbar: View where Content: View { private let viewDataFlow: VMDFlow diff --git a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDButton+Configuration.swift b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDButton+Configuration.swift index 5d9e3570a..33a56d124 100644 --- a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDButton+Configuration.swift +++ b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDButton+Configuration.swift @@ -1,5 +1,5 @@ import SwiftUI -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public extension VMDButton { func externalActionHandler(_ action: @escaping (_ action: () -> Void) -> Void) -> VMDButton { diff --git a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDButton.swift b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDButton.swift index 31d66ffc9..ba97d8694 100644 --- a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDButton.swift +++ b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDButton.swift @@ -1,5 +1,5 @@ import SwiftUI -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public struct VMDButton: View where Label: View { private let labelBuilder: (Content) -> Label diff --git a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDForEach.swift b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDForEach.swift index c351bb9fc..4fc6db584 100644 --- a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDForEach.swift +++ b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDForEach.swift @@ -1,5 +1,5 @@ import SwiftUI -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName import Trikot public struct VMDForEach: DynamicViewContent where RowContent: View, DividerContent: View, Identifiable: VMDIdentifiableContent, Content: VMDContent { diff --git a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDHtmlText.swift b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDHtmlText.swift index a72a69e68..beb7567a1 100644 --- a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDHtmlText.swift +++ b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDHtmlText.swift @@ -1,5 +1,5 @@ import SwiftUI -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName import UIKit public struct VMDHtmlText: View { diff --git a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDImage+Configuration.swift b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDImage+Configuration.swift index b50de74bc..8a45e9a34 100644 --- a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDImage+Configuration.swift +++ b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDImage+Configuration.swift @@ -1,5 +1,5 @@ import SwiftUI -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public extension VMDImage { func resizable() -> VMDImage { diff --git a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDImage.swift b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDImage.swift index e1447d99e..614ca0b0a 100644 --- a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDImage.swift +++ b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDImage.swift @@ -1,5 +1,5 @@ import SwiftUI -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName import Kingfisher public struct VMDImage: View { diff --git a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDImageButton.swift b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDImageButton.swift index 338a61231..97f4dd9e7 100644 --- a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDImageButton.swift +++ b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDImageButton.swift @@ -1,5 +1,5 @@ import SwiftUI -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public struct VMDImageButton: View { diff --git a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDList.swift b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDList.swift index fa3eb9ca1..4ab7dad3a 100644 --- a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDList.swift +++ b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDList.swift @@ -1,5 +1,5 @@ import SwiftUI -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public struct VMDList: View where RowContent: View, Identifiable: VMDIdentifiableContent, Content: VMDContent { private let rowContentBuilder: (Content) -> RowContent diff --git a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDPicker.swift b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDPicker.swift index 9cb213e64..c78473940 100644 --- a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDPicker.swift +++ b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDPicker.swift @@ -1,5 +1,5 @@ import SwiftUI -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public struct VMDPicker: View where Label: View { private let labelBuilder: (Content) -> Label diff --git a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDProgressView.swift b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDProgressView.swift index 50fc633a8..a2f2301ba 100644 --- a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDProgressView.swift +++ b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDProgressView.swift @@ -1,5 +1,5 @@ import SwiftUI -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public struct VMDProgressView: View where Label : View, CurrentValueLabel : View { private var viewModel: VMDProgressViewModel { diff --git a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDText.swift b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDText.swift index 02d4f9099..58ae386cc 100644 --- a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDText.swift +++ b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDText.swift @@ -1,5 +1,5 @@ import SwiftUI -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public struct VMDText: View { public typealias TextConfiguration = (Text) -> Text @@ -27,11 +27,7 @@ public struct VMDText: View { if viewModel.spans.isEmpty { return Text(viewModel.text) } else { - if #available(iOS 15, *) { - return Text(AttributedString(text: viewModel.text, spans: viewModel.spans)) - } else { - return Text(viewModel.text) - } + return Text(AttributedString(text: viewModel.text, spans: viewModel.spans)) } } diff --git a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDTextField.swift b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDTextField.swift index b967c7997..f9fa8e404 100644 --- a/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDTextField.swift +++ b/trikot-viewmodels-declarative-flow/swift/swiftui/Components/VMDTextField.swift @@ -1,5 +1,5 @@ import SwiftUI -import TRIKOT_FRAMEWORK_NAME +import SampleTrikotFrameworkName public struct VMDTextField