strips/foundation
2
0
Fork 0
mirror of https://github.com/GayPizzaSpecifications/foundation.git synced 2025-11-04 03:39:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dependencies upgrade and upgrade to Kotlin 1.8.10

Browse Source
This commit is contained in:
Alex Zenla
2023-02-05 21:49:53 -08:00
parent ee6d3b37c0
commit 233c601595
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
build.gradle.kts
View File

@ -2,9 +2,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
java java
id("gay.pizza.foundation.concrete-root") version "0.8.0" id("gay.pizza.foundation.concrete-root") version "0.9.0"
id("gay.pizza.foundation.concrete-library") version "0.8.0" apply false id("gay.pizza.foundation.concrete-library") version "0.9.0" apply false
id("gay.pizza.foundation.concrete-plugin") version "0.8.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" id("com.github.ben-manes.versions") version "0.45.0"
} }
@ -34,16 +34,16 @@ subprojects {
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
// Core libraries. // Core libraries.
implementation("io.insert-koin:koin-core:3.1.4") implementation("io.insert-koin:koin-core:3.3.2")
testImplementation("io.insert-koin:koin-test:3.1.4") testImplementation("io.insert-koin:koin-test:3.3.2")
// Serialization // 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") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.1")
// Persistence // Persistence
implementation("org.jetbrains.xodus:xodus-openAPI:1.3.232") implementation("org.jetbrains.xodus:xodus-openAPI:2.0.1")
implementation("org.jetbrains.xodus:xodus-entity-store:1.3.232") implementation("org.jetbrains.xodus:xodus-entity-store:2.0.1")
} }
java { java {

2
common-heimdall/build.gradle.kts
View File

@ -3,7 +3,7 @@ plugins {
} }
dependencies { 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-jdbc:0.41.1")
api("org.jetbrains.exposed:exposed-java-time:0.41.1") api("org.jetbrains.exposed:exposed-java-time:0.41.1")
api("com.zaxxer:HikariCP:5.0.1") api("com.zaxxer:HikariCP:5.0.1")

4
foundation-core/build.gradle.kts
View File

@ -4,9 +4,9 @@ plugins {
dependencies { dependencies {
// TODO: might be able to ship all dependencies in core? are we duplicating classes in JARs? // 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("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")) api(project(":common-plugin"))
} }

4
tool-gjallarhorn/build.gradle.kts
View File

@ -6,8 +6,8 @@ plugins {
dependencies { dependencies {
api(project(":common-heimdall")) api(project(":common-heimdall"))
implementation("com.github.ajalt.clikt:clikt:3.5.0") implementation("com.github.ajalt.clikt:clikt:3.5.1")
implementation("org.slf4j:slf4j-simple:1.7.36") implementation("org.slf4j:slf4j-simple:2.0.6")
} }
tasks.jar { tasks.jar {

8
tool-gjallarhorn/src/main/kotlin/gay/pizza/foundation/heimdall/tool/commands/BlockChangeTimelapseCommand.kt
View File

@ -74,10 +74,10 @@ class BlockChangeTimelapseCommand : CliktCommand("Block Change Timelapse", name
val trim = maybeBuildTrim() val trim = maybeBuildTrim()
val filter = compose( val filter = compose(
combine = { a, b -> a and b }, combine = { a, b -> a and b },
{ trim?.first?.x != null } to { BlockChangeView.x greaterEq trim!!.first.x }, { trim?.first?.x != null } to { BlockChangeView.x greaterEq trim!!.first.x.toDouble() },
{ trim?.first?.z != null } to { BlockChangeView.z greaterEq trim!!.first.z }, { trim?.first?.z != null } to { BlockChangeView.z greaterEq trim!!.first.z.toDouble() },
{ trim?.second?.x != null } to { BlockChangeView.x lessEq trim!!.second.x }, { trim?.second?.x != null } to { BlockChangeView.x lessEq trim!!.second.x.toDouble() },
{ trim?.second?.z != null } to { BlockChangeView.z lessEq trim!!.second.z } { trim?.second?.z != null } to { BlockChangeView.z lessEq trim!!.second.z.toDouble() }
) )
val changelog = BlockChangelog.query(db, filter) val changelog = BlockChangelog.query(db, filter)