diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 15c51776..e6aae0da 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ kotlin-inject = "0.8.1-SNAPSHOT" kotlin = "2.1.20" ksp = "2.1.20-2.0.0" kotlinpoet = "2.0.0" -junit5 = "5.9.3" +junit5 = "5.13.4" jvmTarget = "11" detekt = "1.23.6" [libraries] @@ -21,9 +21,11 @@ kotlinx-wasm-browser = "org.jetbrains.kotlinx:kotlinx-browser:0.3" jdk-compiler = { module = "io.earcam.wrapped:jdk.compiler", version = "1.8.132" } assertk = { module = "com.willowtreeapps.assertk:assertk", version = "0.28.0" } burst-junit4 = { module = "com.squareup.burst:burst-junit4", version = "1.2.0" } -junit5-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit5" } -junit5-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit5" } -junit5-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit5" } +junit5-api = { module = "org.junit.jupiter:junit-jupiter-api" } +junit5-bom = { module = "org.junit:junit-bom", version.ref = "junit5" } +junit5-engine = { module = "org.junit.jupiter:junit-jupiter-engine" } +junit5-launcher = { module = "org.junit.platform:junit-platform-launcher" } +junit5-params = { module = "org.junit.jupiter:junit-jupiter-params" } javax-inject = { module = "javax.inject:javax.inject", version = "1" } kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet" } kotlinpoet-ksp = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlinpoet" } @@ -37,5 +39,5 @@ kotlin-test-junit5 = ["junit5-api", "junit5-params", "kotlin-reflect"] [plugins] ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0" } -jmh = { id = "me.champeau.jmh", version = "0.6.6" } -changelog = { id = "org.jetbrains.changelog", version = "2.2.1" } \ No newline at end of file +jmh = { id = "me.champeau.jmh", version = "0.7.3" } +changelog = { id = "org.jetbrains.changelog", version = "2.4.0" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55b..8bdaf60c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ca025c83..2e111328 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 23d15a93..adff685a 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" diff --git a/gradlew.bat b/gradlew.bat index 5eed7ee8..e509b2dd 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/kotlin-inject-compiler/test/build.gradle.kts b/kotlin-inject-compiler/test/build.gradle.kts index baf9ed46..cbdf1ab0 100644 --- a/kotlin-inject-compiler/test/build.gradle.kts +++ b/kotlin-inject-compiler/test/build.gradle.kts @@ -9,8 +9,10 @@ dependencies { implementation(project(":kotlin-inject-compiler:kotlin-inject-compiler-ksp")) implementation(libs.bundles.kotlin.compile.testing) + testImplementation(platform(libs.junit5.bom)) testImplementation(libs.bundles.kotlin.test.junit5) testRuntimeOnly(libs.junit5.engine) + testRuntimeOnly(libs.junit5.launcher) testImplementation(libs.assertk) } @@ -18,4 +20,4 @@ tasks { test { useJUnitPlatform() } -} \ No newline at end of file +}