Skip to content

Commit 97799a1

Browse files
committed
maestro changes + desktop/web/ios client build fixes
1 parent 587ed8a commit 97799a1

File tree

10 files changed

+53
-21
lines changed

10 files changed

+53
-21
lines changed

fastlane/Fastfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ default_platform :android
44

55
platform :android do
66

7-
androidVersionNum = 254
8-
wearVersionNum = 329
7+
androidVersionNum = 255
8+
wearVersionNum = 330
99

1010
before_all do
1111
end

gradle/libs.versions.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
[versions]
22
kotlin19 = "1.9.25"
33
ksp19 = "1.9.25-1.0.20"
4-
kotlin = "2.1.0"
5-
ksp = "2.1.0-1.0.29"
4+
kotlin = "2.1.20"
5+
ksp = "2.1.20-1.0.31"
66
kotlinx-coroutines = "1.10.1"
77
kotlinx-datetime = "0.6.2"
88
apollo-kotlin-execution = "0.1.1-SNAPSHOT-3e89cc694ab96bae7b4c1b7b6394c211065551c1"
99

10-
agp = "8.8.0"
10+
agp = "8.9.1"
1111
activity-compose = "1.10.1"
1212
androidx-lifecycle = "2.8.7"
13-
androidx-datastore = "1.1.3"
13+
androidx-datastore = "1.1.4"
1414
apollo = "4.1.1"
1515
apollo-cache = "0.0.8"
1616
compose = "1.7.8"
@@ -19,8 +19,8 @@ compose-multiplatform = "1.7.3"
1919
compose-material3 = "1.3.1"
2020
composeWindowSize = "0.5.0"
2121
credentials = "1.5.0"
22-
decompose = "3.3.0-alpha02"
23-
essenty = "2.4.0"
22+
decompose = "3.3.0"
23+
essenty = "2.5.0"
2424
googleid = "1.1.1"
2525
horologist = "0.7.10-alpha"
2626
io-coil-kt = "2.7.0"
@@ -30,7 +30,7 @@ kmmbridge = "0.5.7"
3030
koin-android = "4.0.0"
3131
koin-android-compose = "4.0.0"
3232
koin-compose-multiplatform = "4.0.4"
33-
koin-core = "4.0.0"
33+
koin-core = "4.0.4"
3434
kotlinx-coroutines-play-services = "1.10.1"
3535
lifecycle = "2.8.7"
3636
lifecycle-livedata-ktx = "2.8.7"

gradle/wrapper/gradle-wrapper.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
#Sat Apr 05 08:30:32 IST 2025
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
3-
distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
4+
distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
56
networkTimeout=10000
67
validateDistributionUrl=true
78
zipStoreBase=GRADLE_USER_HOME

maestro/Confetti.flow

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@ appId: dev.johnoreilly.confetti
22
---
33
- launchApp:
44
clearState: true
5-
- scrollUntilVisible:
6-
element:
7-
id: androidmakers2024
5+
#- scrollUntilVisible:
6+
# element:
7+
# id: androidmakers2025
88
- tapOn:
9-
id: androidmakers2024
10-
- assertVisible: "AndroidMakers by droidcon 2024"
9+
id: androidmakers2025
10+
- assertVisible: "AndroidMakers by droidcon 2025"
1111
- scrollUntilVisible:
1212
element:
13-
text: "Kotlin Multiplatform.*"
14-
- tapOn: "Kotlin Multiplatform.*"
15-
- assertVisible: "Kotlin Multiplatform at Stable and Beyond"
13+
text: "Kotlin and Compose Multiplatform.*"
14+
- tapOn: "Kotlin and Compose Multiplatform.*"
15+
- assertVisible: "Kotlin and Compose Multiplatform patterns for iOS interop"
1616
- tapOn: "Back"
1717

18-
Swift-friendly API Generator for Kotlin Multiplatform
19-
When Swift calls Kotlin through Objective-C, critical Kotlin language features are dropped. SKIE bridges modern types and coroutines in the best way: with real Swift.

