diff --git a/build-logic/src/main/kotlin/local/base.gradle.kts b/build-logic/src/main/kotlin/local/base.gradle.kts index be3e304..526168c 100644 --- a/build-logic/src/main/kotlin/local/base.gradle.kts +++ b/build-logic/src/main/kotlin/local/base.gradle.kts @@ -6,6 +6,13 @@ plugins { spotless { kotlinGradle { - ktlint(project.the().named("libs").findVersion("ktlint").orElseThrow().requiredVersion) + ktlint( + project + .the() + .named("libs") + .findVersion("ktlint") + .orElseThrow() + .requiredVersion, + ) } } diff --git a/build-logic/src/main/kotlin/local/java-base.gradle.kts b/build-logic/src/main/kotlin/local/java-base.gradle.kts index d946052..81f11a7 100644 --- a/build-logic/src/main/kotlin/local/java-base.gradle.kts +++ b/build-logic/src/main/kotlin/local/java-base.gradle.kts @@ -8,7 +8,12 @@ plugins { spotless { java { googleJavaFormat( - project.the().named("libs").findVersion("googleJavaFormat").orElseThrow().requiredVersion, + project + .the() + .named("libs") + .findVersion("googleJavaFormat") + .orElseThrow() + .requiredVersion, ) licenseHeaderFile(rootProject.file("LICENSE.header")) } diff --git a/build-logic/src/main/kotlin/local/java-library.gradle.kts b/build-logic/src/main/kotlin/local/java-library.gradle.kts index 5fc25ce..ff820e5 100644 --- a/build-logic/src/main/kotlin/local/java-library.gradle.kts +++ b/build-logic/src/main/kotlin/local/java-library.gradle.kts @@ -20,7 +20,13 @@ project.findProperty("test.java-toolchain")?.also { testJavaToolchain -> } dependencies { - errorprone(project.the().named("libs").findBundle("errorprone").orElseThrow()) + errorprone( + project + .the() + .named("libs") + .findBundle("errorprone") + .orElseThrow(), + ) } tasks { diff --git a/build-logic/src/main/kotlin/local/kotlin-base.gradle.kts b/build-logic/src/main/kotlin/local/kotlin-base.gradle.kts index 9d37454..54a427e 100644 --- a/build-logic/src/main/kotlin/local/kotlin-base.gradle.kts +++ b/build-logic/src/main/kotlin/local/kotlin-base.gradle.kts @@ -6,7 +6,14 @@ plugins { spotless { kotlin { - ktlint(project.the().named("libs").findVersion("ktlint").orElseThrow().requiredVersion) + ktlint( + project + .the() + .named("libs") + .findVersion("ktlint") + .orElseThrow() + .requiredVersion, + ) licenseHeaderFile(rootProject.file("LICENSE.header")) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7e85091..0325b4b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,25 +3,25 @@ autoService = "1.1.1" # Versions used by build-logic -googleJavaFormat = "1.18.1" -ktlint = "1.0.0" +googleJavaFormat = "1.22.0" +ktlint = "1.3.1" [libraries] autoService = { module = "com.google.auto.service:auto-service", version.ref = "autoService" } autoService-annotations = { module = "com.google.auto.service:auto-service-annotations", version.ref = "autoService" } compileTesting = "com.google.testing.compile:compile-testing:0.21.0" junit = "junit:junit:4.13.2" -truth = "com.google.truth:truth:1.1.5" +truth = "com.google.truth:truth:1.4.3" # Used in below bundle -errorprone-core = "com.google.errorprone:error_prone_core:2.22.0" -nullaway = "com.uber.nullaway:nullaway:0.10.14" +errorprone-core = "com.google.errorprone:error_prone_core:2.28.0" +nullaway = "com.uber.nullaway:nullaway:0.11.0" [bundles] # Used by build-logic errorprone = [ "errorprone-core", "nullaway" ] [plugins] -errorprone = "net.ltgt.errorprone:3.1.0" -nullaway = "net.ltgt.nullaway:1.6.0" -spotless = "com.diffplug.spotless:6.22.0" +errorprone = "net.ltgt.errorprone:4.0.1" +nullaway = "net.ltgt.nullaway:2.0.0" +spotless = "com.diffplug.spotless:6.25.0" diff --git a/integTest/build.gradle.kts b/integTest/build.gradle.kts index 7c7a2a1..d866699 100644 --- a/integTest/build.gradle.kts +++ b/integTest/build.gradle.kts @@ -26,20 +26,22 @@ dependencies { tasks { test { - inputs.files( - localMavenRepositories.asFileTree.matching { - exclude("**/maven-metadata.*") - }, - ) - .withPropertyName("testRepositories") + inputs + .files( + localMavenRepositories.asFileTree.matching { + exclude("**/maven-metadata.*") + }, + ).withPropertyName("testRepositories") .withPathSensitivity(PathSensitivity.RELATIVE) val testJavaToolchain = project.findProperty("test.java-toolchain") testJavaToolchain?.also { val metadata = - project.javaToolchains.launcherFor { - languageVersion.set(JavaLanguageVersion.of(testJavaToolchain.toString())) - }.get().metadata + project.javaToolchains + .launcherFor { + languageVersion.set(JavaLanguageVersion.of(testJavaToolchain.toString())) + }.get() + .metadata systemProperty("test.java-home", metadata.installationPath.asFile.canonicalPath) } diff --git a/integTest/src/test/kotlin/net/ltgt/gradle/incap/integTest/DynamicIncrementalProcessorIntegrationTest.kt b/integTest/src/test/kotlin/net/ltgt/gradle/incap/integTest/DynamicIncrementalProcessorIntegrationTest.kt index 682d3fb..502312d 100644 --- a/integTest/src/test/kotlin/net/ltgt/gradle/incap/integTest/DynamicIncrementalProcessorIntegrationTest.kt +++ b/integTest/src/test/kotlin/net/ltgt/gradle/incap/integTest/DynamicIncrementalProcessorIntegrationTest.kt @@ -196,12 +196,14 @@ class DynamicIncrementalProcessorIntegrationTest { """.trimIndent(), ) testProjectDir.newFolder("processor", "src", "main", "resources", "META-INF", "services") - testProjectDir.newFile("processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor") + testProjectDir + .newFile("processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor") .writeText("test.processor.TestAnnotationProcessor") } private fun compileJava() = - GradleRunner.create() + GradleRunner + .create() .withProjectDir(testProjectDir.root) .withArguments("--info", "compileJava") .build() diff --git a/integTest/src/test/kotlin/net/ltgt/gradle/incap/integTest/IncrementalAnnotationProcessorProcessorIntegrationTest.kt b/integTest/src/test/kotlin/net/ltgt/gradle/incap/integTest/IncrementalAnnotationProcessorProcessorIntegrationTest.kt index 1bf29aa..8718d5a 100644 --- a/integTest/src/test/kotlin/net/ltgt/gradle/incap/integTest/IncrementalAnnotationProcessorProcessorIntegrationTest.kt +++ b/integTest/src/test/kotlin/net/ltgt/gradle/incap/integTest/IncrementalAnnotationProcessorProcessorIntegrationTest.kt @@ -140,7 +140,8 @@ class IncrementalAnnotationProcessorProcessorIntegrationTest { } private fun compileJava() = - GradleRunner.create() + GradleRunner + .create() .withProjectDir(testProjectDir.root) .withArguments("--info", "compileJava") .build()