diff --git a/deps.edn b/deps.edn index 5753e1025..fb2ff8a20 100644 --- a/deps.edn +++ b/deps.edn @@ -11,7 +11,7 @@ {:extra-paths ["libtmux-clojure-core-async/src/main/clojure" "libtmux-clojure-core-async/src/test/clojure" "gradle/clojure-runner"] - :extra-deps {org.clojure/core.async {:mvn/version "1.8.741"}} + :extra-deps {org.clojure/core.async {:mvn/version "1.9.865"}} :main-opts ["-m" "libtmux.internal.test-runner" "test" "libtmux-clojure-core-async/src/test/clojure"]} :integration-test @@ -19,6 +19,6 @@ "libtmux-clojure-core-async/src/main/clojure" "gradle/clojure-runner"] :extra-deps {io.github.libtmux/libtmux-junit5 {:mvn/version "0.1.2-SNAPSHOT"} - org.clojure/core.async {:mvn/version "1.8.741"}} + org.clojure/core.async {:mvn/version "1.9.865"}} :main-opts ["-m" "libtmux.internal.test-runner" "test" "integration-tests/src/test/clojure"]}}} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6f0830133..6830db8c1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,38 +1,38 @@ [versions] jspecify = "1.0.1" -kotlin = "2.4.10" +kotlin = "2.4.21" coroutines = "1.11.0" -junit = "5.14.4" -jackson = "2.21.5" -mcp = "2.0.1" +junit = "6.1.3" +jackson = "2.22.4" +mcp = "2.1.0" re2j = "1.8" -slf4j = "2.0.17" +slf4j = "2.0.20" tomlj = "1.1.1" jsr305 = "3.0.2" -errorprone = "2.50.0" -nullaway = "0.13.8" -errorprone-plugin = "5.1.0" -spotless = "8.9.0" +errorprone = "2.51.0" +nullaway = "0.14.3" +errorprone-plugin = "5.2.0" +spotless = "8.10.4" maven-publish-plugin = "0.37.0" palantir-format = "2.97.0" -cyclonedx-plugin = "3.4.1" -japicmp = "0.23.1" +cyclonedx-plugin = "3.5.1" +japicmp = "0.26.5" clojure = "1.12.6" -core-async = "1.8.741" +core-async = "1.9.865" manifold = "0.5.0" picocli = "4.7.7" reactive-streams = "1.0.4" -snakeyaml = "2.5" +snakeyaml = "2.7" testng-engine = "1.1.0" -javapoet = "0.20.0" +javapoet = "0.22.0" kotlinpoet = "2.4.0" dokka = "2.2.0" -scala = "3.9.0" +scala = "3.10.0" scalafmt = "3.11.5" munit = "1.3.6" cats-effect = "3.7.1" fs2 = "3.14.0" -ox = "1.0.8" +ox = "1.1.0" [libraries] jspecify = { module = "org.jspecify:jspecify", version.ref = "jspecify" } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 0411d41e9..73dd07de3 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -69,11 +69,24 @@ + + + + + + + + + + + + + @@ -82,6 +95,14 @@ + + + + + + + + @@ -90,6 +111,14 @@ + + + + + + + + @@ -208,6 +237,16 @@ + + + + + + + + + + @@ -238,6 +277,16 @@ + + + + + + + + + + @@ -299,6 +348,9 @@ + + + @@ -340,6 +392,25 @@ + + + + + + + + + + + + + + + + + + + @@ -375,6 +446,25 @@ + + + + + + + + + + + + + + + + + + + @@ -391,6 +481,22 @@ + + + + + + + + + + + + + + + + @@ -415,6 +521,25 @@ + + + + + + + + + + + + + + + + + + + @@ -430,6 +555,16 @@ + + + + + + + + + + @@ -485,6 +620,14 @@ + + + + + + + + @@ -532,6 +675,14 @@ + + + + + + + + @@ -556,11 +707,24 @@ + + + + + + + + + + + + + @@ -579,6 +743,11 @@ + + + + + @@ -587,6 +756,22 @@ + + + + + + + + + + + + + + + + @@ -595,6 +780,11 @@ + + + + + @@ -616,11 +806,24 @@ + + + + + + + + + + + + + @@ -629,6 +832,14 @@ + + + + + + + + @@ -661,6 +872,14 @@ + + + + + + + + @@ -669,6 +888,14 @@ + + + + + + + + @@ -677,6 +904,14 @@ + + + + + + + + @@ -685,6 +920,14 @@ + + + + + + + + @@ -693,6 +936,14 @@ + + + + + + + + @@ -713,16 +964,31 @@ + + + + + + + + + + + + + + + @@ -739,6 +1005,22 @@ + + + + + + + + + + + + + + + + @@ -749,6 +1031,16 @@ + + + + + + + + + + @@ -797,6 +1089,14 @@ + + + + + + + + @@ -813,6 +1113,22 @@ + + + + + + + + + + + + + + + + @@ -838,6 +1154,11 @@ + + + + + @@ -848,6 +1169,16 @@ + + + + + + + + + + @@ -890,6 +1221,14 @@ + + + + + + + + @@ -903,6 +1242,11 @@ + + + + + @@ -911,11 +1255,24 @@ + + + + + + + + + + + + + @@ -1001,6 +1358,14 @@ + + + + + + + + @@ -1022,6 +1387,14 @@ + + + + + + + + @@ -1202,6 +1575,14 @@ + + + + + + + + @@ -1492,6 +1873,14 @@ + + + + + + + + @@ -1507,6 +1896,11 @@ + + + + + @@ -1547,6 +1941,14 @@ + + + + + + + + @@ -1555,6 +1957,14 @@ + + + + + + + + @@ -1632,16 +2042,34 @@ + + + + + + + + + + + + + + + + + + @@ -1650,6 +2078,14 @@ + + + + + + + + @@ -1694,6 +2130,11 @@ + + + + + @@ -1729,6 +2170,11 @@ + + + + + @@ -1786,6 +2232,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1812,11 +2289,24 @@ + + + + + + + + + + + + + @@ -1825,6 +2315,14 @@ + + + + + + + + @@ -1833,6 +2331,14 @@ + + + + + + + + @@ -1841,6 +2347,14 @@ + + + + + + + + @@ -1849,6 +2363,14 @@ + + + + + + + + @@ -1872,6 +2394,19 @@ + + + + + + + + + + + + + @@ -1880,6 +2415,14 @@ + + + + + + + + @@ -1888,6 +2431,14 @@ + + + + + + + + @@ -1896,6 +2447,14 @@ + + + + + + + + @@ -1904,6 +2463,14 @@ + + + + + + + + @@ -1917,6 +2484,11 @@ + + + + + @@ -1925,6 +2497,22 @@ + + + + + + + + + + + + + + + + @@ -1933,6 +2521,14 @@ + + + + + + + + @@ -1941,6 +2537,14 @@ + + + + + + + + @@ -1949,6 +2553,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1957,6 +2585,14 @@ + + + + + + + + @@ -1986,6 +2622,14 @@ + + + + + + + + @@ -2026,6 +2670,14 @@ + + + + + + + + @@ -2034,6 +2686,14 @@ + + + + + + + + @@ -2074,6 +2734,14 @@ + + + + + + + + @@ -2116,6 +2784,16 @@ + + + + + + + + + + @@ -2136,8 +2814,16 @@ - - + + + + + + + + + + @@ -2194,6 +2880,11 @@ + + + + + @@ -2215,6 +2906,14 @@ + + + + + + + + @@ -2236,6 +2935,14 @@ + + + + + + + + @@ -2252,6 +2959,14 @@ + + + + + + + + @@ -2268,6 +2983,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2276,6 +3033,14 @@ + + + + + + + + @@ -2284,6 +3049,14 @@ + + + + + + + + @@ -2294,6 +3067,11 @@ + + + + + @@ -2302,11 +3080,24 @@ + + + + + + + + + + + + + @@ -2315,6 +3106,14 @@ + + + + + + + + @@ -2323,6 +3122,14 @@ + + + + + + + + @@ -2331,11 +3138,24 @@ + + + + + + + + + + + + + @@ -2394,16 +3214,34 @@ + + + + + + + + + + + + + + + + + + @@ -2552,6 +3390,14 @@ + + + + + + + + @@ -2560,6 +3406,14 @@ + + + + + + + + @@ -2568,6 +3422,14 @@ + + + + + + + + @@ -2576,6 +3438,14 @@ + + + + + + + + @@ -2592,6 +3462,14 @@ + + + + + + + + @@ -2640,6 +3518,14 @@ + + + + + + + + @@ -2864,6 +3750,14 @@ + + + + + + + + @@ -2880,6 +3774,14 @@ + + + + + + + + @@ -2896,6 +3798,14 @@ + + + + + + + + @@ -2912,6 +3822,14 @@ + + + + + + + + @@ -2928,6 +3846,14 @@ + + + + + + + + @@ -2944,6 +3870,14 @@ + + + + + + + + @@ -2960,6 +3894,14 @@ + + + + + + + + @@ -2976,6 +3918,14 @@ + + + + + + + + @@ -2992,6 +3942,14 @@ + + + + + + + + @@ -3024,6 +3982,14 @@ + + + + + + + + @@ -3040,6 +4006,14 @@ + + + + + + + + @@ -3048,6 +4022,14 @@ + + + + + + + + @@ -3104,6 +4086,14 @@ + + + + + + + + @@ -3120,6 +4110,14 @@ + + + + + + + + @@ -3136,6 +4134,14 @@ + + + + + + + + @@ -3152,6 +4158,14 @@ + + + + + + + + @@ -3239,6 +4253,11 @@ + + + + + @@ -3383,6 +4402,14 @@ + + + + + + + + @@ -3399,6 +4426,14 @@ + + + + + + + + @@ -3415,11 +4450,24 @@ + + + + + + + + + + + + + @@ -3700,6 +4748,14 @@ + + + + + + + + @@ -3708,6 +4764,14 @@ + + + + + + + + @@ -3719,6 +4783,17 @@ + + + + + + + + + + + @@ -3727,6 +4802,14 @@ + + + + + + + + @@ -3735,6 +4818,14 @@ + + + + + + + + @@ -3746,6 +4837,17 @@ + + + + + + + + + + + @@ -3754,6 +4856,14 @@ + + + + + + + + @@ -3762,6 +4872,14 @@ + + + + + + + + @@ -3770,6 +4888,14 @@ + + + + + + + + @@ -3786,6 +4912,14 @@ + + + + + + + + @@ -3828,6 +4962,14 @@ + + + + + + + + @@ -3852,6 +4994,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3860,6 +5034,14 @@ + + + + + + + + @@ -3900,6 +5082,14 @@ + + + + + + + + @@ -3932,6 +5122,14 @@ + + + + + + + + @@ -3956,6 +5154,14 @@ + + + + + + + + @@ -3964,6 +5170,14 @@ + + + + + + + + @@ -3972,6 +5186,14 @@ + + + + + + + + @@ -3980,6 +5202,14 @@ + + + + + + + + @@ -3988,6 +5218,14 @@ + + + + + + + + @@ -3996,6 +5234,14 @@ + + + + + + + + @@ -4004,6 +5250,14 @@ + + + + + + + + @@ -4380,6 +5634,14 @@ + + + + + + + + @@ -4404,6 +5666,22 @@ + + + + + + + + + + + + + + + + @@ -4419,6 +5697,16 @@ + + + + + + + + + + @@ -4427,6 +5715,14 @@ + + + + + + + + @@ -4442,6 +5738,16 @@ + + + + + + + + + + @@ -4571,6 +5877,14 @@ + + + + + + + + @@ -4592,11 +5906,21 @@ + + + + + + + + + + @@ -4605,6 +5929,14 @@ + + + + + + + + @@ -4613,6 +5945,14 @@ + + + + + + + + @@ -4621,11 +5961,24 @@ + + + + + + + + + + + + + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index eddabd2ee..9fa7f2882 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 84c5a9c66..5907d39c3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=84fbba45c7f4c64abc77460e1c00f541e9f960e3c7ed2538f1ede19eacd873ae -distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip +distributionSha256Sum=21bd5da2de49b642904077f38c0efdc7778e92b3ed0889392dca61b97e389607 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.2-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/gradlew.bat b/gradlew.bat index a51ec4f58..3185a43f7 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,33 @@ @rem Set local scope for the variables, and ensure extensions are enabled setlocal EnableExtensions +@rem Catch executions from older scripts and ensure they exit cleanly. +@rem This can be removed once we can be reasonably confident that few people +@rem will be migrating directly to this new wrapper. +goto afterSafetyNet +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +goto exitWithErrorLevel +:afterSafetyNet + set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @rem This is normally unused @@ -45,13 +72,14 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -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 +1>&2 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. "%COMSPEC%" /c exit 1 +goto exitWithErrorLevel :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -59,13 +87,14 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -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 +1>&2 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. "%COMSPEC%" /c exit 1 +goto exitWithErrorLevel :execute @rem Setup the command line @@ -75,8 +104,9 @@ echo location of your Java installation. 1>&2 @rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command -endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel & goto exitWithErrorLevel +@rem This label must not be changed. We rely on old scripts being able to jump to this point. :exitWithErrorLevel @rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts "%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/libtmux-junit5/src/main/java/io/github/libtmux/junit5/TmuxExtension.java b/libtmux-junit5/src/main/java/io/github/libtmux/junit5/TmuxExtension.java index 08f3e6952..dedbddf22 100644 --- a/libtmux-junit5/src/main/java/io/github/libtmux/junit5/TmuxExtension.java +++ b/libtmux-junit5/src/main/java/io/github/libtmux/junit5/TmuxExtension.java @@ -303,7 +303,7 @@ public void afterEach(ExtensionContext context) { private static Fixture fixture(ExtensionContext context) { // The aggregate is stored while it still owns nothing, so a failure during startup is still // reachable by teardown. - Fixture fixture = context.getStore(NAMESPACE).getOrComputeIfAbsent(KEY, key -> new Fixture(), Fixture.class); + Fixture fixture = context.getStore(NAMESPACE).computeIfAbsent(KEY, key -> new Fixture(), Fixture.class); fixture.start(); return fixture; } diff --git a/libtmux-kotlin/build.gradle.kts b/libtmux-kotlin/build.gradle.kts index bf02bbaa4..dea103ed0 100644 --- a/libtmux-kotlin/build.gradle.kts +++ b/libtmux-kotlin/build.gradle.kts @@ -121,7 +121,7 @@ kotlin.sourceSets.named("main") { kotlin.srcDir(generateOperationWrappers.map { // publishes, so the claim is what a 2.1 project actually meets. val oldestKotlin = configurations.create("oldestKotlin") { isCanBeConsumed = false } -dependencies { oldestKotlin("org.jetbrains.kotlin:kotlin-compiler-embeddable:2.1.21") } +dependencies { oldestKotlin("org.jetbrains.kotlin:kotlin-compiler-embeddable:2.4.21") } val compileOldestConsumer = tasks.register("compileOldestConsumer") { diff --git a/module-tests/sbt/build.sbt b/module-tests/sbt/build.sbt index df1fb3be6..994d95b60 100644 --- a/module-tests/sbt/build.sbt +++ b/module-tests/sbt/build.sbt @@ -5,7 +5,7 @@ val libtmuxVersion = sys.props.getOrElse("libtmux.version", sys.error("pass -Dlibtmux.version=")) val staging = file(sys.props.getOrElse("libtmux.staging", "../../build/staging-repository")) -ThisBuild / scalaVersion := "3.9.0" +ThisBuild / scalaVersion := "3.10.0" ThisBuild / scalacOptions ++= Seq("-release:25", "-deprecation", "-feature", "-Werror") ThisBuild / resolvers += "libtmux staging" at staging.getAbsoluteFile.toURI.toString