Skip to content

Commit 92f7baf

Browse files
committed
Maintenance: Update Kotlin, Evas, Compose, ...
1 parent 6ad8d98 commit 92f7baf

File tree

7 files changed

+21
-23
lines changed

7 files changed

+21
-23
lines changed

app/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ kotlin {
5050

5151
sourceSets.androidMain.get().dependencies {
5252
/* androidx */
53-
implementation("androidx.activity:activity-compose:1.9.2")
53+
implementation("androidx.activity:activity-compose:1.9.3")
5454
implementation(compose.preview)
5555
}
5656

@@ -62,7 +62,7 @@ kotlin {
6262
}
6363

6464
sourceSets.getByName("androidInstrumentedTest").dependencies {
65-
implementation("androidx.compose.ui:ui-test-junit4:1.7.2")
65+
implementation("androidx.compose.ui:ui-test-junit4:1.7.6")
6666
}
6767
}
6868

@@ -71,4 +71,4 @@ kotlin.targets.withType<KotlinNativeTarget>().configureEach {
7171
baseName = "LibPacemaker"
7272
isStatic = true
7373
}
74-
}
74+
}

buildSrc/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ repositories {
2121
}
2222

2323
dependencies {
24-
val kotlinVersion = "2.0.20"
25-
implementation("org.jetbrains.compose:compose-gradle-plugin:1.6.11")
24+
val kotlinVersion = "2.1.0"
25+
implementation("org.jetbrains.compose:compose-gradle-plugin:1.7.3")
2626
implementation("org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:$kotlinVersion")
2727
implementation(kotlin("gradle-plugin:$kotlinVersion"))
2828
implementation(kotlin("serialization:$kotlinVersion"))
29-
implementation("com.android.tools.build:gradle:8.5.2")
29+
implementation("com.android.tools.build:gradle:8.7.3")
3030
implementation("app.cash.sqldelight:gradle-plugin:2.0.2")
31-
implementation("org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.25.0")
31+
implementation("org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.26.1")
3232
}

buildSrc/src/main/kotlin/Dependencies.kt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@ import org.gradle.api.Project
22
import org.jetbrains.compose.ComposePlugin
33

44
object Dependencies {
5-
const val coroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0-RC"
6-
const val coroutinesAndroid = "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0-RC"
7-
const val coroutinesDebug = "org.jetbrains.kotlinx:kotlinx-coroutines-debug:1.9.0-RC"
8-
const val coroutinesTest = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0-RC"
5+
const val coroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1"
6+
const val coroutinesAndroid = "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1"
7+
const val coroutinesTest = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1"
98
const val okio = "com.squareup.okio:okio:3.9.0"
10-
const val kotlinxDatetime = "org.jetbrains.kotlinx:kotlinx-datetime:0.6.0"
11-
const val kotlinxImmutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7"
12-
const val multiplatformSettings = "com.russhwolf:multiplatform-settings:1.1.1"
9+
const val kotlinxDatetime = "org.jetbrains.kotlinx:kotlinx-datetime:0.6.1"
10+
const val kotlinxImmutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8"
11+
const val multiplatformSettings = "com.russhwolf:multiplatform-settings:1.3.0"
1312
const val androidXCoreKtx = "androidx.core:core-ktx:1.13.1"
14-
const val evas = "io.sellmair:evas:1.0.0-RC.2"
15-
const val evasCompose = "io.sellmair:evas-compose:1.0.0-RC.2"
13+
const val evas = "io.sellmair:evas:1.2.0"
14+
const val evasCompose = "io.sellmair:evas-compose:1.2.0"
1615
fun composeRuntime(project: Project) = ComposePlugin.Dependencies(project).runtime
1716
}

buildSrc/src/main/kotlin/PacemakerExtension.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class PacemakerExtension(
4343
namespace = "io.sellmair.${project.name.replace("-", ".")}"
4444
defaultConfig {
4545
minSdk = 31
46-
targetSdk = 34
46+
targetSdk = 35
4747
}
4848

4949
if (this is ApplicationExtension) {
@@ -130,7 +130,7 @@ class PacemakerExtension(
130130
project.plugins.apply("org.jetbrains.kotlinx.atomicfu")
131131
kotlin {
132132
sourceSets.commonMain.dependencies {
133-
implementation("org.jetbrains.kotlinx:atomicfu:0.25.0")
133+
implementation("org.jetbrains.kotlinx:atomicfu:0.26.1")
134134
}
135135
}
136136
}

buildSrc/src/main/kotlin/pacemaker.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ kotlin {
2626
implementation(kotlin("test-common"))
2727
implementation(kotlin("test-annotations-common"))
2828
implementation(Dependencies.coroutinesTest)
29-
implementation(Dependencies.coroutinesDebug)
3029
}
3130

3231

@@ -45,4 +44,4 @@ tasks.withType<Test>().configureEach {
4544
showCauses = true
4645
outputs.upToDateWhen { false }
4746
}
48-
}
47+
}

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ android.useAndroidX=true
22
kotlin.code.style=official
33
org.jetbrains.compose.experimental.uikit.enabled=true
44
org.jetbrains.compose.experimental.macos.enabled=true
5-
org.gradle.jvmargs=-Xmx12g -XX:+UseParallelGC
5+
org.gradle.jvmargs=-Xmx12g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g
66
org.gradle.configuration-cache=true
7-
org.gradle.caching=true
7+
org.gradle.caching=true
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Wed May 29 16:30:04 CEST 2024
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.12-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)