diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index 76d1ee09..1d92ee06 100644 --- a/composeApp/build.gradle.kts +++ b/composeApp/build.gradle.kts @@ -11,6 +11,7 @@ plugins { alias(libs.plugins.compose) alias(libs.plugins.compose.compiler) alias(libs.plugins.konfig) + alias(libs.plugins.ksp) alias(libs.plugins.ktorfit) alias(libs.plugins.moko.resources) alias(libs.plugins.osdetector) diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/burningseries/module/NetworkModule.kt b/composeApp/src/commonMain/kotlin/dev/datlag/burningseries/module/NetworkModule.kt index 069a8aa0..96aa7375 100644 --- a/composeApp/src/commonMain/kotlin/dev/datlag/burningseries/module/NetworkModule.kt +++ b/composeApp/src/commonMain/kotlin/dev/datlag/burningseries/module/NetworkModule.kt @@ -17,6 +17,7 @@ import dev.datlag.burningseries.BuildKonfig import dev.datlag.burningseries.Sekret import dev.datlag.burningseries.common.nullableFirebaseInstance import dev.datlag.burningseries.github.GitHub +import dev.datlag.burningseries.github.createGitHub import dev.datlag.burningseries.network.EpisodeStateMachine import dev.datlag.burningseries.network.HomeStateMachine import dev.datlag.burningseries.network.SaveStateMachine @@ -113,7 +114,7 @@ data object NetworkModule { httpClient(instance()) baseUrl("https://api.github.com/") } - ktorfit.create() + ktorfit.createGitHub() } bindSingleton { OpenIdConnectClient { diff --git a/github/build.gradle.kts b/github/build.gradle.kts index 9dddb353..e1f50248 100644 --- a/github/build.gradle.kts +++ b/github/build.gradle.kts @@ -4,6 +4,7 @@ plugins { alias(libs.plugins.apollo) alias(libs.plugins.serialization) alias(libs.plugins.ksp) + alias(libs.plugins.ktorfit) } val artifact = "dev.datlag.burningseries.github" @@ -43,15 +44,6 @@ kotlin { } } -dependencies { - add("kspCommonMainMetadata", libs.ktorfit.ksp) - add("kspAndroid", libs.ktorfit.ksp) - add("kspJvm", libs.ktorfit.ksp) - add("kspIosX64", libs.ktorfit.ksp) - add("kspIosArm64", libs.ktorfit.ksp) - add("kspIosSimulatorArm64", libs.ktorfit.ksp) -} - android { compileSdk = 34 namespace = artifact diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 69ede6fb..33132911 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -33,9 +33,9 @@ kolor = "1.7.0" konfig = "0.15.1" kotlin = "2.0.0" ksoup = "0.1.2" -ksp = "2.0.0-1.0.22" +ksp = "2.0.0-1.0.23" ktor = "2.3.12" -ktorfit = "1.14.0" +ktorfit = "2.0.0" media3 = "1.4.0-rc01" moko-resources = "0.24.1" multidex = "2.0.1"