Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
tiagohm committed Sep 7, 2024
2 parents a2068f7 + eb6d7f7 commit 97cfcda
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

buildscript {
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0-Beta4")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20")
classpath("com.adarshr:gradle-test-logger-plugin:4.0.0")
classpath("com.github.gmazzo:gradle-buildconfig-plugin:3.1.0")
classpath("org.jetbrains.kotlin:kotlin-allopen:2.0.0-Beta4")
classpath("org.jetbrains.kotlin:kotlin-allopen:2.0.20")
classpath("org.openjfx:javafx-plugin:0.1.0")
}

Expand Down
8 changes: 4 additions & 4 deletions desktop/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ plugins {
kotlin("kapt")
id("maven-publish")
id("com.github.gmazzo.buildconfig")
id("org.springframework.boot") version "3.2.2"
id("io.spring.dependency-management") version "1.1.4"
id("org.springframework.boot") version "3.3.3"
id("io.spring.dependency-management") version "1.1.6"
kotlin("plugin.spring")
id("org.openjfx.javafxplugin")
}
Expand All @@ -27,10 +27,10 @@ dependencies {
// sdl2gdx's dependencies.
implementation("com.badlogicgames.gdx:gdx:1.12.1") // 1.9.9
implementation("com.badlogicgames.gdx:gdx-controllers:1.9.13") // 1.9.9
implementation("com.badlogicgames.gdx:gdx-jnigen:2.5.1") // 1.9.10
implementation("com.badlogicgames.gdx:gdx-jnigen:2.5.2") // 1.9.10

implementation("org.springframework.boot:spring-boot-starter")
kapt("org.springframework:spring-context-indexer:6.1.4")
kapt("org.springframework:spring-context-indexer:6.1.12")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
implementation(libs.logback)
Expand Down
14 changes: 7 additions & 7 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ buildCache {
dependencyResolutionManagement {
versionCatalogs {
create("libs") {
library("okio", "com.squareup.okio:okio:3.8.0")
library("jackson", "com.fasterxml.jackson.core:jackson-databind:2.16.1")
library("csv", "de.siegmar:fastcsv:3.0.0")
library("oshi", "com.github.oshi:oshi-core:6.4.12")
library("logback", "ch.qos.logback:logback-classic:1.4.14")
library("kotest-assertions-core", "io.kotest:kotest-assertions-core:5.8.0")
library("kotest-runner-junit5", "io.kotest:kotest-runner-junit5:5.8.0")
library("okio", "com.squareup.okio:okio:3.9.0")
library("jackson", "com.fasterxml.jackson.core:jackson-databind:2.17.2")
library("csv", "de.siegmar:fastcsv:3.2.0")
library("oshi", "com.github.oshi:oshi-core:6.6.3")
library("logback", "ch.qos.logback:logback-classic:1.5.7")
library("kotest-assertions-core", "io.kotest:kotest-assertions-core:5.9.1")
library("kotest-runner-junit5", "io.kotest:kotest-runner-junit5:5.9.1")
bundle("kotest", listOf("kotest-assertions-core", "kotest-runner-junit5"))
}
}
Expand Down

0 comments on commit 97cfcda

Please sign in to comment.