Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby 2.7.5
ruby 3.4.4
16 changes: 8 additions & 8 deletions Trikot.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -43,15 +43,15 @@ 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

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'
Expand Down Expand Up @@ -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

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

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Project.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "TrikotFrameworkName"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import FirebaseAnalytics
import Foundation
import TRIKOT_FRAMEWORK_NAME
import TrikotFrameworkName

public class FirebaseAnalyticsService: AnalyticsService {
public var name: String = "FirebaseAnalytics"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Foundation
import Mixpanel
import TRIKOT_FRAMEWORK_NAME
import TrikotFrameworkName

public class MixpanelAnalyticsService: AnalyticsService {
public init(enableAnalytics: Bool = true) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import TRIKOT_FRAMEWORK_NAME
import TrikotFrameworkName
import CoreBluetooth

class TrikotAttributeProfileCharacteristic: NSObject, AttributeProfileCharacteristic {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import TRIKOT_FRAMEWORK_NAME
import TrikotFrameworkName
import CoreBluetooth

class TrikotAttributeProfileService: NSObject, AttributeProfileService {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import TRIKOT_FRAMEWORK_NAME
import TrikotFrameworkName
import CoreBluetooth

class TrikotBluetoothDevice: NSObject, BluetoothDevice, CBPeripheralDelegate {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Foundation
import TRIKOT_FRAMEWORK_NAME
import TrikotFrameworkName

extension Publisher {
func asBehaviorSubject() -> BehaviorSubject {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import TRIKOT_FRAMEWORK_NAME
import TrikotFrameworkName
import CoreBluetooth
import Dispatch

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import TRIKOT_FRAMEWORK_NAME
import TrikotFrameworkName
import CoreBluetooth

class TrikotBluetoothScanResult: NSObject, BluetoothScanResult {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Foundation
import Reachability
import TRIKOT_FRAMEWORK_NAME
import TrikotFrameworkName

public class TrikotConnectivityService {
public static let shared = TrikotConnectivityService()
Expand Down
2 changes: 1 addition & 1 deletion trikot-http/swift-extensions/TrikotHttpRequest.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Foundation
import TRIKOT_FRAMEWORK_NAME
import TrikotFrameworkName

public class TrikotHttpRequest: NSObject, HttpRequest {
private struct Constants {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Foundation
import TRIKOT_FRAMEWORK_NAME
import TrikotFrameworkName

open class TrikotHttpRequestFactory: NSObject, HttpRequestFactory {
private let httpLogLevel: TrikotHttpLogLevel
Expand Down
2 changes: 1 addition & 1 deletion trikot-http/swift-extensions/TrikotHttpResponse.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Foundation
import TRIKOT_FRAMEWORK_NAME
import TrikotFrameworkName

public class TrikotHttpResponse: NSObject, HttpResponse {

Expand Down
2 changes: 1 addition & 1 deletion trikot-kword/sample/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Generated
/common/src/commonMain/generated
/common/TRIKOT_FRAMEWORK_NAME.podspec
/common/TrikotFrameworkName.podspec
2 changes: 1 addition & 1 deletion trikot-kword/sample/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {

group = "com.mirego.sample"

val frameworkName = "TRIKOT_FRAMEWORK_NAME"
val frameworkName = Project.TRIKOT_SAMPLES_FRAMEWORK_NAME

configurations {
create("testApi") {}
Expand Down
8 changes: 4 additions & 4 deletions trikot-kword/sample/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
platformVersion = '14.0'
platformVersion = '15.0'

platform :ios, platformVersion

ENV['TRIKOT_FRAMEWORK_NAME']='TRIKOT_FRAMEWORK_NAME'
ENV['TRIKOT_FRAMEWORK_NAME']='TrikotFrameworkName'

target 'Sample' do
use_frameworks!

pod 'TRIKOT_FRAMEWORK_NAME', :path => '../common'
pod 'TrikotFrameworkName', :path => '../common'
pod 'Trikot/kword', :path => '../../..'
pod 'SwiftLint'
end
Expand All @@ -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 == "TrikotFrameworkName"
target.build_configurations.each do |config|
config.build_settings['COCOAPODS_SKIP_KOTLIN_BUILD'] = '$ENABLE_PREVIEWS'
end
Expand Down
18 changes: 9 additions & 9 deletions trikot-kword/sample/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
PODS:
- SwiftLint (0.43.1)
- Trikot/kword (6.1.0-SNAPSHOT):
- TRIKOT_FRAMEWORK_NAME
- TRIKOT_FRAMEWORK_NAME (6.1.0-SNAPSHOT)
- Trikot/kword (6.1.0):
- TrikotFrameworkName
- TrikotFrameworkName (6.1.0-SNAPSHOT)

DEPENDENCIES:
- SwiftLint
- Trikot/kword (from `../../..`)
- TRIKOT_FRAMEWORK_NAME (from `../common`)
- TrikotFrameworkName (from `../common`)

SPEC REPOS:
trunk:
Expand All @@ -16,14 +16,14 @@ SPEC REPOS:
EXTERNAL SOURCES:
Trikot:
:path: "../../.."
TRIKOT_FRAMEWORK_NAME:
TrikotFrameworkName:
:path: "../common"

SPEC CHECKSUMS:
SwiftLint: 99f82d07b837b942dd563c668de129a03fc3fb52
Trikot: 121ce6aa18c2c64ad24bbd3248e7e3729d4eb084
TRIKOT_FRAMEWORK_NAME: cc4fb315c852a618ee87c1d9384f3aea43aeffe5
Trikot: 08dfef6e2442562a3d8aaaa9300d9a4943f08d17
TrikotFrameworkName: c6eae6fc85e3e420f3a18dc887662cd2dacba7e7

PODFILE CHECKSUM: cd5b1ad5ff7d13e99dec5f4c7a746099a745e482
PODFILE CHECKSUM: 25dafccd6891d8615e7d4068cde885b1f8750f14

COCOAPODS: 1.16.2
COCOAPODS: 1.13.0
4 changes: 2 additions & 2 deletions trikot-kword/sample/ios/Sample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion trikot-kword/sample/ios/Sample/Collector.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import TRIKOT_FRAMEWORK_NAME
import TrikotFrameworkName

class Collector<T>: FlowCollector {
let callback:(T) -> Void
Expand Down
2 changes: 1 addition & 1 deletion trikot-kword/sample/ios/Sample/ContentView.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import SwiftUI
import TRIKOT_FRAMEWORK_NAME
import TrikotFrameworkName

struct ContentView: View {

Expand Down
2 changes: 1 addition & 1 deletion trikot-kword/sample/ios/Sample/FlowUtils.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Foundation
import TRIKOT_FRAMEWORK_NAME
import TrikotFrameworkName

public class ObservableFlowWrapper<T: AnyObject>: ObservableObject {
@Published public var value: T
Expand Down
2 changes: 1 addition & 1 deletion trikot-kword/sample/ios/Sample/SampleApp.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import SwiftUI
import TRIKOT_FRAMEWORK_NAME
import TrikotFrameworkName

@main
struct SampleApp: App {
Expand Down
2 changes: 1 addition & 1 deletion trikot-kword/swift-extensions/TrikotKword.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Foundation
import Trikot
import TRIKOT_FRAMEWORK_NAME
import TrikotFrameworkName

public class TrikotKword: NSObject {
public static let translationBasePaths = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Foundation
import TRIKOT_FRAMEWORK_NAME
import TrikotFrameworkName

extension NSObject {
private final class iOSCancellableManagerHolder {
Expand Down
16 changes: 8 additions & 8 deletions trikot-streams/swift-extensions/combine/CombineExensions.swift
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Combine
import TRIKOT_FRAMEWORK_NAME
import TrikotFrameworkName

public class PublisherAdapter<T>: Combine.Publisher {
private let publisher: TRIKOT_FRAMEWORK_NAME.Publisher
private let publisher: TrikotFrameworkName.Publisher

public typealias Output = T

Expand All @@ -12,12 +12,12 @@ public class PublisherAdapter<T>: Combine.Publisher {
publisher.subscribe(s: SubscriberAdapter(subscriber))
}

public init(_ publisher: TRIKOT_FRAMEWORK_NAME.Publisher) {
public init(_ publisher: TrikotFrameworkName.Publisher) {
self.publisher = publisher
}
}

public class SubscriberAdapter<S: Combine.Subscriber>: TRIKOT_FRAMEWORK_NAME.Subscriber {
public class SubscriberAdapter<S: Combine.Subscriber>: TrikotFrameworkName.Subscriber {
private let subscriber: S

public init(_ subscriber: S) {
Expand Down Expand Up @@ -46,15 +46,15 @@ public class SubscriberAdapter<S: Combine.Subscriber>: TRIKOT_FRAMEWORK_NAME.Sub
}
}

public func onSubscribe(s: TRIKOT_FRAMEWORK_NAME.Subscription) {
public func onSubscribe(s: TrikotFrameworkName.Subscription) {
subscriber.receive(subscription: SubscriptionAdapter(s))
}
}

public class SubscriptionAdapter: Combine.Subscription {
private let subscription: TRIKOT_FRAMEWORK_NAME.Subscription
private let subscription: TrikotFrameworkName.Subscription

init(_ subscription: TRIKOT_FRAMEWORK_NAME.Subscription) {
init(_ subscription: TrikotFrameworkName.Subscription) {
self.subscription = subscription
}

Expand All @@ -71,7 +71,7 @@ public class SubscriptionAdapter: Combine.Subscription {
}
}

extension TRIKOT_FRAMEWORK_NAME.Publisher {
extension TrikotFrameworkName.Publisher {
public func asCombinePublisher<T>(type: T.Type) -> AnyPublisher<T, Never> {
AnyPublisher(PublisherAdapter<T>(self))
}
Expand Down
1 change: 1 addition & 0 deletions trikot-viewmodels-declarative-flow/sample/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# Generated
/common/src/commonMain/generated
/common/TrikotFrameworkName.podspec
Loading
Loading