diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2a1bdf4..5d82727 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ version = "1.0" [versions] autoService = "1.1.1" -dagger = "2.52" +dagger = "2.54" errorprone = "2.28.0" junit = "5.10.2" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 2fb0485..9cb4d45 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -217,6 +217,14 @@ + + + + + + + + @@ -225,6 +233,14 @@ + + + + + + + + @@ -233,6 +249,14 @@ + + + + + + + + @@ -241,6 +265,14 @@ + + + + + + + + @@ -842,6 +874,14 @@ + + + + + + + + @@ -850,6 +890,14 @@ + + + + + + + + @@ -871,6 +919,19 @@ + + + + + + + + + + + + + @@ -900,6 +961,14 @@ + + + + + + + + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e644113..a4b76b9 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 df97d72..cea7a79 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.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf1..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30d..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 4c451df..2e1aded 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -16,7 +16,7 @@ requires static transitive com.google.auto.service; requires static transitive org.jetbrains.annotations; - requires com.palantir.javapoet; + requires transitive com.palantir.javapoet; provides javax.annotation.processing.Processor with org.spongepowered.eventimplgen.processor.EventImplGenProcessor; } \ No newline at end of file diff --git a/src/main/java/org/spongepowered/eventimplgen/factory/ClassGenerator.java b/src/main/java/org/spongepowered/eventimplgen/factory/ClassGenerator.java index 31c86fc..e4298dc 100644 --- a/src/main/java/org/spongepowered/eventimplgen/factory/ClassGenerator.java +++ b/src/main/java/org/spongepowered/eventimplgen/factory/ClassGenerator.java @@ -70,7 +70,6 @@ public class ClassGenerator { private final Elements elements; private final Messager messager; private final ClassContext.Factory classContextFactory; - private final SourceVersion targetVersion; private final ClassNameProvider classNameProvider; private NullPolicy nullPolicy = NullPolicy.DISABLE_PRECONDITIONS; @@ -81,15 +80,13 @@ public class ClassGenerator { final Types types, final Elements elements, final Messager messager, - final ClassContext.Factory classContextFactory, - final SourceVersion targetVersion + final ClassContext.Factory classContextFactory ) { this.classNameProvider = classNameProvider; this.types = types; this.elements = elements; this.messager = messager; this.classContextFactory = classContextFactory; - this.targetVersion = targetVersion; } static PropertySettings getPropertySettings(final Property property) { diff --git a/test-data/build.gradle b/test-data/build.gradle index e67e31a..b30ca79 100644 --- a/test-data/build.gradle +++ b/test-data/build.gradle @@ -19,7 +19,7 @@ tasks.named('compileJava').configure { aptOptions { processorArgs = [ 'eventGenFactory': 'test.event.TestEventFactory', - 'eventGenDebug': 'true' + 'eventGenDebug': 'false' ] } }