shared/src/iosMain/kotlin/dev/johnoreilly/confetti/di/KoiniOS.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ import com.russhwolf.settings.NSUserDefaultsSettings
1313
import com.russhwolf.settings.ObservableSettings
1414
import com.russhwolf.settings.coroutines.toFlowSettings
1515
import dev.johnoreilly.confetti.auth.Authentication
16+
import dev.johnoreilly.confetti.dev.johnoreilly.confetti.work.SessionNotificationSender
1617
import dev.johnoreilly.confetti.utils.DateService
1718
import dev.johnoreilly.confetti.utils.IosDateService
19+
import dev.johnoreilly.confetti.work.NotificationSender
1820
import org.koin.core.module.dsl.bind
1921
import org.koin.core.module.dsl.singleOf
2022
import org.koin.dsl.module
@@ -33,6 +35,7 @@ actual fun platformModule() = module {
3335
.serverUrl("https://confetti-app.dev/graphql")
3436
.addHttpInterceptor(ApolloClientAwarenessInterceptor("confetti-ios", "fixme"))
3537
}
38+
single<NotificationSender> { SessionNotificationSender() }
3639
}
3740

3841
actual fun getNormalizedCacheFactory(conference: String, uid: String?): NormalizedCacheFactory {
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package dev.johnoreilly.confetti.dev.johnoreilly.confetti.work
2+
3+
import dev.johnoreilly.confetti.work.NotificationSender
4+
5+
class SessionNotificationSender: NotificationSender {
6+
override suspend fun sendNotification(selector: NotificationSender.Selector) {
7+
}
8+
}

shared/src/jvmMain/kotlin/dev/johnoreilly/confetti/di/KoinJVM.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ import com.russhwolf.settings.ObservableSettings
1111
import com.russhwolf.settings.PreferencesSettings
1212
import com.russhwolf.settings.coroutines.toFlowSettings
1313
import dev.johnoreilly.confetti.auth.Authentication
14+
import dev.johnoreilly.confetti.dev.johnoreilly.confetti.work.SessionNotificationSender
1415
import dev.johnoreilly.confetti.utils.DateService
1516
import dev.johnoreilly.confetti.utils.JvmDateService
17+
import dev.johnoreilly.confetti.work.NotificationSender
1618
import okhttp3.OkHttpClient
1719
import org.koin.core.module.dsl.bind
1820
import org.koin.core.module.dsl.singleOf
@@ -32,6 +34,7 @@ actual fun platformModule() = module {
3234
single<FetchPolicy> {
3335
FetchPolicy.CacheAndNetwork
3436
}
37+
single<NotificationSender> { SessionNotificationSender() }
3538
}
3639

3740
actual fun getNormalizedCacheFactory(conference: String, uid: String?): NormalizedCacheFactory {
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package dev.johnoreilly.confetti.dev.johnoreilly.confetti.work
2+
3+
import dev.johnoreilly.confetti.work.NotificationSender
4+
5+
class SessionNotificationSender: NotificationSender {
6+
override suspend fun sendNotification(selector: NotificationSender.Selector) {
7+
}
8+
}

shared/src/wasmJsMain/kotlin/dev/johnoreilly/confetti/di/KoinWasmJs.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ import com.russhwolf.settings.coroutines.FlowSettings
1212
import com.russhwolf.settings.coroutines.toFlowSettings
1313
import com.russhwolf.settings.observable.makeObservable
1414
import dev.johnoreilly.confetti.auth.Authentication
15+
import dev.johnoreilly.confetti.dev.johnoreilly.confetti.work.SessionNotificationSender
1516
import dev.johnoreilly.confetti.utils.DateService
1617
import dev.johnoreilly.confetti.utils.WasmDateService
18+
import dev.johnoreilly.confetti.work.NotificationSender
1719
import org.koin.core.module.dsl.bind
1820
import org.koin.core.module.dsl.singleOf
1921
import org.koin.dsl.module
@@ -26,6 +28,7 @@ actual fun platformModule() = module {
2628
single<FetchPolicy> {
2729
FetchPolicy.CacheAndNetwork
2830
}
31+
single<NotificationSender> { SessionNotificationSender() }
2932
}
3033

3134
actual fun getNormalizedCacheFactory(conference: String, uid: String?): NormalizedCacheFactory {
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package dev.johnoreilly.confetti.dev.johnoreilly.confetti.work
2+
3+
import dev.johnoreilly.confetti.work.NotificationSender
4+
5+
class SessionNotificationSender: NotificationSender {
6+
override suspend fun sendNotification(selector: NotificationSender.Selector) {
7+
}
8+
}

0 commit comments

Comments
 (0)