Skip to content

Commit

Permalink
Dep bumps, gradle 8.4, java toolchains i gradle (#1728)
Browse files Browse the repository at this point in the history
  • Loading branch information
albrektsson authored Oct 29, 2023
1 parent 41fca56 commit 860941c
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 25 deletions.
31 changes: 14 additions & 17 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

val mainClass = "no.nav.k9.los.K9LosKt"
val hikariVersion = "5.0.1"
val flywayVersion = "9.22.1"
val flywayVersion = "9.22.3"
val vaultJdbcVersion = "1.3.10"
val koinVersion = "3.4.3"
val kotliqueryVersion = "1.9.0"
val k9SakVersion = "4.1.1"
val k9SakVersion = "4.1.2"
val k9KlageVersion = "0.4.0"
val fuelVersion = "2.3.1"
val jacksonVersion = "2.15.2"
val jacksonVersion = "2.15.3"

val dusseldorfKtorVersion = "4.0.10"
val dusseldorfKtorVersion = "4.1.0"
val ktorVersion = "2.3.5"
val kafkaVersion = "3.5.1"
val kafkaVersion = "3.6.0"

val navTilgangskontroll = "2.2023.01.09_08.56-ae38750bc0d9"

// Test Dependencies
val testContainers = "1.19.0"
val testContainers = "1.19.1"
val jsonassertVersion = "1.5.1"
val jupiterVersion = "5.10.0"
val assertkVersion = "0.26.1"
val mockkVersion = "1.13.8"

plugins {
id("org.jetbrains.kotlin.jvm") version "1.9.10"
Expand Down Expand Up @@ -87,10 +88,10 @@ dependencies {
// Test
testImplementation("org.junit.jupiter:junit-jupiter-api:$jupiterVersion")

testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.26.1")
testImplementation("com.willowtreeapps.assertk:assertk-jvm:$assertkVersion")

testImplementation("no.nav.helse:dusseldorf-test-support:$dusseldorfKtorVersion")
testImplementation("io.mockk:mockk:1.13.5")
testImplementation("io.mockk:mockk:$mockkVersion")
testImplementation("io.ktor:ktor-server-test-host-jvm:$ktorVersion") {
exclude(group = "org.eclipse.jetty")
}
Expand All @@ -116,13 +117,9 @@ repositories {


java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}


tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "17"
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
}
}

tasks.withType<ShadowJar> {
Expand All @@ -139,7 +136,7 @@ tasks.withType<ShadowJar> {
}

tasks.withType<Wrapper> {
gradleVersion = "8.3"
gradleVersion = "8.4"
}

tasks.withType<Test> {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
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
Expand Down
14 changes: 7 additions & 7 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -202,11 +202,11 @@ fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down

0 comments on commit 860941c

Please sign in to comment.