From 3a6da12b853a02e1878f894b47083ccaac789d4f Mon Sep 17 00:00:00 2001 From: Andrew Alexander Date: Sat, 13 Jan 2024 11:18:30 -0500 Subject: [PATCH] Migrate to libs.versions.toml, upgrade dependencies --- .../dashboard-search-table/build.gradle.kts | 14 ++- armeria/full-spec/build.gradle.kts | 12 ++- build.gradle.kts | 12 +-- buildSrc/build.gradle.kts | 7 -- buildSrc/settings.gradle.kts | 5 -- buildSrc/src/main/kotlin/Dependencies.kt | 88 ------------------- buildSrc/src/main/kotlin/Versions.kt | 9 -- gradle/libs.versions.toml | 42 +++++++++ .../kotlinx-html-templates/build.gradle.kts | 6 +- hotwire-kt/tailwinds-ui/build.gradle.kts | 4 +- misk-db/feature-sample/build.gradle.kts | 26 +++--- .../misk/db/flagpole/FlagpoleService.kt | 2 +- .../persistence/FlagpolePersistenceModule.kt | 6 +- misk-db/feature/build.gradle.kts | 44 +++++----- .../misk/db/feature/DbFeatureFlagsModule.kt | 6 +- 15 files changed, 102 insertions(+), 181 deletions(-) delete mode 100644 buildSrc/build.gradle.kts delete mode 100644 buildSrc/settings.gradle.kts delete mode 100644 buildSrc/src/main/kotlin/Dependencies.kt delete mode 100644 buildSrc/src/main/kotlin/Versions.kt create mode 100644 gradle/libs.versions.toml diff --git a/armeria/dashboard-search-table/build.gradle.kts b/armeria/dashboard-search-table/build.gradle.kts index 4b5f0d61..84df311f 100644 --- a/armeria/dashboard-search-table/build.gradle.kts +++ b/armeria/dashboard-search-table/build.gradle.kts @@ -1,6 +1,4 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -import hotwire_kt.Dependencies - plugins { id("org.jetbrains.kotlin.jvm") id("com.github.johnrengelman.shadow") @@ -19,13 +17,13 @@ dependencies { implementation(projects.hotwireKt.kotlinxHtmlTemplates) implementation(projects.hotwireKt.tailwindsUi) - implementation(Dependencies.kotlinxHtml) - implementation(Dependencies.okio) - implementation(Dependencies.moshiCore) - implementation(Dependencies.moshiKotlin) - implementation(Dependencies.wispLogging) + implementation(libs.kotlinxHtml) + implementation(libs.okio) + implementation(libs.moshiCore) + implementation(libs.moshiKotlin) + implementation(libs.wispLogging) - implementation(platform(Dependencies.armeriaBom)) + implementation(platform(libs.armeriaBom)) implementation("com.linecorp.armeria:armeria-grpc") } diff --git a/armeria/full-spec/build.gradle.kts b/armeria/full-spec/build.gradle.kts index 0cade57d..7dc9067a 100644 --- a/armeria/full-spec/build.gradle.kts +++ b/armeria/full-spec/build.gradle.kts @@ -1,6 +1,4 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -import hotwire_kt.Dependencies - plugins { id("org.jetbrains.kotlin.jvm") id("com.github.johnrengelman.shadow") @@ -19,12 +17,12 @@ dependencies { implementation(projects.hotwireKt.kotlinxHtmlTemplates) implementation(projects.hotwireKt.tailwindsUi) - implementation(Dependencies.mustacheCompiler) - implementation(Dependencies.kotlinxHtml) - implementation(Dependencies.okio) - implementation(Dependencies.wispLogging) + implementation(libs.mustacheCompiler) + implementation(libs.kotlinxHtml) + implementation(libs.okio) + implementation(libs.wispLogging) - implementation(platform(Dependencies.armeriaBom)) + implementation(platform(libs.armeriaBom)) implementation("com.linecorp.armeria:armeria-grpc") } diff --git a/build.gradle.kts b/build.gradle.kts index a5a69a0b..01b12ad5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,12 +15,12 @@ buildscript { } dependencies { - classpath(hotwire_kt.Dependencies.kotlinAllOpenPlugin) - classpath(hotwire_kt.Dependencies.kotlinGradlePlugin) - classpath(hotwire_kt.Dependencies.junitGradlePlugin) - classpath(hotwire_kt.Dependencies.shadowJarPlugin) - classpath(hotwire_kt.Dependencies.sqldelightGradle) - classpath(hotwire_kt.Dependencies.wireGradlePlugin) + classpath(libs.kotlinAllOpenPlugin) + classpath(libs.kotlinGradlePlugin) + classpath(libs.junitGradlePlugin) + classpath(libs.shadowJarPlugin) + classpath(libs.sqldelightGradle) + classpath(libs.wireGradlePlugin) } } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts deleted file mode 100644 index a6217e0b..00000000 --- a/buildSrc/build.gradle.kts +++ /dev/null @@ -1,7 +0,0 @@ -plugins { - `kotlin-dsl` -} - -repositories { - mavenCentral() -} diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts deleted file mode 100644 index 7631e58d..00000000 --- a/buildSrc/settings.gradle.kts +++ /dev/null @@ -1,5 +0,0 @@ -pluginManagement { - repositories { - gradlePluginPortal() - } -} diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt deleted file mode 100644 index 7b16d534..00000000 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ /dev/null @@ -1,88 +0,0 @@ -package hotwire_kt - -object Dependencies { - val armeriaBom = "com.linecorp.armeria:armeria-bom:1.11.0" - val junitApi = "org.junit.jupiter:junit-jupiter-api:5.8.2" - val junitEngine = "org.junit.jupiter:junit-jupiter-engine:5.8.2" - val junitGradlePlugin = "org.junit.platform:junit-platform-gradle-plugin:1.2.0" - val junitParams = "org.junit.jupiter:junit-jupiter-params:5.6.0" - val kotestJunitRunnerJvm = "io.kotest:kotest-runner-junit5-jvm:4.6.2" - val kotlinAllOpenPlugin = "org.jetbrains.kotlin:kotlin-allopen:${Versions.kotlin}" - val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}" - val kotlinReflection = "org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin}" - val kotlinStdLibJdk8 = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${Versions.kotlin}" - val kotlinTest = "org.jetbrains.kotlin:kotlin-test:${Versions.kotlin}" - val kotlinxHtml = "org.jetbrains.kotlinx:kotlinx-html-jvm:0.6.4" - val logbackClassic = "ch.qos.logback:logback-classic:1.2.5" - val misk = "com.squareup.misk:misk:${Versions.misk}" - val miskActions = "com.squareup.misk:misk-actions:${Versions.misk}" - val miskAdmin = "com.squareup.misk:misk-admin:${Versions.misk}" - val miskAws = "com.squareup.misk:misk-aws:${Versions.misk}" - val miskAws2Dynamodb = "com.squareup.misk:misk-aws2-dynamodb:${Versions.misk}" - val miskAwsDynamodb = "com.squareup.misk:misk-aws-dynamodb:${Versions.misk}" - val miskCore = "com.squareup.misk:misk-core:${Versions.misk}" - val miskCrypto = "com.squareup.misk:misk-crypto:${Versions.misk}" - val miskDatadog = "com.squareup.misk:misk-datadog:${Versions.misk}" - val miskFeature = "com.squareup.misk:misk-feature:${Versions.misk}" - val miskFeatureTesting = "com.squareup.misk:misk-feature-testing:${Versions.misk}" - val miskGrpcReflect = "com.squareup.misk:misk-grpc-reflect:${Versions.misk}" - val miskHibernate = "com.squareup.misk:misk-hibernate:${Versions.misk}" - val miskHibernateTesting = "com.squareup.misk:misk-hibernate-testing:${Versions.misk}" - val miskInject = "com.squareup.misk:misk-inject:${Versions.misk}" - val miskJdbc = "com.squareup.misk:misk-jdbc:${Versions.misk}" - val miskJdbcTesting = "com.squareup.misk:misk-jdbc-testing:${Versions.misk}" - val miskJobqueue = "com.squareup.misk:misk-jobqueue:${Versions.misk}" - val miskJobqueueTesting = "com.squareup.misk:misk-jobqueue-testing:${Versions.misk}" - val miskLaunchdarkly = "com.squareup.misk:misk-launchdarkly:${Versions.misk}" - val miskMetrics = "com.squareup.misk:misk-metrics:${Versions.misk}" - val miskPrometheus = "com.squareup.misk:misk-prometheus:${Versions.misk}" - val miskService = "com.squareup.misk:misk-service:${Versions.misk}" - val miskSlack = "com.squareup.misk:misk-slack:${Versions.misk}" - val miskTesting = "com.squareup.misk:misk-testing:${Versions.misk}" - val miskTransactionalJobqueue = "com.squareup.misk:misk-transactional-jobqueue:${Versions.misk}" - val miskZookeeper = "com.squareup.misk:misk-zookeeper:${Versions.misk}" - val miskZookeeperTesting = "com.squareup.misk:misk-zookeeper-testing:${Versions.misk}" - val mockk = "io.mockk:mockk:1.12.0" - val moshiAdapters = "com.squareup.moshi:moshi-adapters:${Versions.moshi}" - val moshiCore = "com.squareup.moshi:moshi:${Versions.moshi}" - val moshiKotlin = "com.squareup.moshi:moshi-kotlin:${Versions.moshi}" - val mustacheCompiler = "com.github.spullara.mustache.java:compiler:0.9.5" - val okio = "com.squareup.okio:okio:3.0.0" - val shadowJarPlugin = "gradle.plugin.com.github.johnrengelman:shadow:7.1.2" - val sqldelightDriverAndroid = "app.cash.sqldelight:android-driver:${Versions.sqldelight}" - val sqldelightDriverJvm = "app.cash.sqldelight:sqlite-driver:${Versions.sqldelight}" - val sqldelightDriverNative = "app.cash.sqldelight:native-driver:${Versions.sqldelight}" - val sqldelightGradle = "app.cash.sqldelight:app.cash.sqldelight.gradle.plugin:${Versions.sqldelight}" - val sqldelightJdbc = "org.xerial:sqlite-jdbc:3.39.3.0" - val sqldelightJdbcDriver = "app.cash.sqldelight:jdbc-driver:${Versions.sqldelight}" - val sqldelightMysqlDialect = "app.cash.sqldelight:mysql-dialect:${Versions.sqldelight}" - val sqldelightPrimitiveAdapters = "app.cash.sqldelight:primitive-adapters:${Versions.sqldelight}" - val wireCompiler = "com.squareup.wire:wire-compiler:${Versions.wire}" - val wireGradlePlugin = "com.squareup.wire:wire-gradle-plugin:${Versions.wire}" - val wireGrpcClient = "com.squareup.wire:wire-grpc-client:${Versions.wire}" - val wireMoshiAdapter = "com.squareup.wire:wire-moshi-adapter:${Versions.wire}" - val wireRuntime = "com.squareup.wire:wire-runtime:${Versions.wire}" - val wireSchema = "com.squareup.wire:wire-schema:${Versions.wire}" - val wispAwsEnvironment = "app.cash.wisp:wisp-aws-environment:${Versions.misk}" - val wispClient = "app.cash.wisp:wisp-client:${Versions.misk}" - val wispConfig = "app.cash.wisp:wisp-config:${Versions.misk}" - val wispContainersTesting = "app.cash.wisp:wisp-containers-testing:${Versions.misk}" - val wispDeployment = "app.cash.wisp:wisp-deployment:${Versions.misk}" - val wispDeploymentTesting = "app.cash.wisp:wisp-deployment-testing:${Versions.misk}" - val wispFeature = "app.cash.wisp:wisp-feature:${Versions.misk}" - val wispFeatureTesting = "app.cash.wisp:wisp-feature-testing:${Versions.misk}" - val wispLaunchDarkly = "app.cash.wisp:wisp-launchdarkly:${Versions.misk}" - val wispLease = "app.cash.wisp:wisp-lease:${Versions.misk}" - val wispLeaseTesting = "app.cash.wisp:wisp-lease-testing:${Versions.misk}" - val wispLogging = "app.cash.wisp:wisp-logging:${Versions.misk}" - val wispLoggingTesting = "app.cash.wisp:wisp-logging-testing:${Versions.misk}" - val wispMoshi = "app.cash.wisp:wisp-moshi:${Versions.misk}" - val wispResourceLoader = "app.cash.wisp:wisp-resource-loader:${Versions.misk}" - val wispResourceLoaderTesting = "app.cash.wisp:wisp-resource-loader-testing:${Versions.misk}" - val wispSsl = "app.cash.wisp:wisp-ssl:${Versions.misk}" - val wispTask = "app.cash.wisp:wisp-task:${Versions.misk}" - val wispTimeTesting = "app.cash.wisp:wisp-time-testing:${Versions.misk}" - val wispToken = "app.cash.wisp:wisp-token:${Versions.misk}" - val wispTokenTesting = "app.cash.wisp:wisp-token-testing:${Versions.misk}" - val wispTracing = "app.cash.wisp:wisp-tracing:${Versions.misk}" -} diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt deleted file mode 100644 index 0d0cb3a8..00000000 --- a/buildSrc/src/main/kotlin/Versions.kt +++ /dev/null @@ -1,9 +0,0 @@ -package hotwire_kt - -object Versions { - val kotlin = "1.8.0" - val moshi = "1.13.0" - val misk = "2023.08.11.085343-89121cf" - val sqldelight = "2.0.0-alpha05" - val wire = "4.4.3" -} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000..310d9811 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,42 @@ +[versions] + +misk = "2023.12.01.175902-d977e5a" +kotlin = "1.9.20" +moshi = "1.13.0" +okio = "3.6.0" +sqldelight = "2.0.1" +wire = "4.9.3" + +[libraries] +armeriaBom = { module = "com.linecorp.armeria:armeria-bom", version = "1.11.0" } +junitApi = { module = "org.junit.jupiter:junit-jupiter-api", version = "5.9.1" } +junitEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version = "5.9.1" } +junitGradlePlugin = { module = "org.junit.platform:junit-platform-gradle-plugin", version = "1.2.0" } +kotlinAllOpenPlugin = { module = "org.jetbrains.kotlin:kotlin-allopen", version.ref = "kotlin" } +kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } +kotlinTest = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } +kotlinxHtml = { module = "org.jetbrains.kotlinx:kotlinx-html-jvm", version = "0.8.1" } +logbackClassic = { module = "ch.qos.logback:logback-classic", version = "1.4.14" } +misk = { module = "com.squareup.misk:misk", version.ref = "misk" } +miskActions = { module = "com.squareup.misk:misk-actions", version.ref = "misk" } +miskAdmin = { module = "com.squareup.misk:misk-admin", version.ref = "misk" } +miskCore = { module = "com.squareup.misk:misk-core", version.ref = "misk" } +miskFeature = { module = "com.squareup.misk:misk-feature", version.ref = "misk" } +miskInject = { module = "com.squareup.misk:misk-inject", version.ref = "misk" } +miskJdbc = { module = "com.squareup.misk:misk-jdbc", version.ref = "misk" } +miskService = { module = "com.squareup.misk:misk-service", version.ref = "misk" } +miskTesting = { module = "com.squareup.misk:misk-testing", version.ref = "misk" } +moshiCore = { module = "com.squareup.moshi:moshi", version.ref = "moshi" } +moshiKotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "moshi" } +mustacheCompiler = { module = "com.github.spullara.mustache.java:compiler", version = "0.9.5" } +okio = { module = "com.squareup.okio:okio", version.ref = "okio" } +shadowJarPlugin = { module = "gradle.plugin.com.github.johnrengelman:shadow", version = "7.1.2" } +sqldelightGradle = { module = "app.cash.sqldelight:app.cash.sqldelight.gradle.plugin", version.ref = "sqldelight" } +sqldelightJdbc = { module = "org.xerial:sqlite-jdbc", version = "3.39.3.0" } +sqldelightJdbcDriver = { module = "app.cash.sqldelight:jdbc-driver", version.ref = "sqldelight" } +sqldelightMysqlDialect = { module = "app.cash.sqldelight:mysql-dialect", version.ref = "sqldelight" } +wireGradlePlugin = { module = "com.squareup.wire:wire-gradle-plugin", version.ref = "wire" } +wispConfig = { module = "app.cash.wisp:wisp-config", version.ref = "misk" } +wispDeployment = { module = "app.cash.wisp:wisp-deployment", version.ref = "misk" } +wispLogging = { module = "app.cash.wisp:wisp-logging", version.ref = "misk" } +wispMoshi = { module = "app.cash.wisp:wisp-moshi", version.ref = "misk" } diff --git a/hotwire-kt/kotlinx-html-templates/build.gradle.kts b/hotwire-kt/kotlinx-html-templates/build.gradle.kts index 37a67e48..d45f3e9b 100644 --- a/hotwire-kt/kotlinx-html-templates/build.gradle.kts +++ b/hotwire-kt/kotlinx-html-templates/build.gradle.kts @@ -1,11 +1,9 @@ -import hotwire_kt.Dependencies - plugins { id("org.jetbrains.kotlin.jvm") id("org.jetbrains.kotlin.plugin.allopen") } dependencies { - api(Dependencies.kotlinxHtml) - api(Dependencies.miskActions) + api(libs.kotlinxHtml) + api(libs.miskActions) } diff --git a/hotwire-kt/tailwinds-ui/build.gradle.kts b/hotwire-kt/tailwinds-ui/build.gradle.kts index 3506d839..571a3b29 100644 --- a/hotwire-kt/tailwinds-ui/build.gradle.kts +++ b/hotwire-kt/tailwinds-ui/build.gradle.kts @@ -1,5 +1,3 @@ -import hotwire_kt.Dependencies - plugins { id("org.jetbrains.kotlin.jvm") id("org.jetbrains.kotlin.plugin.allopen") @@ -7,5 +5,5 @@ plugins { dependencies { api(projects.hotwireKt.kotlinxHtmlTemplates) - implementation(Dependencies.kotlinxHtml) + implementation(libs.kotlinxHtml) } diff --git a/misk-db/feature-sample/build.gradle.kts b/misk-db/feature-sample/build.gradle.kts index 3503da78..59da8ead 100644 --- a/misk-db/feature-sample/build.gradle.kts +++ b/misk-db/feature-sample/build.gradle.kts @@ -1,5 +1,3 @@ -import hotwire_kt.Dependencies - plugins { id("app.cash.sqldelight") id("com.squareup.wire") @@ -15,18 +13,18 @@ application { dependencies { implementation(projects.miskDb.feature) - implementation(Dependencies.logbackClassic) - implementation(Dependencies.misk) - implementation(Dependencies.miskAdmin) - implementation(Dependencies.miskCore) - implementation(Dependencies.miskFeature) - implementation(Dependencies.miskInject) - implementation(Dependencies.wispConfig) + implementation(libs.logbackClassic) + implementation(libs.misk) + implementation(libs.miskAdmin) + implementation(libs.miskCore) + implementation(libs.miskFeature) + implementation(libs.miskInject) + implementation(libs.wispConfig) // Database - implementation(Dependencies.miskJdbc) - implementation(Dependencies.sqldelightJdbc) - implementation(Dependencies.sqldelightJdbcDriver) + implementation(libs.miskJdbc) + implementation(libs.sqldelightJdbc) + implementation(libs.sqldelightJdbcDriver) } wire { @@ -50,9 +48,9 @@ wire { sqldelight { databases { create("FlagpoleDatabase") { - dialect(Dependencies.sqldelightMysqlDialect) + dialect(libs.sqldelightMysqlDialect) packageName.set("misk.db.flagpole.db") - sourceFolders.set(listOf("sqldelight", "resources/db-migrations")) + srcDirs(listOf("src/main/sqldelight", "src/main/resources/db-migrations")) deriveSchemaFromMigrations.set(true) migrationOutputDirectory.set(file("$buildDir/resources/main/db-migrations")) } diff --git a/misk-db/feature-sample/src/main/kotlin/misk/db/flagpole/FlagpoleService.kt b/misk-db/feature-sample/src/main/kotlin/misk/db/flagpole/FlagpoleService.kt index a19a6217..472c5ccc 100644 --- a/misk-db/feature-sample/src/main/kotlin/misk/db/flagpole/FlagpoleService.kt +++ b/misk-db/feature-sample/src/main/kotlin/misk/db/flagpole/FlagpoleService.kt @@ -22,7 +22,7 @@ private const val SERVICE_NAME = "flagpole" fun main(args: Array) { val deployment = DEVELOPMENT -// FlagpoleLogging.configure() + FlagpoleLogging.configure() val config = MiskConfig.load(SERVICE_NAME, deployment) MiskApplication( MiskRealServiceModule(), diff --git a/misk-db/feature-sample/src/main/kotlin/misk/db/flagpole/persistence/FlagpolePersistenceModule.kt b/misk-db/feature-sample/src/main/kotlin/misk/db/flagpole/persistence/FlagpolePersistenceModule.kt index 0734c86e..d8fb35c7 100644 --- a/misk-db/feature-sample/src/main/kotlin/misk/db/flagpole/persistence/FlagpolePersistenceModule.kt +++ b/misk-db/feature-sample/src/main/kotlin/misk/db/flagpole/persistence/FlagpolePersistenceModule.kt @@ -43,13 +43,13 @@ class FlagpolePersistenceModule( return connection } - override fun notifyListeners(queryKeys: Array) { + override fun notifyListeners(vararg queryKeys: String) { } - override fun removeListener(listener: Query.Listener, queryKeys: Array) { + override fun removeListener(vararg queryKeys: String, listener: Query.Listener) { } - override fun addListener(listener: Query.Listener, queryKeys: Array) { + override fun addListener(vararg queryKeys: String, listener: Query.Listener) { } override fun closeConnection(connection: Connection) { diff --git a/misk-db/feature/build.gradle.kts b/misk-db/feature/build.gradle.kts index 07785106..234403d2 100644 --- a/misk-db/feature/build.gradle.kts +++ b/misk-db/feature/build.gradle.kts @@ -1,5 +1,3 @@ -import hotwire_kt.Dependencies - plugins { `java-library` id("app.cash.sqldelight") @@ -8,20 +6,20 @@ plugins { dependencies { // Basic Misk libraries - api(Dependencies.miskActions) - api(Dependencies.miskAdmin) - api(Dependencies.miskFeature) - api(Dependencies.miskInject) - api(Dependencies.wispDeployment) - api(Dependencies.wispLogging) - api(Dependencies.wispMoshi) - implementation(Dependencies.miskCore) - implementation(Dependencies.miskService) + api(libs.miskActions) + api(libs.miskAdmin) + api(libs.miskFeature) + api(libs.miskInject) + api(libs.wispDeployment) + api(libs.wispLogging) + api(libs.wispMoshi) + implementation(libs.miskCore) + implementation(libs.miskService) // Database - implementation(Dependencies.miskJdbc) - implementation(Dependencies.sqldelightJdbc) - implementation(Dependencies.sqldelightJdbcDriver) + implementation(libs.miskJdbc) + implementation(libs.sqldelightJdbc) + implementation(libs.sqldelightJdbcDriver) // ui api(projects.hotwireKt.kotlinxHtmlTemplates) @@ -30,14 +28,14 @@ dependencies { // testing testImplementation(projects.miskDb.featureSample) - testImplementation(Dependencies.junitApi) - testImplementation(Dependencies.kotlinTest) - testImplementation(Dependencies.misk) - testImplementation(Dependencies.miskAdmin) - testImplementation(testFixtures(Dependencies.miskJdbc)) - testImplementation(Dependencies.miskTesting) + testImplementation(libs.junitApi) + testImplementation(libs.kotlinTest) + testImplementation(libs.misk) + testImplementation(libs.miskAdmin) + testImplementation(testFixtures(libs.miskJdbc)) + testImplementation(libs.miskTesting) - testRuntimeOnly(Dependencies.junitEngine) + testRuntimeOnly(libs.junitEngine) } sourceSets { @@ -74,9 +72,9 @@ wire { sqldelight { databases { create("FeatureDatabase") { - dialect(Dependencies.sqldelightMysqlDialect) + dialect(libs.sqldelightMysqlDialect) packageName.set("misk.db") - sourceFolders.set(listOf("sqldelight", "sqldelight-migrations")) + srcDirs(listOf("src/main/sqldelight", "src/main/sqldelight-migrations")) deriveSchemaFromMigrations.set(true) } } diff --git a/misk-db/feature/src/main/kotlin/misk/db/feature/DbFeatureFlagsModule.kt b/misk-db/feature/src/main/kotlin/misk/db/feature/DbFeatureFlagsModule.kt index 02bf27be..70cef44c 100644 --- a/misk-db/feature/src/main/kotlin/misk/db/feature/DbFeatureFlagsModule.kt +++ b/misk-db/feature/src/main/kotlin/misk/db/feature/DbFeatureFlagsModule.kt @@ -170,13 +170,13 @@ class DbFeatureFlagsModule( return connection } - override fun notifyListeners(queryKeys: Array) { + override fun notifyListeners(vararg queryKeys: String) { } - override fun removeListener(listener: Query.Listener, queryKeys: Array) { + override fun removeListener(vararg queryKeys: String, listener: Query.Listener) { } - override fun addListener(listener: Query.Listener, queryKeys: Array) { + override fun addListener(vararg queryKeys: String, listener: Query.Listener) { } override fun closeConnection(connection: Connection) {