From 9ce05ba94b36391da2eeba918c3244fc623372dc Mon Sep 17 00:00:00 2001 From: Pawel Lipski Date: Sat, 14 Dec 2024 20:03:39 +0100 Subject: [PATCH] Fix qualDirs --- .../com/virtuslab/gitmachete/buildsrc/CheckerFramework.kt | 2 +- gradle.properties | 1 + gradle/libs.versions.toml | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/com/virtuslab/gitmachete/buildsrc/CheckerFramework.kt b/buildSrc/src/main/kotlin/com/virtuslab/gitmachete/buildsrc/CheckerFramework.kt index 7ce5f95f8..cbd814b9f 100644 --- a/buildSrc/src/main/kotlin/com/virtuslab/gitmachete/buildsrc/CheckerFramework.kt +++ b/buildSrc/src/main/kotlin/com/virtuslab/gitmachete/buildsrc/CheckerFramework.kt @@ -107,7 +107,7 @@ fun Project.applySubtypingChecker() { val mainSourceSet = javaPlugin.sourceSets["main"] val qualClassDir = mainSourceSet.output.classesDirs.asPath - extraJavacArgs.add("-ASubtypingChecker_qualDirs=$qualClassDir") + extraJavacArgs.add("-AqualDirs=$qualClassDir") } } } diff --git a/gradle.properties b/gradle.properties index 7377a0e5d..c77d44d0b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,7 @@ kotlin.stdlib.default.dependency=false org.gradle.caching=true org.gradle.configureOnDemand=true +org.gradle.daemon=false # More memory needed by daemon in UI tests; also, see https://github.com/gradle/gradle/issues/19750 for MaxMetaspaceSize org.gradle.jvmargs=-Xmx3g -XX:MaxMetaspaceSize=512m org.gradle.parallel=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e0d43fc51..c53af3bdc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -checker = "3.47.0" +checker = "3.48.3" junitJupiter = "5.10.3" [libraries] @@ -22,7 +22,7 @@ mockito = "org.mockito:mockito-junit-jupiter:5.14.2" slf4j-lambda = "kr.pe.kwonnam.slf4j-lambda:slf4j-lambda-core:0.1" slf4j-mock = "org.simplify4u:slf4j-mock:2.3.0" slf4j-simple = "org.slf4j:slf4j-simple:1.7.36" -vavr = "io.vavr:vavr:0.10.5" +vavr = "io.vavr:vavr:0.10.4" # Note that certain plugins are also pulled in via buildSrc, # where they aren't really `apply`-ed as plugins, but rather added to classpath as plugin packages;