Skip to content

Commit

Permalink
updated dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
beneschwab committed May 8, 2024
1 parent 63d5410 commit 40ed556
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 36 deletions.
12 changes: 6 additions & 6 deletions build.gradle.kts
Expand Up @@ -17,9 +17,9 @@
import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
import org.jetbrains.dokka.gradle.DokkaMultiModuleTask

if (!JavaVersion.current().isJava11Compatible) {
logger.warn(
"This build requires Java ${JavaVersion.VERSION_11}, " +
if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
throw GradleException(
"This build requires Java ${JavaVersion.VERSION_17}, " +
"but version ${JavaVersion.current()} is currently in use."
)
}
Expand Down Expand Up @@ -48,12 +48,12 @@ allprojects {
}

java {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = "11"
jvmTarget = "17"
}
}

Expand Down
32 changes: 16 additions & 16 deletions buildSrc/src/main/kotlin/Dependencies.kt
Expand Up @@ -17,48 +17,48 @@

object DependencyVersions {
// standard libraries
const val kotlin = "1.9.22"
const val kotlin = "1.9.24"
const val coroutines = "1.8.0"
const val arrow = "1.2.1"
const val arrow = "1.2.4"

// testing libraries
const val kotest = "5.8.0"
const val kotest = "5.8.1"
const val kotestExtensionArrow = "1.4.0"
const val mockk = "1.13.9"
const val mockk = "1.13.10"

// logging libraries
const val kotlinLogging = "3.0.5"
const val slf4jSimple = "2.0.12"
const val slf4jSimple = "2.0.13"

// object creation libraries
const val kotlinxSerializationJson = "1.6.3"
const val kaml = "0.57.0"
const val jakartaActivationApi = "2.1.2"
const val jakartaXmlBindApi = "4.0.1"
const val jaxb = "4.0.4"
const val kaml = "0.59.0"
const val jakartaActivationApi = "2.1.3"
const val jakartaXmlBindApi = "4.0.2"
const val jaxb = "4.0.5"

// object mapping libraries
const val mapstruct = "1.5.5.Final"

// io libraries
const val clikt = "4.2.2"
const val clikt = "4.4.0"
const val mordant = "1.2.1"
const val commonsIO = "2.15.1"
const val commonsCSV = "1.10.0"
const val commonsIO = "2.16.1"
const val commonsCSV = "1.11.0"
const val commonsLang = "3.14.0"
const val commonsCompress = "1.25.0"
const val zstdJni = "1.5.5-11"
const val commonsCompress = "1.26.1"
const val zstdJni = "1.5.6-3"
const val emojiJava = "5.1.1"

// math libraries
const val guava = "33.0.0-jre"
const val guava = "33.2.0-jre"
const val commonsMath = "3.6.1"
const val joml = "1.10.5"
const val poly2tri = "0.1.2"

// geo libraries
const val proj4 = "1.3.0"
const val citygml4j = "3.1.0"
const val citygml4j = "3.2.0"
}

object Dependencies {
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/src/main/kotlin/Plugins.kt
Expand Up @@ -20,9 +20,9 @@ object PluginVersions {
const val ktlint = "11.6.1"
const val xjc = "1.6"
const val versionChecker = "0.51.0"
const val dokka = "1.9.10"
const val serialization = "1.9.22"
const val ksp = "1.9.22-1.0.17"
const val dokka = "1.9.20"
const val serialization = "1.9.24"
const val ksp = "1.9.24-1.0.20"
}

object Plugins {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
20 changes: 10 additions & 10 deletions gradlew.bat
Expand Up @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down

0 comments on commit 40ed556

Please sign in to comment.