Skip to content

Commit

Permalink
build: update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
szysas committed Oct 21, 2024
1 parent d6bb47a commit 85e72b0
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 31 deletions.
7 changes: 4 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id("org.jetbrains.kotlin.jvm") version "2.0.0"
id("org.jetbrains.kotlin.jvm") version "2.0.21"
id("com.github.mfarsikov.kewt-versioning") version "1.0.0"
id("se.patrikerdes.use-latest-versions") version "0.2.18"
id("com.github.ben-manes.versions") version "0.51.0"
Expand All @@ -14,7 +14,7 @@ plugins {
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
id("org.jlleitschuh.gradle.ktlint") version "12.1.1"
id("com.adarshr.test-logger") version "4.0.0"
id("io.gitlab.arturbosch.detekt") version "1.23.6"
id("io.gitlab.arturbosch.detekt") version "1.23.7"
}

allprojects {
Expand Down Expand Up @@ -68,7 +68,8 @@ allprojects {
val isNonStable = !(stableKeyword || regex.matches(candidate.version))

// newer version of logback-classic is not java8 compatible
isNonStable || candidate.module == "logback-classic"
// newer version of kewt-versioning plugin requires java 21
isNonStable || listOf("logback-classic", "com.github.mfarsikov.kewt-versioning.gradle.plugin").contains(candidate.module)
}
}

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
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.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
20 changes: 10 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
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
8 changes: 4 additions & 4 deletions kotlin-mbedtls-metrics/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ dependencies {
api(platform("org.jetbrains.kotlin:kotlin-bom"))
api("org.jetbrains.kotlin:kotlin-stdlib-jdk8")

implementation("io.micrometer:micrometer-core:1.13.0")
implementation("io.micrometer:micrometer-core:1.13.6")

// TESTS
testImplementation(testFixtures(project(":kotlin-mbedtls")))
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
testImplementation("org.awaitility:awaitility-kotlin:4.2.1")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.2")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.2")
testImplementation("org.awaitility:awaitility-kotlin:4.2.2")
testImplementation("ch.qos.logback:logback-classic:1.3.14")
}

Expand Down
14 changes: 7 additions & 7 deletions kotlin-mbedtls-netty/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ dependencies {

api(platform("org.jetbrains.kotlin:kotlin-bom"))
api("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
api("io.netty:netty-handler:4.1.110.Final")
api("io.netty:netty-handler:4.1.114.Final")

// TESTS
testImplementation(testFixtures(project(":kotlin-mbedtls")))

testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.2")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.2")
testImplementation("ch.qos.logback:logback-classic:1.3.14")
testImplementation("org.awaitility:awaitility-kotlin:4.2.1")
testImplementation("io.netty:netty-all:4.1.110.Final")
testImplementation("io.mockk:mockk:1.13.11")
testImplementation("org.assertj:assertj-core:3.26.0")
testImplementation("org.awaitility:awaitility-kotlin:4.2.2")
testImplementation("io.netty:netty-all:4.1.114.Final")
testImplementation("io.mockk:mockk:1.13.13")
testImplementation("org.assertj:assertj-core:3.26.3")
}

tasks.test {
Expand Down
12 changes: 6 additions & 6 deletions kotlin-mbedtls/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ dependencies {
api(platform("org.jetbrains.kotlin:kotlin-bom"))
api("org.jetbrains.kotlin:kotlin-stdlib-jdk8")

api("org.slf4j:slf4j-api:2.0.13")
api("net.java.dev.jna:jna:5.14.0")
api("org.slf4j:slf4j-api:2.0.16")
api("net.java.dev.jna:jna:5.15.0")

// TESTS
testFixturesApi("org.bouncycastle:bcpkix-jdk15on:1.70")

testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
testImplementation("org.awaitility:awaitility-kotlin:4.2.1")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.2")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.2")
testImplementation("org.awaitility:awaitility-kotlin:4.2.2")
testImplementation("ch.qos.logback:logback-classic:1.3.14")
testImplementation("org.bouncycastle:bcpkix-jdk15on:1.70")
testImplementation("io.mockk:mockk:1.13.11")
testImplementation("io.mockk:mockk:1.13.13")
}

tasks.test {
Expand Down

0 comments on commit 85e72b0

Please sign in to comment.