Skip to content

Commit 420596c

Browse files
KevinSchildhornKevinSchildhorn
authored
Updating Dependencies (#249)
* initial call * adding compiler arg * Updating Dependencies and fixing deprecation warnings * Update Koin.kt * Update Koin.kt
1 parent 14a5ae8 commit 420596c

File tree

27 files changed

+81
-67
lines changed

27 files changed

+81
-67
lines changed

‎android/src/main/java/co/touchlab/droidcon/android/MainApp.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import co.touchlab.droidcon.initKoin
1414
import co.touchlab.droidcon.service.ParseUrlViewService
1515
import co.touchlab.droidcon.ui.uiModule
1616
import co.touchlab.droidcon.util.ClasspathResourceReader
17-
import com.google.firebase.analytics.ktx.analytics
18-
import com.google.firebase.ktx.Firebase
17+
import com.google.firebase.Firebase
18+
import com.google.firebase.analytics.analytics
1919
import com.russhwolf.settings.ExperimentalSettingsApi
2020
import com.russhwolf.settings.ObservableSettings
2121
import com.russhwolf.settings.SharedPreferencesSettings

‎build.gradle.kts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2+
import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile
23

34
// Top-level build file where you can add configuration options common to all sub-projects/modules.
45
plugins {
@@ -24,8 +25,15 @@ subprojects {
2425
}
2526

2627
tasks.withType(KotlinCompile::class).all {
27-
kotlinOptions {
28-
jvmTarget = "1.8"
28+
compilerOptions {
29+
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8)
30+
freeCompilerArgs.add("-opt-in=kotlin.time.ExperimentalTime")
31+
}
32+
}
33+
34+
tasks.withType(KotlinNativeCompile::class).all {
35+
compilerOptions {
36+
freeCompilerArgs.add("-opt-in=kotlin.time.ExperimentalTime")
2937
}
3038
}
3139
configure<org.jlleitschuh.gradle.ktlint.KtlintExtension> {

‎gradle/libs.versions.toml‎

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,58 @@
11
[versions]
22
## SDK Versions
3-
minSdk = "21"
4-
targetSdk = "35"
5-
compileSdk = "35"
3+
minSdk = "23"
4+
targetSdk = "36"
5+
compileSdk = "36"
66

77
# Dependencies
8-
kotlin = "2.1.10"
8+
kotlin = "2.2.21"
99

1010
## Gradle Plugin version must be compatible with Multiplatform
1111
## https://kotlinlang.org/docs/multiplatform-compatibility-guide.html#version-compatibility
12-
android-gradle-plugin = "8.9.0"
13-
coroutines = "1.10.1"
14-
kotlinx-datetime = "0.6.1"
15-
ktor = "3.0.3"
12+
android-gradle-plugin = "8.13.1"
13+
coroutines = "1.10.2"
14+
kotlinx-datetime = "0.7.1"
15+
ktor = "3.3.2"
1616

1717
stately = "2.1.0"
1818
java = "21"
19-
kermit = "2.0.5"
20-
sqliter = "1.3.1"
19+
kermit = "2.0.8"
20+
sqliter = "1.3.3"
2121

2222
hyperdrive = "0.1.148"
2323

24-
multiplatformSettings = "1.2.0"
25-
sqlDelight = "2.0.2"
26-
firebase-bom = "33.10.0"
27-
firebase-crashlytics-gradle = "3.0.3"
28-
gms-google-services = "4.4.2"
24+
multiplatformSettings = "1.3.0"
25+
sqlDelight = "2.2.1"
26+
firebase-analytics = "22.5.0"
27+
firebase-crashlytics = "19.4.4"
28+
firebase-messaging = "24.1.2"
29+
firebase-bom = "34.6.0"
30+
firebase-crashlytics-gradle = "3.0.6"
31+
gms-google-services = "4.4.4"
2932

3033
# TODO: Update Compose libraries. There is currently a conflicing issue with the HorizontalPager
31-
compose-androidx-ui = "1.7.8"
34+
compose-androidx-ui = "1.9.5"
3235
compose-compiler = "1.5.15"
33-
composeNavigation = "2.9.5"
34-
compose-jb = "1.7.3"
36+
composeNavigation = "2.9.6"
37+
compose-jb = "1.9.3"
3538

36-
splashscreen = "1.0.1"
39+
splashscreen = "1.2.0"
3740
junit = "4.13.2"
38-
junitKtx = "1.2.1"
39-
imageLoader = "1.2.2.1"
41+
junitKtx = "1.3.0"
42+
imageLoader = "1.10.0"
4043
korio = "4.0.10"
4144

4245
# Sample - Android
43-
androidx-core = "1.15.0"
44-
androidx-lifecycle = "2.8.7"
45-
androidx-activity-compose = "1.10.1"
46+
androidx-core = "1.17.0"
47+
androidx-lifecycle = "2.10.0"
48+
androidx-activity-compose = "1.12.0"
4649
android-desugaring = "2.1.5"
47-
koin = "4.0.2"
48-
uuid = "0.8.3"
49-
ktlint = "12.1.1"
50-
coil = "3.1.0"
51-
zoomimage = "1.1.0-alpha06"
52-
skie = "0.10.1"
50+
koin = "4.1.1"
51+
uuid = "0.8.4"
52+
ktlint = "14.0.1"
53+
coil = "3.3.0"
54+
zoomimage = "1.4.0"
55+
skie = "0.10.8"
5356

5457
[libraries]
5558
coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
@@ -59,9 +62,9 @@ compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref
5962
androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "splashscreen" }
6063

6164
firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebase-bom" }
62-
firebase-analytics = { module = "com.google.firebase:firebase-analytics-ktx", version = "_" }
63-
firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics-ktx", version = "_" }
64-
firebase-messaging = { module = "com.google.firebase:firebase-messaging-ktx", version = "_" }
65+
firebase-analytics = { module = "com.google.firebase:firebase-analytics-ktx", version.ref = "firebase-analytics" }
66+
firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics-ktx", version.ref = "firebase-crashlytics" }
67+
firebase-messaging = { module = "com.google.firebase:firebase-messaging-ktx", version.ref = "firebase-messaging" }
6568
hyperdrive-multiplatformx-api = { module = "org.brightify.hyperdrive:multiplatformx-api", version.ref = "hyperdrive" }
6669
android-desugar = { module = "com.android.tools:desugar_jdk_libs", version.ref = "android-desugaring" }
6770
uuid = { module = "com.benasher44:uuid", version.ref = "uuid" }

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎ios/build.gradle.kts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode
21
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
32

43
plugins {
@@ -23,6 +22,7 @@ kotlin {
2322
languageSettings.apply {
2423
optIn("kotlin.RequiresOptIn")
2524
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
25+
optIn("kotlin.time.ExperimentalTime")
2626
}
2727
}
2828
iosMain.dependencies {
@@ -49,7 +49,6 @@ kotlin {
4949
framework {
5050
baseName = "DroidconKit"
5151
isStatic = true
52-
embedBitcodeMode = BitcodeEmbeddingMode.DISABLE
5352

5453
freeCompilerArgs += listOf(
5554
"-linker-option", "-framework", "-linker-option", "Metal",

‎settings.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencyResolutionManagement {
1818
}
1919

2020
plugins {
21-
id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
21+
id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0")
2222
}
2323

2424
include(":shared", ":shared-ui", ":android", ":ios")

‎shared-ui/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ kotlin {
106106
languageSettings.apply {
107107
optIn("kotlin.RequiresOptIn")
108108
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
109+
optIn("kotlin.time.ExperimentalTime")
109110
}
110111
}
111112
matching { it.name.endsWith("Test") }.configureEach {

‎shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/ui/session/SessionDetailView.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import androidx.compose.material.icons.filled.Description
2121
import androidx.compose.material.icons.filled.Info
2222
import androidx.compose.material.icons.outlined.BookmarkAdd
2323
import androidx.compose.material3.Button
24-
import androidx.compose.material3.Divider
2524
import androidx.compose.material3.ExperimentalMaterial3Api
2625
import androidx.compose.material3.FloatingActionButton
26+
import androidx.compose.material3.HorizontalDivider
2727
import androidx.compose.material3.Icon
2828
import androidx.compose.material3.IconButton
2929
import androidx.compose.material3.MaterialTheme
@@ -102,7 +102,7 @@ internal fun SessionDetailView(viewModel: SessionDetailViewModel) {
102102
val title by viewModel.observeTitle.observeAsState()
103103
val locationInfo by viewModel.observeInfo.observeAsState()
104104
HeaderView(title, locationInfo)
105-
Divider()
105+
HorizontalDivider()
106106
}
107107
if (state != SessionDetailViewModel.SessionState.Ended) {
108108
val isAttending by viewModel.observeIsAttending.observeAsState()
@@ -167,7 +167,7 @@ internal fun SessionDetailView(viewModel: SessionDetailViewModel) {
167167
textAlign = TextAlign.Center,
168168
)
169169

170-
Divider()
170+
HorizontalDivider()
171171

172172
speakers.forEach { speaker ->
173173
SpeakerView(speaker)

‎shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/ui/session/SpeakerDetailView.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import androidx.compose.material.icons.Icons
1414
import androidx.compose.material.icons.automirrored.filled.ArrowBack
1515
import androidx.compose.material.icons.filled.Description
1616
import androidx.compose.material.icons.filled.Language
17-
import androidx.compose.material3.Divider
1817
import androidx.compose.material3.ExperimentalMaterial3Api
18+
import androidx.compose.material3.HorizontalDivider
1919
import androidx.compose.material3.Icon
2020
import androidx.compose.material3.IconButton
2121
import androidx.compose.material3.MaterialTheme
@@ -80,7 +80,7 @@ internal fun SpeakerDetailView(viewModel: SpeakerDetailViewModel) {
8080
SocialView(WebLink.fromUrl(it), "linkedin")
8181
}
8282

83-
Divider()
83+
HorizontalDivider()
8484

8585
viewModel.bio?.let {
8686
BioView(it, viewModel.bioWebLinks)

‎shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/util/LocalDateTime+startOfMinute.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ package co.touchlab.droidcon.util
55
import kotlinx.datetime.LocalDateTime
66

77
val LocalDateTime.startOfMinute: LocalDateTime
8-
get() = LocalDateTime(year, month, dayOfMonth, hour, minute)
8+
get() = LocalDateTime(year, month, day, hour, minute)

0 commit comments

Comments
 (0)