Skip to content

Commit 5bfbf80

Browse files
junerverjunerver
committed
⬆️: upgrade gradle\agp
1 parent 57e73c9 commit 5bfbf80

7 files changed

Lines changed: 83 additions & 77 deletions

File tree

‎ai/build.gradle.kts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
22
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
33

44
plugins {
5-
alias(libs.plugins.androidLibrary)
6-
alias(libs.plugins.kotlinMultiplatform)
7-
alias(libs.plugins.jetbrainsCompose)
5+
alias(libs.plugins.android.library)
6+
alias(libs.plugins.kotlin.multiplatform)
7+
alias(libs.plugins.jetbrains.compose)
88
alias(libs.plugins.compose.compiler)
9-
alias(libs.plugins.kotlinSerialization)
10-
alias(libs.plugins.mavenPublish)
9+
alias(libs.plugins.kotlin.serialization)
10+
alias(libs.plugins.maven.publish)
1111
}
1212

1313
kotlin {

‎ai/src/commonMain/kotlin/xyz/junerver/compose/ai/usechat/Message.kt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package xyz.junerver.compose.ai.usechat
22

33
import androidx.compose.runtime.Immutable
4+
import kotlin.time.Clock
5+
import kotlin.time.ExperimentalTime
46
import kotlinx.serialization.SerialName
57
import kotlinx.serialization.Serializable
68

@@ -12,6 +14,9 @@ import kotlinx.serialization.Serializable
1214
Version: v2.0
1315
*/
1416

17+
@OptIn(ExperimentalTime::class)
18+
internal fun currentTimeMillis() = Clock.System.now().toEpochMilliseconds()
19+
1520
/**
1621
* Represents the role of a message sender in a chat conversation.
1722
*/
@@ -55,12 +60,12 @@ data class Message(
5560
val id: String = generateId(),
5661
val role: Role,
5762
val content: String,
58-
val createdAt: Long = System.currentTimeMillis(),
63+
val createdAt: Long = currentTimeMillis(),
5964
) {
6065
companion object {
6166
private var counter = 0L
6267

63-
private fun generateId(): String = "msg_${System.currentTimeMillis()}_${counter++}"
68+
private fun generateId(): String = "msg_${currentTimeMillis()}_${counter++}"
6469

6570
fun user(content: String, id: String = generateId()) = Message(id = id, role = Role.User, content = content)
6671

‎app/build.gradle.kts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
33
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
44

55
plugins {
6-
alias(libs.plugins.kotlinMultiplatform)
7-
alias(libs.plugins.androidApplication)
8-
alias(libs.plugins.jetbrainsCompose)
6+
alias(libs.plugins.kotlin.multiplatform)
7+
alias(libs.plugins.android.application)
8+
alias(libs.plugins.jetbrains.compose)
99
alias(libs.plugins.compose.compiler)
10-
alias(libs.plugins.kotlinSerialization)
11-
alias(libs.plugins.composeHotReload)
10+
alias(libs.plugins.kotlin.serialization)
11+
alias(libs.plugins.compose.hot.reload)
1212
}
1313

1414
kotlin {
@@ -75,10 +75,10 @@ kotlin {
7575
implementation(compose.components.uiToolingPreview)
7676
implementation(libs.material.icons.core)
7777
implementation(libs.material.icons.extended)
78-
implementation(libs.androidx.lifecycle.viewmodel)
79-
implementation(libs.androidx.lifecycle.runtime.compose)
78+
implementation(libs.compose.lifecycle.viewmodel)
79+
implementation(libs.compose.lifecycle.runtime.compose)
8080

81-
implementation(libs.navigation.compose)
81+
implementation(libs.compose.navigation.compose)
8282

8383
implementation(projects.hooks)
8484
implementation(projects.ai)

‎build.gradle.kts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ buildscript {
99
}
1010

1111
plugins {
12-
alias(libs.plugins.androidApplication) apply false
13-
alias(libs.plugins.jetbrainsKotlinAndroid) apply false
14-
alias(libs.plugins.androidLibrary) apply false
15-
alias(libs.plugins.mavenPublish) apply false
12+
alias(libs.plugins.android.application) apply false
13+
alias(libs.plugins.jetbrains.kotlin.android) apply false
14+
alias(libs.plugins.android.library) apply false
15+
alias(libs.plugins.maven.publish) apply false
1616
alias(libs.plugins.kotlinter) apply false
17-
alias(libs.plugins.jetbrainsCompose) apply false
17+
alias(libs.plugins.jetbrains.compose) apply false
1818
alias(libs.plugins.compose.compiler) apply false
19-
alias(libs.plugins.kotlinMultiplatform) apply false
19+
alias(libs.plugins.kotlin.multiplatform) apply false
2020
alias(libs.plugins.jetbrains.kotlin.jvm) apply false
21-
alias(libs.plugins.composeHotReload) apply false
21+
alias(libs.plugins.compose.hot.reload) apply false
2222
}
2323

2424
allprojects {

‎gradle/libs.versions.toml‎

Lines changed: 49 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
11
[versions]
2-
agp = "8.5.2"
3-
kotlin = "2.1.21"
4-
appcompat = "1.7.1"
2+
agp = "8.9.3"
3+
kotlin = "2.2.20"
54

65
arrowCore = "2.1.2"
7-
kotlinMultiplatformAppdirs = "1.1.1"
8-
ktorVersion = "3.2.1"
9-
mmkvKotlin = "1.2.17"
10-
navigationComposeVersion = "2.7.0-alpha07"
11-
logbackClassic = "1.5.9"
6+
kotlin-multiplatform-appdirs = "1.1.1"
7+
ktor = "3.2.1"
8+
mmkv-kotlin = "1.2.17"
9+
logback-classic = "1.5.9"
1210

13-
activityCompose = "1.10.1"
14-
androidx-lifecycle = "2.9.1"
15-
biometric = "1.2.0-alpha05"
11+
android-appcompat = "1.7.1"
12+
activity-compose = "1.10.1"
13+
android-biometric = "1.2.0-alpha05"
14+
15+
compose-navigation = "2.7.0-alpha07"
16+
compose-lifecycle = "2.9.1"
1617

1718
compose-plugin = "1.8.2"
18-
composeHotReload = "1.0.0-beta04"
19+
compose-hot-reload = "1.0.0-beta04"
1920
material-icons = "1.7.3"
20-
kotlinxDatetime = "0.7.1"
21-
kotlinxCollectionsImmutable = "0.4.0"
22-
kotlinxCoroutines = "1.10.2"
23-
kotlinxSerializationJson = "1.9.0"
24-
slf4jAndroid = "1.7.36"
21+
kotlinx-datetime = "0.7.1"
22+
kotlinx-collections-immutable = "0.4.0"
23+
kotlinx-coroutines = "1.10.2"
24+
kotlinx-serialization-json = "1.9.0"
25+
slf4j-android = "1.7.36"
2526

2627
[libraries]
27-
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
28-
androidx-biometric = { module = "androidx.biometric:biometric", version.ref = "biometric" }
28+
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "android-appcompat" }
29+
androidx-biometric = { module = "androidx.biometric:biometric", version.ref = "android-biometric" }
2930

3031
# compose android test
3132
compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
@@ -36,9 +37,10 @@ material-icons-core = { group = "org.jetbrains.compose.material", name = "materi
3637
material-icons-extended = { group = "org.jetbrains.compose.material", name = "material-icons-extended" , version.ref = "material-icons"}
3738

3839
# composeX
39-
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
40-
androidx-lifecycle-viewmodel = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-viewmodel", version.ref = "androidx-lifecycle" }
41-
androidx-lifecycle-runtime-compose = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }
40+
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activity-compose" }
41+
compose-lifecycle-viewmodel = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-viewmodel", version.ref = "compose-lifecycle" }
42+
compose-lifecycle-runtime-compose = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "compose-lifecycle" }
43+
compose-navigation-compose = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "compose-navigation" }
4244

4345
# kotlin
4446
kotlin-bom = { group = "org.jetbrains.kotlin", name = "kotlin-bom", version.ref = "kotlin" }
@@ -48,44 +50,43 @@ kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test" }
4850
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit" }
4951
kotlin-compiler-embeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
5052
# kotlinX
51-
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
52-
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" }
53-
kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinxCollectionsImmutable" }
54-
kotlinx-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
55-
kotlinx-coroutines-swing = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-swing", version.ref = "kotlinxCoroutines" }
56-
kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" }
53+
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
54+
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
55+
kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinx-collections-immutable" }
56+
kotlinx-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
57+
kotlinx-coroutines-swing = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" }
58+
kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
5759

5860
# kmp thrid party
59-
kotlin-multiplatform-appdirs = { module = "ca.gosyer:kotlin-multiplatform-appdirs", version.ref = "kotlinMultiplatformAppdirs" }
60-
mmkv-kotlin = { module = "com.ctrip.flight.mmkv:mmkv-kotlin", version.ref = "mmkvKotlin" }
61+
kotlin-multiplatform-appdirs = { module = "ca.gosyer:kotlin-multiplatform-appdirs", version.ref = "kotlin-multiplatform-appdirs" }
62+
mmkv-kotlin = { module = "com.ctrip.flight.mmkv:mmkv-kotlin", version.ref = "mmkv-kotlin" }
6163
arrow-core = { module = "io.arrow-kt:arrow-core", version.ref = "arrowCore" }
6264
arrow-functions = { module = "io.arrow-kt:arrow-functions", version.ref = "arrowCore" }
63-
navigation-compose = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "navigationComposeVersion" }
64-
logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logbackClassic" }
65-
slf4j-android = { module = "org.slf4j:slf4j-android", version.ref = "slf4jAndroid" }
65+
logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback-classic" }
66+
slf4j-android = { module = "org.slf4j:slf4j-android", version.ref = "slf4j-android" }
6667

6768
# ktor
68-
ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktorVersion" }
69-
ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktorVersion" }
70-
ktor-client-okhttp = { group = "io.ktor", name = "ktor-client-okhttp", version.ref = "ktorVersion" }
71-
ktor-client-darwin = { group = "io.ktor", name = "ktor-client-darwin", version.ref = "ktorVersion" }
72-
ktor-client-logging = { group = "io.ktor", name = "ktor-client-logging", version.ref = "ktorVersion" }
73-
ktor-client-content-negotiat = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktorVersion" }
74-
ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktorVersion" }
69+
ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" }
70+
ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" }
71+
ktor-client-okhttp = { group = "io.ktor", name = "ktor-client-okhttp", version.ref = "ktor" }
72+
ktor-client-darwin = { group = "io.ktor", name = "ktor-client-darwin", version.ref = "ktor" }
73+
ktor-client-logging = { group = "io.ktor", name = "ktor-client-logging", version.ref = "ktor" }
74+
ktor-client-content-negotiat = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktor" }
75+
ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }
7576

7677
[plugins]
77-
androidApplication = { id = "com.android.application", version.ref = "agp" }
78-
jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
79-
androidLibrary = { id = "com.android.library", version.ref = "agp" }
80-
mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.33.0" }
78+
android-application = { id = "com.android.application", version.ref = "agp" }
79+
jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
80+
android-library = { id = "com.android.library", version.ref = "agp" }
81+
maven-publish = { id = "com.vanniktech.maven.publish", version = "0.33.0" }
8182
kotlinter = { id = "org.jmailen.kotlinter", version = "4.5.0" }
8283
dokka = { id = "org.jetbrains.dokka", version = "2.0.0" }
8384
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
84-
jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
85-
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
85+
jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
86+
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
8687
jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
87-
kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
88-
composeHotReload = { id = "org.jetbrains.compose.hot-reload", version.ref = "composeHotReload"}
88+
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
89+
compose-hot-reload = { id = "org.jetbrains.compose.hot-reload", version.ref = "compose-hot-reload" }
8990

9091
[bundles]
9192
ktor = [

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Nov 08 08:04:28 CST 2024
1+
#Sun Jan 04 16:18:58 CST 2026
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

‎hooks/build.gradle.kts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
55
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
66

77
plugins {
8-
alias(libs.plugins.androidLibrary)
9-
alias(libs.plugins.mavenPublish)
8+
alias(libs.plugins.android.library)
9+
alias(libs.plugins.maven.publish)
1010
// alias(libs.plugins.dokka)
11-
alias(libs.plugins.kotlinMultiplatform)
12-
alias(libs.plugins.jetbrainsCompose)
11+
alias(libs.plugins.kotlin.multiplatform)
12+
alias(libs.plugins.jetbrains.compose)
1313
alias(libs.plugins.compose.compiler)
1414
}
1515

@@ -51,7 +51,7 @@ kotlin {
5151
//api(compose.material)
5252
//api(compose.components.resources)
5353
//api(compose.components.uiToolingPreview)
54-
implementation(libs.androidx.lifecycle.runtime.compose)
54+
implementation(libs.compose.lifecycle.runtime.compose)
5555

5656
implementation(project.dependencies.platform(libs.kotlin.bom))
5757
api(libs.kotlin.stdlib)

0 commit comments

Comments
 (0)