Skip to content

Commit

Permalink
update Android example app
Browse files Browse the repository at this point in the history
  • Loading branch information
Foso committed Sep 16, 2023
1 parent 3196d0e commit 9117a9c
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 20 deletions.
29 changes: 14 additions & 15 deletions example/AndroidOnlyExample/app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("com.google.devtools.ksp") version "1.9.0-1.0.13"
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.0"
id("com.google.devtools.ksp") version "1.9.10-1.0.13"
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.10"
id("de.jensklingenberg.ktorfit") version "1.0.0"

}
Expand All @@ -13,7 +13,7 @@ configure<de.jensklingenberg.ktorfit.gradle.KtorfitGradleConfiguration> {
}
android {
namespace = "de.jensklingenberg.androidonlyexample"
compileSdk = 33
compileSdk = 34

defaultConfig {
applicationId = ("de.jensklingenberg.androidonlyexample")
Expand Down Expand Up @@ -45,7 +45,7 @@ android {
compose = (true)
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.1"
kotlinCompilerExtensionVersion = "1.5.3"
}
}

Expand All @@ -54,27 +54,26 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach
jvmTarget = "1.8"
}
}
val ktor = "2.3.3"
val compose_ui_version = "1.4.3"
val ktor = "2.3.4"
val compose_ui_version = "1.5.1"
dependencies {
ksp("de.jensklingenberg.ktorfit:ktorfit-ksp:$ktorfit")
implementation("de.jensklingenberg.ktorfit:ktorfit-lib:$ktorfit")
implementation("io.ktor:ktor-client-serialization:$ktor")
implementation("io.ktor:ktor-client-content-negotiation:$ktor")
implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor")

implementation("androidx.core:core-ktx:1.10.1")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")

implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
implementation("androidx.activity:activity-compose:1.7.2")
implementation("androidx.compose.ui:ui:$compose_ui_version")
implementation("androidx.compose.ui:ui-tooling-preview:$compose_ui_version")
implementation("androidx.compose.material:material:1.4.3")
implementation("androidx.compose.material:material:1.5.1")
debugImplementation("androidx.compose.ui:ui-tooling:$compose_ui_version")
debugImplementation("androidx.compose.ui:ui-test-manifest:$compose_ui_version")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
androidTestImplementation("androidx.compose.ui:ui-test-junit4:$compose_ui_version")
debugImplementation("androidx.compose.ui:ui-tooling:$compose_ui_version")
debugImplementation("androidx.compose.ui:ui-test-manifest:$compose_ui_version")
implementation("io.ktor:ktor-client-serialization:$ktor")
implementation("io.ktor:ktor-client-content-negotiation:$ktor")
implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor")
//implementation("io.ktor:ktor-client-cio-jvm:2.2.4")
}

4 changes: 2 additions & 2 deletions example/MultiplatformExample/shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ kotlin {
}

android {
compileSdk = 33
compileSdk = 34
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
defaultConfig {
minSdk = 21
targetSdk = 33
targetSdk = 34
}
}

Expand Down
6 changes: 3 additions & 3 deletions gradle-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
kotlin("jvm") version("1.8.22")
kotlin("kapt") version("1.8.22")
kotlin("jvm") version("1.9.10")
kotlin("kapt") version("1.9.10")
id("java-gradle-plugin")
`maven-publish`
id("com.gradle.plugin-publish") version "1.2.1"
Expand Down Expand Up @@ -31,7 +31,7 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
}

dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.8.22")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.10")
}

gradlePlugin {
Expand Down

0 comments on commit 9117a9c

Please sign in to comment.