Skip to content

Commit 97836df

Browse files
committed
update dependencies
kotlin to 2.1.21 compose to 1.8.1 fastscroller to 0.3.2
1 parent d5c0d60 commit 97836df

5 files changed

Lines changed: 12 additions & 12 deletions

File tree

.idea/kotlinc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build-logic/convention/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,10 @@ kotlin {
2222

2323
dependencies {
2424
compileOnly(libs.android.gradlePlugin)
25-
compileOnly(libs.android.tools.common)
2625
compileOnly(libs.compose.gradlePlugin)
2726
compileOnly(libs.kotlin.gradlePlugin)
2827
compileOnly(libs.publish.gradlePlugin)
2928
implementation(libs.truth)
30-
lintChecks(libs.androidx.lint.gradle)
3129
}
3230

3331
tasks {

build-logic/convention/src/main/kotlin/com/seanproctor/datatable/KotlinAndroid.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.seanproctor.datatable
33
import com.android.build.api.dsl.CommonExtension
44
import org.gradle.api.JavaVersion
55
import org.gradle.api.Project
6+
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
67
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
78

89
internal fun Project.configureKotlinAndroid(
@@ -29,6 +30,7 @@ internal fun Project.configureKotlinAndroid(
2930
/**
3031
* Configure base Kotlin options for all targets
3132
*/
33+
@OptIn(ExperimentalWasmDsl::class)
3234
internal fun Project.configureKotlinMultiplatform(
3335
extension: KotlinMultiplatformExtension
3436
) {
@@ -42,6 +44,10 @@ internal fun Project.configureKotlinMultiplatform(
4244
jvm()
4345
js {
4446
browser()
47+
useEsModules()
48+
}
49+
wasmJs {
50+
browser()
4551
}
4652
iosX64()
4753
iosArm64()

gradle/libs.versions.toml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@ datatable-android-application = { id = "datatable.android.application" }
2020

2121
activityCompose = "1.10.1"
2222
androidGradlePlugin = "8.7.3"
23-
androidTools = "31.7.3"
24-
androidxLintGradle = "1.0.0-alpha03"
25-
compose = "1.7.3"
26-
fastscroller = "0.3.1"
27-
kotlin = "2.1.10"
23+
compose = "1.8.1"
24+
fastscroller = "0.3.2"
25+
kotlin = "2.1.21"
2826
truth = "1.4.4"
29-
vanniktech = "0.30.0"
27+
vanniktech = "0.32.0"
3028

3129
[libraries]
3230

@@ -36,8 +34,6 @@ truth = { group = "com.google.truth", name = "truth", version.ref = "truth" }
3634

3735
# Dependencies of the included build-logic
3836
android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
39-
android-tools-common = { group = "com.android.tools", name = "common", version.ref = "androidTools" }
40-
androidx-lint-gradle = { group = "androidx.lint", name = "lint-gradle", version.ref = "androidxLintGradle" }
4137
compose-gradlePlugin = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }
4238
kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
4339
publish-gradlePlugin = { module = "com.vanniktech.maven.publish:com.vanniktech.maven.publish.gradle.plugin", version.ref = "vanniktech" }

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencyResolutionManagement {
1717
plugins {
1818
// See https://jmfayard.github.io/refreshVersions
1919
id("de.fayard.refreshVersions") version "0.60.5"
20-
id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
20+
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
2121
}
2222

2323
rootProject.name = "compose-data-table"

0 commit comments

Comments
 (0)