Skip to content

Commit b684878

Browse files
authored
Merge pull request #390 from joreilly/dependency_upddates
dependency updates + some cleanup
2 parents d802953 + dfc6abb commit b684878

File tree

7 files changed

+38
-69
lines changed

7 files changed

+38
-69
lines changed

app/build.gradle.kts

-8
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,6 @@ dependencies {
8787
implementation(libs.koin.android)
8888
implementation(libs.koin.androidx.compose)
8989

90-
testImplementation(libs.koin.test)
91-
testImplementation(libs.koin.test.junit4)
92-
testImplementation(libs.androidx.test.junit)
93-
testImplementation(libs.androidx.test.core)
94-
testImplementation(libs.mockito)
95-
testImplementation(libs.robolectric)
96-
testImplementation(libs.junit)
97-
9890
// Compose testing dependencies
9991
androidTestImplementation(platform(libs.androidx.compose.bom))
10092
androidTestImplementation(libs.androidx.compose.ui.test)

app/src/test/java/com/surrus/peopleinspace/TestKoinGraph.kt

-35
This file was deleted.

backend/build.gradle.kts

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ kotlin {
1616
implementation(libs.kotlinx.coroutines)
1717
implementation(libs.kotlinx.serialization)
1818

19-
implementation("io.ktor:ktor-server-core:2.3.6")
20-
implementation("io.ktor:ktor-server-netty:2.3.6")
21-
implementation("io.ktor:ktor-server-cors:2.3.6")
22-
implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.6")
23-
implementation("io.ktor:ktor-server-content-negotiation:2.3.6")
19+
implementation("io.ktor:ktor-server-core:2.3.12")
20+
implementation("io.ktor:ktor-server-netty:2.3.12")
21+
implementation("io.ktor:ktor-server-cors:2.3.12")
22+
implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.12")
23+
implementation("io.ktor:ktor-server-content-negotiation:2.3.12")
2424

25-
implementation("ch.qos.logback:logback-classic:1.4.14")
25+
implementation("ch.qos.logback:logback-classic:1.5.8")
2626

2727
implementation(projects.common)
2828
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package dev.johnoreilly.peopleinspace
2+
3+
import com.surrus.common.di.commonModule
4+
import com.surrus.common.repository.platformModule
5+
import com.surrus.peopleinspace.db.PeopleInSpaceDatabase
6+
import io.ktor.client.HttpClientConfig
7+
import io.ktor.client.engine.HttpClientEngine
8+
import org.koin.core.annotation.KoinExperimentalAPI
9+
import org.koin.dsl.module
10+
import org.koin.test.verify.verify
11+
import kotlin.test.Test
12+
13+
14+
@OptIn(KoinExperimentalAPI::class)
15+
class TestKoinGraph {
16+
17+
@Test
18+
fun checkKoinModules() {
19+
val modules = module {
20+
includes(commonModule(false), platformModule())
21+
}
22+
23+
modules.verify(
24+
extraTypes = listOf(HttpClientEngine::class, HttpClientConfig::class, PeopleInSpaceDatabase::class)
25+
)
26+
}
27+
}

gradle/libs.versions.toml

+2-14
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ ksp = "2.0.20-1.0.25"
55
compose-multiplatform = "1.7.0-rc01"
66
composeUiTooling = "1.4.0"
77
coroutines = "1.9.0"
8-
kotlinxSerialization = "1.7.2"
8+
kotlinxSerialization = "1.7.3"
99
androidGradlePlugin = "8.7.0"
1010
koin = "4.0.0"
1111
koinCompose = "4.0.0"
1212
koinComposeMultiplatform = "4.0.0"
1313
ktor = "3.0.0-rc-1"
14-
osmdroidAndroid = "6.1.18"
14+
osmdroidAndroid = "6.1.20"
1515
osmAndroidCompose = "0.0.5"
1616
slf4j = "2.0.16"
1717
sqlDelight = "2.0.2"
@@ -33,13 +33,6 @@ horologist = "0.6.20"
3333
glanceWearTiles = "1.0.0-alpha05"
3434
glanceAppWidget = "1.0.0"
3535
okhttp = "5.0.0-alpha.14"
36-
37-
junit = "4.13.2"
38-
androidxTestJUnit = "1.2.1"
39-
robolectric = "4.13"
40-
androidxTestCore = "1.6.1"
41-
mockito = "3.11.2"
42-
4336
kermit = "2.0.4"
4437

4538
gradleVersionsPlugin = "0.51.0"
@@ -138,11 +131,6 @@ sqldelight-sqlite-driver = { module = "app.cash.sqldelight:sqlite-driver", versi
138131

139132
kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
140133

141-
junit = { module = "junit:junit", version.ref = "junit" }
142-
robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
143-
mockito = { module = "org.mockito:mockito-inline", version.ref = "mockito" }
144-
androidx-test-junit = { module = "androidx.test.ext:junit", version.ref = "androidxTestJUnit" }
145-
androidx-test-core = { module = "androidx.test:core", version.ref = "androidxTestCore" }
146134
androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test" }
147135
androidx-compose-ui-test-junit = { group = "androidx.compose.ui", name = "ui-test-junit4" }
148136
androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }

graphql-server/build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
plugins {
33
kotlin("multiplatform")
4-
id("org.jetbrains.kotlin.plugin.spring") version("1.8.20")
4+
id("org.jetbrains.kotlin.plugin.spring") version("1.9.25")
55
kotlin("plugin.serialization")
66
id("org.springframework.boot") version("3.1.5")
77
//id("com.google.cloud.tools.appengine") version("2.4.2")
@@ -18,8 +18,8 @@ kotlin {
1818
val jvmMain by getting {
1919
dependencies {
2020
implementation("com.expediagroup:graphql-kotlin-spring-server:5.5.0")
21-
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.1")
22-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
21+
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
22+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
2323

2424
implementation("ch.qos.logback:logback-classic:1.5.8")
2525

wearApp/build.gradle.kts

-3
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,6 @@ dependencies {
7474
implementation(libs.okhttp)
7575
implementation(libs.loggingInterceptor)
7676

77-
testImplementation(libs.robolectric)
78-
testImplementation(libs.junit)
79-
8077
// Compose testing dependencies
8178
androidTestImplementation(platform(libs.androidx.compose.bom))
8279
androidTestImplementation(libs.androidx.compose.ui.test)

0 commit comments

Comments
 (0)