Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[versions]
udytilsVersionName = "1.2.1"

kotlin = "2.3.21"
ksp = "2.3.3"
kotlin = "2.4.0"
ksp = "2.3.9"

# Pinned to 9.0.0 (not 9.1+/9.2+) so the project can still be synced in IntelliJ IDEA,
# whose bundled Android plugin currently supports AGP up to 9.0.0. The KMP modules use the
Expand All @@ -14,15 +14,15 @@ android-compileSdk = "36"
android-targetSdk = "36"

maven-publish = "0.34.0"
compose = "1.10.3"
compose = "1.11.1"

kotlinx-coroutines = "1.10.2"
kotlinx-serialization = "1.11.0"
kotlinx-datetime = "0.7.1"
kotlinx-io = "0.8.0"

androidx-activity = "1.11.0"
androidx-lifecycle = "2.9.6"
androidx-lifecycle = "2.10.0"
androidx-appcompat = "1.7.1"

enro = "3.0.0-alpha09"
Expand All @@ -41,18 +41,19 @@ ktor = "3.4.1"
# urpc-koin compiled against 4.0.4 hit NoSuchMethodError against a 4.2.1 runtime.
koin = "4.2.1"

# Postgres database-management toolkit. Versions mirror the primary consumer
# (Reglyph) exactly — these modules are consumed via composite build, so a
# version skew against the consumer's resolved classpath risks NoSuchMethodError
# the same way Ktor/Koin do.
exposed = "0.61.0"
postgresql = "42.7.5"
hikaricp = "6.2.1"
flyway = "11.3.3"
zonky-embedded-postgres = "2.0.7"
zonky-postgres-binaries = "16.4.0"
# Postgres database-management toolkit. Bumped ahead of the primary consumer
# (Reglyph) during the Kotlin 2.4 / Exposed 1.x upgrade. Exposed 1.0 relocated its
# packages to org.jetbrains.exposed.v1.* (core) and .v1.jdbc.*, so a consumer still
# on 0.61 will break (ClassNotFound), not just skew — migrate Reglyph in lockstep
# when you bump it, since these modules are consumed there via composite build.
exposed = "1.3.0"
postgresql = "42.7.11"
hikaricp = "7.1.0"
flyway = "12.9.0"
zonky-embedded-postgres = "2.2.2"
zonky-postgres-binaries = "18.4.0"
logback = "1.5.24"
slf4j = "2.0.17"
slf4j = "2.0.18"

[libraries]
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ class TableSourceWriter(

private fun buildImports(columns: List<MappedColumn>): List<String> {
val set = sortedSetOf<String>()
set += "org.jetbrains.exposed.sql.Column"
set += "org.jetbrains.exposed.sql.ResultRow"
set += "org.jetbrains.exposed.sql.Table"
set += "org.jetbrains.exposed.sql.statements.UpdateBuilder"
set += "org.jetbrains.exposed.v1.core.Column"
set += "org.jetbrains.exposed.v1.core.ResultRow"
set += "org.jetbrains.exposed.v1.core.Table"
set += "org.jetbrains.exposed.v1.core.statements.UpdateBuilder"
for (column in columns) set += column.imports
return set.toList()
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package dev.isaacudy.udytils.postgres

import org.jetbrains.exposed.sql.ColumnType
import org.jetbrains.exposed.v1.core.ColumnType
import org.postgresql.util.PGobject

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package dev.isaacudy.udytils.postgres

import org.jetbrains.exposed.sql.ColumnType
import org.jetbrains.exposed.v1.core.ColumnType
import org.postgresql.util.PGobject

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package dev.isaacudy.udytils.postgres

import org.jetbrains.exposed.sql.Column
import org.jetbrains.exposed.sql.ColumnType
import org.jetbrains.exposed.sql.Table
import org.jetbrains.exposed.v1.core.Column
import org.jetbrains.exposed.v1.core.ColumnType
import org.jetbrains.exposed.v1.core.Table
import java.time.LocalDate
import java.time.LocalDateTime
import java.time.LocalTime
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package dev.isaacudy.udytils.postgres

import org.jetbrains.exposed.sql.ColumnType
import org.jetbrains.exposed.v1.core.ColumnType
import java.sql.Array as SqlArray

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package dev.isaacudy.udytils.postgres

import org.jetbrains.exposed.sql.Column
import org.jetbrains.exposed.sql.ColumnType
import org.jetbrains.exposed.sql.Table
import org.jetbrains.exposed.v1.core.Column
import org.jetbrains.exposed.v1.core.ColumnType
import org.jetbrains.exposed.v1.core.Table
import java.time.OffsetDateTime
import java.time.ZoneOffset
import kotlin.time.Instant
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import dev.isaacudy.udytils.postgres.PgNotificationBus
import dev.isaacudy.udytils.postgres.PostgresConfig
import dev.isaacudy.udytils.postgres.PostgresMigrator
import dev.isaacudy.udytils.postgres.buildHikariDataSource
import org.jetbrains.exposed.sql.Database
import org.jetbrains.exposed.v1.jdbc.Database
import org.koin.core.module.Module
import org.koin.dsl.module
import javax.sql.DataSource
Expand Down