Skip to content

Commit

Permalink
updated to kotlin 1.9.20
Browse files Browse the repository at this point in the history
  • Loading branch information
benediktschwab committed Nov 24, 2023
1 parent ce71430 commit 603cbd9
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 19 deletions.
22 changes: 11 additions & 11 deletions buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@

object DependencyVersions {
// standard libraries
const val kotlin = "1.9.10"
const val kotlin = "1.9.20"
const val coroutines = "1.7.3"
const val arrow = "1.2.1"

// testing libraries
const val kotest = "5.7.2"
const val kotest = "5.8.0"
const val kotestExtensionArrow = "1.4.0"
const val mockk = "1.13.8"

Expand All @@ -31,34 +31,34 @@ object DependencyVersions {
const val slf4jSimple = "2.0.9"

// object creation libraries
const val kotlinxSerializationJson = "1.6.0"
const val kotlinxSerializationJson = "1.6.1"
const val kaml = "0.55.0"
const val jakartaActivationApi = "2.1.2"
const val jakartaXmlBindApi = "4.0.1"
const val jaxb = "4.0.3"
const val jaxb = "4.0.4"

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

// io libraries
const val clikt = "4.2.0"
const val clikt = "4.2.1"
const val mordant = "1.2.1"
const val commonsIO = "2.14.0"
const val commonsIO = "2.15.0"
const val commonsCSV = "1.10.0"
const val commonsLang = "3.13.0"
const val commonsCompress = "1.24.0"
const val zstdJni = "1.5.5-6"
const val commonsLang = "3.14.0"
const val commonsCompress = "1.25.0"
const val zstdJni = "1.5.5-10"
const val emojiJava = "5.1.1"

// math libraries
const val guava = "32.1.2-jre"
const val guava = "32.1.3-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.0.0"
const val citygml4j = "3.1.0"
}

object Dependencies {
Expand Down
10 changes: 5 additions & 5 deletions buildSrc/src/main/kotlin/Plugins.kt
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@

object PluginVersions {
const val shadowjar = "8.1.1"
const val ktlint = "11.6.0"
const val ktlint = "11.6.1"
const val xjc = "1.6"
const val versionChecker = "0.48.0"
const val dokka = "1.9.0"
const val serialization = "1.9.10"
const val ksp = "1.9.10-1.0.13"
const val versionChecker = "0.50.0"
const val dokka = "1.9.10"
const val serialization = "1.9.21"
const val ksp = "1.9.20-1.0.14"
}

object Plugins {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
8 changes: 6 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -130,10 +131,13 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
Expand Down

0 comments on commit 603cbd9

Please sign in to comment.