Skip to content

Commit f6c90aa

Browse files
author
Simon Schubert
committed
Upgrade sdks
1 parent 7968f40 commit f6c90aa

File tree

5 files changed

+38
-26
lines changed

5 files changed

+38
-26
lines changed

composeApp/build.gradle.kts

+21-5
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,25 @@ kotlin {
122122

123123
android {
124124
namespace = "com.inspiredandroid.kai"
125-
compileSdk = libs.versions.android.compileSdk.get().toInt()
125+
compileSdk =
126+
libs.versions.android.compileSdk
127+
.get()
128+
.toInt()
126129

127130
defaultConfig {
128131
applicationId = "com.inspiredandroid.kai"
129-
minSdk = libs.versions.android.minSdk.get().toInt()
130-
targetSdk = libs.versions.android.targetSdk.get().toInt()
131-
versionCode = libs.versions.android.versionCode.get().toInt()
132+
minSdk =
133+
libs.versions.android.minSdk
134+
.get()
135+
.toInt()
136+
targetSdk =
137+
libs.versions.android.targetSdk
138+
.get()
139+
.toInt()
140+
versionCode =
141+
libs.versions.android.versionCode
142+
.get()
143+
.toInt()
132144
versionName = libs.versions.appVersion.get()
133145
}
134146
packaging {
@@ -177,7 +189,11 @@ compose.desktop {
177189
class VersionGeneratorPlugin : Plugin<Project> {
178190
override fun apply(project: Project) {
179191
project.afterEvaluate {
180-
val versionFile = layout.buildDirectory.file("generated/src/commonMain/kotlin/com/inspiredandroid/kai/Version.kt").get().asFile
192+
val versionFile =
193+
layout.buildDirectory
194+
.file("generated/src/commonMain/kotlin/com/inspiredandroid/kai/Version.kt")
195+
.get()
196+
.asFile
181197
versionFile.parentFile.mkdirs()
182198
versionFile.writeText(
183199
"""

composeApp/src/commonMain/kotlin/com/inspiredandroid/kai/data/RemoteDataRepository.kt

+2-4
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,6 @@ class RemoteDataRepository(
159159
}
160160
}
161161

162-
override fun isUsingSharedKey(): Boolean {
163-
return settings.getString(Key.CURRENT_SERVICE_ID, Value.DEFAULT_SERVICE) == Value.SERVICE_GROQ &&
164-
settings.getStringOrNull(Key.GROQ_API_KEY) == null
165-
}
162+
override fun isUsingSharedKey(): Boolean = settings.getString(Key.CURRENT_SERVICE_ID, Value.DEFAULT_SERVICE) == Value.SERVICE_GROQ &&
163+
settings.getStringOrNull(Key.GROQ_API_KEY) == null
166164
}

composeApp/src/commonMain/kotlin/com/inspiredandroid/kai/network/Requests.kt

+6-8
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,12 @@ class Requests(private val settings: Settings) {
134134
}
135135
}
136136

137-
suspend fun getGroqModels(): Result<GroqModelResponseDto> {
138-
return try {
139-
val response: HttpResponse =
140-
groqClient.get("https://api.groq.com/openai/v1/models")
141-
Result.success(response.body())
142-
} catch (exception: Throwable) {
143-
Result.failure(exception)
144-
}
137+
suspend fun getGroqModels(): Result<GroqModelResponseDto> = try {
138+
val response: HttpResponse =
139+
groqClient.get("https://api.groq.com/openai/v1/models")
140+
Result.success(response.body())
141+
} catch (exception: Throwable) {
142+
Result.failure(exception)
145143
}
146144
}
147145

gradle/libs.versions.toml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
[versions]
2-
agp = "8.7.3"
3-
appVersion = "1.0.2"
4-
android-versionCode = "5"
2+
agp = "8.8.0"
3+
appVersion = "1.0.3"
4+
android-versionCode = "6"
55
android-compileSdk = "35"
66
android-minSdk = "26"
77
android-targetSdk = "35"
8-
androidx-activityCompose = "1.9.3"
8+
androidx-activityCompose = "1.10.0"
99
androidx-lifecycle = "2.8.4"
1010
compose-multiplatform = "1.7.3"
1111
compottieDot = "2.0.0-rc02"
12-
koinCompose = "4.0.1"
13-
kotlin = "2.1.0"
12+
koinCompose = "4.0.2"
13+
kotlin = "2.1.10"
1414
kotlinx-coroutines = "1.9.0"
15-
kotlinxSerializationJson = "1.8.0-RC"
15+
kotlinxSerializationJson = "1.8.0"
1616
ktor = "3.0.3"
1717
material = "1.12.0"
1818
multiplatformMarkdownRenderer = "0.26.0"
1919
multiplatformSettings = "1.2.0"
2020
navigationComposeVersion = "2.8.0-alpha11"
21-
spotless = "6.25.0"
21+
spotless = "7.0.2"
2222
tts = "2.5.0"
2323

2424
[libraries]

gradle/wrapper/gradle-wrapper.properties

+1-1
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.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)