From 233c601595b8cf13a7f84d53155572fa5107796b Mon Sep 17 00:00:00 2001 From: Alex Zenla Date: Sun, 5 Feb 2023 21:49:53 -0800 Subject: [PATCH] Dependencies upgrade and upgrade to Kotlin 1.8.10 --- build.gradle.kts | 16 ++++++++-------- common-heimdall/build.gradle.kts | 2 +- foundation-core/build.gradle.kts | 4 ++-- tool-gjallarhorn/build.gradle.kts | 4 ++-- .../tool/commands/BlockChangeTimelapseCommand.kt | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9ed2499..7309899 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,9 +2,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { java - id("gay.pizza.foundation.concrete-root") version "0.8.0" - id("gay.pizza.foundation.concrete-library") version "0.8.0" apply false - id("gay.pizza.foundation.concrete-plugin") version "0.8.0" apply false + id("gay.pizza.foundation.concrete-root") version "0.9.0" + id("gay.pizza.foundation.concrete-library") version "0.9.0" apply false + id("gay.pizza.foundation.concrete-plugin") version "0.9.0" apply false id("com.github.ben-manes.versions") version "0.45.0" } @@ -34,16 +34,16 @@ subprojects { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") // Core libraries. - implementation("io.insert-koin:koin-core:3.1.4") - testImplementation("io.insert-koin:koin-test:3.1.4") + implementation("io.insert-koin:koin-core:3.3.2") + testImplementation("io.insert-koin:koin-test:3.3.2") // Serialization - implementation("com.charleskorn.kaml:kaml:0.38.0") + implementation("com.charleskorn.kaml:kaml:0.51.0") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.1") // Persistence - implementation("org.jetbrains.xodus:xodus-openAPI:1.3.232") - implementation("org.jetbrains.xodus:xodus-entity-store:1.3.232") + implementation("org.jetbrains.xodus:xodus-openAPI:2.0.1") + implementation("org.jetbrains.xodus:xodus-entity-store:2.0.1") } java { diff --git a/common-heimdall/build.gradle.kts b/common-heimdall/build.gradle.kts index d8ff8cf..97de518 100644 --- a/common-heimdall/build.gradle.kts +++ b/common-heimdall/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api("org.postgresql:postgresql:42.5.1") + api("org.postgresql:postgresql:42.5.3") api("org.jetbrains.exposed:exposed-jdbc:0.41.1") api("org.jetbrains.exposed:exposed-java-time:0.41.1") api("com.zaxxer:HikariCP:5.0.1") diff --git a/foundation-core/build.gradle.kts b/foundation-core/build.gradle.kts index 586b312..371b29e 100644 --- a/foundation-core/build.gradle.kts +++ b/foundation-core/build.gradle.kts @@ -4,9 +4,9 @@ plugins { dependencies { // TODO: might be able to ship all dependencies in core? are we duplicating classes in JARs? - implementation("software.amazon.awssdk:s3:2.17.102") + implementation("software.amazon.awssdk:s3:2.19.31") implementation("org.quartz-scheduler:quartz:2.3.2") - implementation("com.google.guava:guava:31.0.1-jre") + implementation("com.google.guava:guava:31.1-jre") api(project(":common-plugin")) } diff --git a/tool-gjallarhorn/build.gradle.kts b/tool-gjallarhorn/build.gradle.kts index bd1e932..5072381 100644 --- a/tool-gjallarhorn/build.gradle.kts +++ b/tool-gjallarhorn/build.gradle.kts @@ -6,8 +6,8 @@ plugins { dependencies { api(project(":common-heimdall")) - implementation("com.github.ajalt.clikt:clikt:3.5.0") - implementation("org.slf4j:slf4j-simple:1.7.36") + implementation("com.github.ajalt.clikt:clikt:3.5.1") + implementation("org.slf4j:slf4j-simple:2.0.6") } tasks.jar { diff --git a/tool-gjallarhorn/src/main/kotlin/gay/pizza/foundation/heimdall/tool/commands/BlockChangeTimelapseCommand.kt b/tool-gjallarhorn/src/main/kotlin/gay/pizza/foundation/heimdall/tool/commands/BlockChangeTimelapseCommand.kt index 895430e..f9bd410 100644 --- a/tool-gjallarhorn/src/main/kotlin/gay/pizza/foundation/heimdall/tool/commands/BlockChangeTimelapseCommand.kt +++ b/tool-gjallarhorn/src/main/kotlin/gay/pizza/foundation/heimdall/tool/commands/BlockChangeTimelapseCommand.kt @@ -74,10 +74,10 @@ class BlockChangeTimelapseCommand : CliktCommand("Block Change Timelapse", name val trim = maybeBuildTrim() val filter = compose( combine = { a, b -> a and b }, - { trim?.first?.x != null } to { BlockChangeView.x greaterEq trim!!.first.x }, - { trim?.first?.z != null } to { BlockChangeView.z greaterEq trim!!.first.z }, - { trim?.second?.x != null } to { BlockChangeView.x lessEq trim!!.second.x }, - { trim?.second?.z != null } to { BlockChangeView.z lessEq trim!!.second.z } + { trim?.first?.x != null } to { BlockChangeView.x greaterEq trim!!.first.x.toDouble() }, + { trim?.first?.z != null } to { BlockChangeView.z greaterEq trim!!.first.z.toDouble() }, + { trim?.second?.x != null } to { BlockChangeView.x lessEq trim!!.second.x.toDouble() }, + { trim?.second?.z != null } to { BlockChangeView.z lessEq trim!!.second.z.toDouble() } ) val changelog = BlockChangelog.query(db, filter)