Upgrade the world (#481)

2022-06-20 10:48:27 +01:00 · 2022-06-20 10:48:27 +01:00 · 2ff61c134d
commit 2ff61c134d
parent c51e6b1a47
11 changed files with 106 additions and 108 deletions
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@ -1,15 +1,9 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
-        "https://checkstyle.org/dtds/configuration_1_3.dtd">
-
-<!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!--
    Palantir Baseline Checkstyle configuration.
    Authors: Robert Fink, Brian Worth, Merrick Zoubeiri, and many other contributors. Based in part on http://checkstyle.sourceforge.net/google_style.html
    Please keep checks alphabetized with one exception: "relaxed" checks are grouped together at the bottom for easier disabling.
    Check-specific comments reference documents internal to Palantir and can be safely ignored or removed.
- -->
-
+ --><!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">
 <module name="Checker">
    <property name="charset" value="UTF-8"/>
    <property name="severity" value="error"/>
@ -18,15 +12,6 @@
    <module name="NewlineAtEndOfFile"> <!-- Java Style Guide: Line ending: LF -->
        <property name="lineSeparator" value="lf"/>
    </module>
-    <module name="RegexpHeader">
-        <property name="header" value="^/\*$\n^ \* \(c\) Copyright \d{4} Palantir Technologies Inc\. All rights reserved\.$"/>
-        <property name="fileExtensions" value=".java,.ts"/>
-    </module>
-    <module name="RegexpMultiline"> <!-- Development Practices: Writing good unit tests -->
-        <property name="fileExtensions" value="java"/>
-        <property name="format" value="@VisibleForTesting\s+(protected|public)"/>
-        <property name="message" value="@VisibleForTesting members should be package-private."/>
-    </module>
    <module name="RegexpSingleline"> <!-- No reference needed as this is evident. -->
        <property name="format" value="&lt;&lt;&lt;&lt;&lt;&lt;&lt;"/>
        <property name="message" value="Found (&lt;&lt;&lt;&lt;&lt;&lt;&lt;), so it looks like you had a merge conflict that compiles. Please fix it."/>
@ -56,6 +41,10 @@
    <module name="BeforeExecutionExclusionFileFilter">
        <property name="fileNamePattern" value="module\-info\.java$"/>
    </module>
+    <module name="LineLength"> <!-- Java Style Guide: No line-wrapping -->
+        <property name="max" value="120"/>
+        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+    </module>
    <module name="TreeWalker">
        <module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
        <module name="SuppressionCommentFilter">
@ -74,7 +63,9 @@
            <property name="tokens" value="VARIABLE_DEF"/>
            <property name="allowSamelineMultipleAnnotations" value="true"/>
        </module>
-        <module name="AnnotationUseStyle"/> <!-- Java Style Guide: Annotations -->
+        <module name="AnnotationUseStyle"> <!-- Java Style Guide: Annotations -->
+            <property name="trailingArrayComma" value="ignore"/>
+        </module>
        <module name="ArrayTypeStyle"/> <!-- Java Style Guide: No C-style array declarations -->
        <module name="AvoidEscapedUnicodeCharacters"> <!-- Java Style Guide: Non-ASCII characters -->
            <property name="allowEscapesForControlCharacters" value="true"/>
@ -86,14 +77,7 @@
        </module>
        <module name="AvoidStarImport"/> <!-- Java Style Guide: No wildcard imports -->
        <module name="AvoidStaticImport"> <!-- Java Style Guide: No static imports -->
-            <property name="excludes" value="
-                com.google.common.base.Preconditions.*,
-                com.palantir.logsafe.Preconditions.*,
-                java.util.Collections.*,
-                java.util.stream.Collectors.*,
-                org.apache.commons.lang3.Validate.*,
-                org.assertj.core.api.Assertions.*,
-                org.mockito.Mockito.*"/>
+            <property name="excludes" value="com.google.common.base.Preconditions.*, com.palantir.logsafe.Preconditions.*, java.util.Collections.*, java.util.stream.Collectors.*, org.apache.commons.lang3.Validate.*, org.assertj.core.api.Assertions.*, org.mockito.Mockito.*"/>
        </module>
        <module name="ClassTypeParameterName"> <!-- Java Style Guide: Type variable names -->
            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
@ -201,12 +185,9 @@
            <property name="separated" value="true"/>
            <property name="sortStaticImportsAlphabetically" value="true"/>
        </module>
+        
        <module name="InnerAssignment"/> <!-- Java Coding Guidelines: Inner assignments: Not used -->
-        <module name="LeftCurly"/> <!-- Java Style Guide: Nonempty blocks: K & R style -->
-        <module name="LineLength"> <!-- Java Style Guide: No line-wrapping -->
-            <property name="max" value="120"/>
-            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-        </module>
+         <!-- Java Style Guide: Nonempty blocks: K & R style -->
        <module name="MemberName"> <!-- Java Style Guide: Non-constant field names -->
            <property name="format" value="^[a-z][a-zA-Z0-9]+$"/>
            <message key="name.invalidPattern" value="Member name ''{0}'' must match pattern ''{1}''."/>
@ -247,7 +228,7 @@
            <message key="name.invalidPattern" value="Package name ''{0}'' must match pattern ''{1}''."/>
        </module>
        <module name="ParameterAssignment"/> <!-- Java Coding Guidelines: Final variables and parameters -->
-        <module name="ParenPad"/> <!-- Java Style Guide: Horizontal whitespace -->
+         <!-- Java Style Guide: Horizontal whitespace -->
        <module name="RedundantImport"/> <!-- Java Style Guide: No unused imports -->
        <module name="RedundantModifier"/> <!-- Java Coding Guidelines: Avoid redundant modifiers -->
        <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Use appropriate assertion methods -->
@ -363,7 +344,7 @@
        </module>
        <module name="RegexpSinglelineJava">
            <property name="format" value="\bCharset.defaultCharset\("/>
-            <property name="message" value="Use explicit charset (e.g. StandardCharsets.UTF-8) instead of default."/>
+            <property name="message" value="Use explicit charset (e.g. StandardCharsets.UTF_8) instead of default."/>
        </module>
        <module name="RegexpSinglelineJava">
            <property name="format" value="\bIOUtils\.toString\("/>
@ -372,6 +353,7 @@
        <module name="RegexpSinglelineJava">
            <property name="format" value="\/\/TODO|\/\/ TODO(?!\([^()\s]+\): )"/>
            <property name="message" value="TODO format: // TODO(#issue): explanation"/>
+            <property name="ignoreCase" value="true"/>
        </module>
        <module name="RegexpSinglelineJava">
            <property name="format" value="(void setUp\(\))|(void setup\(\))|(void setupStatic\(\))|(void setUpStatic\(\))|(void beforeTest\(\))|(void teardown\(\))|(void tearDown\(\))|(void beforeStatic\(\))|(void afterStatic\(\))"/>
@ -379,11 +361,11 @@
        </module>
        <module name="RightCurly"> <!-- Java Style Guide: Nonempty blocks: K & R style -->
            <property name="option" value="same"/>
-            <property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_DO"/>
+            <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_DO"/>
        </module>
        <module name="RightCurly"> <!-- Java Style Guide: Nonempty blocks: K & R style -->
            <property name="option" value="alone"/>
-            <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
+            <property name="tokens" value="LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
        </module>
        <module name="SeparatorWrap"> <!-- Java Style Guide: Where to break -->
            <property name="tokens" value="DOT"/>
@ -406,23 +388,13 @@
            <message key="name.invalidPattern" value="Type name ''{0}'' must match pattern ''{1}''."/>
        </module>
        <module name="TypecastParenPad"/> <!-- Java Style Guide: Horizontal whitespace -->
-        <module name="UnnecessaryParentheses"/>
        <module name="UnusedImports"> <!-- Java Style Guide: No unused imports -->
            <property name="processJavadoc" value="true"/>
        </module>
        <module name="UpperEll"/> <!-- Java Style Guide: Numeric Literals -->
        <module name="VisibilityModifier"/> <!-- Java Coding Guidelines: Minimize mutability -->
        <module name="WhitespaceAfter"/> <!-- Java Style Guide: Horizontal whitespace -->
-        <module name="WhitespaceAround"> <!-- Java Style Guide: Horizontal whitespace -->
-            <property name="allowEmptyConstructors" value="true"/>
-            <property name="allowEmptyMethods" value="true"/>
-            <property name="allowEmptyTypes" value="true"/>
-            <property name="allowEmptyLoops" value="true"/>
-            <property name="allowEmptyLambdas" value="true"/>
-            <property name="ignoreEnhancedForColon" value="false"/>
-            <message key="ws.notFollowed" value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
-            <message key="ws.notPreceded" value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
-        </module>
+        

        <!-- Stricter checks begin: delete some or all of the following for faster prototyping, but please restore before pushing to production. -->

@ -435,13 +407,10 @@
            <property name="ignoredAnnotations" value="ParameterizedTest, Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>
        </module>
        <module name="JavadocMethod"> <!-- Java Style Guide: Where Javadoc is used -->
-            <property name="scope" value="public"/>
+            <property name="accessModifiers" value="public"/>
            <property name="allowMissingParamTags" value="true"/>
-            <property name="allowMissingThrowsTags" value="true"/>
            <property name="allowMissingReturnTag" value="true"/>
-            <property name="minLineCount" value="99999999"/>
            <property name="allowedAnnotations" value="Override, Test"/>
-            <property name="allowThrowsTagsForSubclasses" value="true"/>
        </module>
        <module name="JavadocStyle"/> <!-- Java Style Guide: Javadoc -->
        <module name="JavadocTagContinuationIndentation"> <!-- Java Style Guide: At-clauses -->
--- a/.baseline/eclipse/static/dotfile.settings/org.eclipse.jdt.ui.prefs
+++ b/.baseline/eclipse/static/dotfile.settings/org.eclipse.jdt.ui.prefs
@ -8,9 +8,9 @@ org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=;
 org.eclipse.jdt.ui.javadoc=false
 org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.ondemandthreshold=999
 org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=999
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment"/><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*\n * (c) Copyright ${year} Palantir Technologies Inc. All rights reserved.\n */\n\n${package_declaration}\n\n/**\n * \n */\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">throw new RuntimeException(${exception_var});</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
--- a/.baseline/idea/intellij-java-palantir-style.xml
+++ b/.baseline/idea/intellij-java-palantir-style.xml
@ -16,7 +16,7 @@
        <option name="BINARY_OPERATION_WRAP" value="1" />
        <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
        <option name="CALL_PARAMETERS_WRAP" value="1" />
-        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
        <option name="DOWHILE_BRACE_FORCE" value="3" />
        <option name="EXTENDS_KEYWORD_WRAP" value="1" />
        <option name="EXTENDS_LIST_WRAP" value="1" />
@ -30,9 +30,10 @@
            <package name="" static="false" withSubpackages="true" />
          </value>
        </option>
+        <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
        <GroovyCodeStyleSettings>
-          <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-          <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+          <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+          <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
          <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
            <value />
          </option>
@ -43,6 +44,18 @@
              <package name="" withSubpackages="true" static="false" />
            </value>
          </option>
+          <DO_NOT_IMPORT_INNER>
+            <CLASS name="Builder" />
+            <CLASS name="Callback" />
+            <CLASS name="Class" />
+            <CLASS name="Entry" />
+            <CLASS name="Enum" />
+            <CLASS name="Factory" />
+            <CLASS name="Type" />
+            <CLASS name="Key" />
+            <CLASS name="Id" />
+            <CLASS name="Provider" />
+          </DO_NOT_IMPORT_INNER>
        </GroovyCodeStyleSettings>
        <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
        <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
@ -55,7 +68,7 @@
        <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
        <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
        <option name="METHOD_PARAMETERS_WRAP" value="1" />
-        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
        <option name="OPTIMIZE_IMPORTS_ON_THE_FLY" value="true" />
        <option name="OTHER_INDENT_OPTIONS">
          <value>
--- a/build.gradle
+++ b/build.gradle
@ -13,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+import net.ltgt.gradle.errorprone.CheckSeverity

 buildscript {
    repositories {
@ -21,45 +22,45 @@ buildscript {
    }

    dependencies {
-        classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.4.0'
-        classpath 'com.palantir.javaformat:gradle-palantir-java-format:1.0.1'
-        classpath 'com.gradle.publish:plugin-publish-plugin:0.16.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:2.49.2'
-        classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.1.0'
-        classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.3'
+        classpath 'com.gradle.publish:plugin-publish-plugin:0.21.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:4.145.0'
+        classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.11.0'
+        classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.11.0'
+        classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.15.0'
+        classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.24.0'
        classpath 'gradle.plugin.org.inferred:gradle-processors:3.6.0'
    }
 }

+apply plugin: 'java-gradle-plugin'
+apply plugin: 'groovy'
+apply plugin: 'idea'
+
+apply plugin: 'com.gradle.plugin-publish'
+apply plugin: 'com.palantir.baseline'
+apply plugin: 'com.palantir.baseline-java-versions'
+apply plugin: 'com.palantir.consistent-versions'
+apply plugin: 'com.palantir.external-publish'
+apply plugin: 'com.palantir.git-version'
+apply plugin: 'com.palantir.java-format'
+apply plugin: 'nebula.maven-publish'
+apply plugin: 'nebula.source-jar'
+apply plugin: 'org.inferred.processors'
+
+group 'com.palantir.graal'
+version gitVersion()

 repositories {
    mavenCentral() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
 }

-apply plugin: 'com.palantir.external-publish'
-apply plugin: 'com.gradle.plugin-publish'
-apply plugin: 'com.palantir.baseline'
-apply plugin: 'com.palantir.git-version'
-apply plugin: 'com.palantir.consistent-versions'
-apply plugin: 'nebula.maven-publish'
-apply plugin: 'nebula.source-jar'
-apply plugin: 'org.inferred.processors'
-apply plugin: 'java-gradle-plugin'
-apply plugin: 'groovy'
-apply plugin: 'eclipse'
-apply plugin: 'idea'
-apply plugin: 'com.palantir.java-format'
-
-group 'com.palantir.graal'
-version gitVersion()
-
 dependencies {
-    compile localGroovy()
-    compile gradleApi()
+    implementation localGroovy()
+    implementation gradleApi()

-    testCompile gradleTestKit()
-    testCompile 'com.netflix.nebula:nebula-test'
-    testCompile 'com.squareup.okhttp3:mockwebserver'
+    testImplementation gradleTestKit()
+    testImplementation 'com.netflix.nebula:nebula-test'
+    testImplementation 'com.squareup.okhttp3:mockwebserver'
 }

 gradlePlugin {
@ -92,9 +93,17 @@ publishPlugins.onlyIf {
    versionDetails().isCleanTag
 }

-tasks.withType(JavaCompile).configureEach {
-    options.errorprone.errorproneArgs += [
-            '-Xep:PreferSafeLoggableExceptions:OFF',
-            '-Xep:PreferSafeLoggingPreconditions:OFF',
-    ]
+tasks.withType(JavaCompile) {
+    options.compilerArgs += ['-Werror']
+    options.errorprone {
+        check("PreferSafeLogger", CheckSeverity.OFF)
+        check("PreferSafeLoggingPreconditions", CheckSeverity.OFF)
+        check("PreferSafeLoggableExceptions", CheckSeverity.OFF)
+        check("Slf4jLogsafeArgs", CheckSeverity.OFF)
+    }
+}
+
+javaVersions {
+    libraryTarget = 11
+    runtime = 17
 }
--- a/gradle.properties
+++ b/gradle.properties
@ -1,2 +1,8 @@
+org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+
+org.gradle.caching=true
 org.gradle.parallel=true
-com.palantir.baseline-versions.disable = true
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/src/main/java/com/palantir/gradle/graal/DownloadGraalTask.java
+++ b/src/main/java/com/palantir/gradle/graal/DownloadGraalTask.java
@ -50,7 +50,7 @@ public class DownloadGraalTask extends DefaultTask {
        setGroup(GradleGraalPlugin.TASK_GROUP);
        setDescription("Downloads and caches GraalVM binaries.");

-        onlyIf(task -> !getArchive().get().getAsFile().exists());
+        onlyIf(_task -> !getArchive().get().getAsFile().exists());
    }

    @TaskAction
--- a/src/main/java/com/palantir/gradle/graal/ExtractGraalTask.java
+++ b/src/main/java/com/palantir/gradle/graal/ExtractGraalTask.java
@ -56,8 +56,8 @@ public class ExtractGraalTask extends DefaultTask {
        setDescription("Extracts GraalVM tooling from downloaded archive using the system's tar command or Gradle's"
                + " copy method.");

-        onlyIf(task -> !getOutputDirectory().get().getAsFile().exists());
-        outputDirectory.set(cacheDir.map(cd -> getProject()
+        onlyIf(_task -> !getOutputDirectory().get().getAsFile().exists());
+        outputDirectory.set(cacheDir.map(_cd -> getProject()
                .getLayout()
                .getProjectDirectory()
                .dir(cacheDir.get().toFile().getAbsolutePath())
--- a/src/main/resources/META-INF/gradle-plugins/com.palantir.graal.properties
+++ b/src/main/resources/META-INF/gradle-plugins/com.palantir.graal.properties
@ -1 +0,0 @@
-implementation-class=com.palantir.gradle.graal.GradleGraalPlugin
--- a/versions.lock
+++ b/versions.lock
@ -2,11 +2,18 @@

 [Test dependencies]
 cglib:cglib-nodep:3.2.2 (1 constraints: 490ded24)
-com.netflix.nebula:nebula-test:9.0.0 (1 constraints: 0b051836)
+com.netflix.nebula:nebula-test:10.2.0 (1 constraints: 35052d3b)
 com.squareup.okhttp3:mockwebserver:3.14.1 (1 constraints: 3b05423b)
 com.squareup.okhttp3:okhttp:3.14.1 (1 constraints: 680fa37c)
 com.squareup.okio:okio:1.17.2 (1 constraints: 850cc309)
-junit:junit:4.12 (2 constraints: 0c1c0d9c)
+junit:junit:4.13.2 (2 constraints: 221d6f12)
+org.apiguardian:apiguardian-api:1.1.2 (2 constraints: 5523ed36)
+org.codehaus.groovy:groovy:3.0.9 (2 constraints: 241bc56d)
+org.hamcrest:hamcrest:2.2 (1 constraints: d20cdc04)
 org.hamcrest:hamcrest-core:1.3 (1 constraints: cc05fe3f)
+org.junit.platform:junit-platform-commons:1.8.1 (1 constraints: 6e119ed9)
+org.junit.platform:junit-platform-engine:1.8.1 (1 constraints: 360d1a1f)
 org.objenesis:objenesis:2.4 (1 constraints: ea0c8c0a)
-org.spockframework:spock-core:1.3-groovy-2.4 (1 constraints: 7c10f3af)
+org.opentest4j:opentest4j:1.2.0 (1 constraints: 67118bd9)
+org.spockframework:spock-core:2.1-M2-groovy-3.0 (2 constraints: e622905a)
+org.spockframework:spock-junit4:2.1-M2-groovy-3.0 (1 constraints: 241154df)
--- a/versions.props
+++ b/versions.props
@ -1,9 +1,4 @@
 com.fasterxml.jackson.core:jackson-databind = 2.13.2.1
 com.google.guava:guava = 31.1-jre
-com.netflix.nebula:nebula-test = 9.0.0
+com.netflix.nebula:nebula-test = 10.2.0
 com.squareup.okhttp3:* = 3.14.1
-
-# conflict resolution
-com.google.code.findbugs:jsr305 = 3.0.2
-com.google.errorprone:error_prone_annotations = 2.11.0
-org.checkerframework:checker-qual = 3.22.2
				`@ -1 +0,0 @@`
				`implementation-class=com.palantir.gradle.graal.GradleGraalPlugin`