From 30448fe340b6b6588a6b41fa71d49254452e1771 Mon Sep 17 00:00:00 2001 From: Cause Chung Date: Fri, 11 Jul 2025 10:06:49 -0400 Subject: [PATCH 01/21] Add gradle plugin project --- gradle-plugin/.gitattributes | 12 + gradle-plugin/.gitignore | 5 + gradle-plugin/build.gradle.kts | 43 +++ gradle-plugin/gradle.properties | 5 + gradle-plugin/gradle/libs.versions.toml | 8 + .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43764 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + gradle-plugin/gradlew | 251 ++++++++++++++++++ gradle-plugin/settings.gradle.kts | 8 + .../SharedtypeGradlePluginFunctionalTest.java | 56 ++++ .../sharedtype/SharedtypeGradlePlugin.java | 19 ++ .../SharedtypeGradlePluginTest.java | 23 ++ mount-tmpfs.sh | 2 + setenv | 2 +- 14 files changed, 440 insertions(+), 1 deletion(-) create mode 100644 gradle-plugin/.gitattributes create mode 100644 gradle-plugin/.gitignore create mode 100644 gradle-plugin/build.gradle.kts create mode 100644 gradle-plugin/gradle.properties create mode 100644 gradle-plugin/gradle/libs.versions.toml create mode 100644 gradle-plugin/gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle-plugin/gradle/wrapper/gradle-wrapper.properties create mode 100755 gradle-plugin/gradlew create mode 100644 gradle-plugin/settings.gradle.kts create mode 100644 gradle-plugin/src/functionalTest/java/online/sharedtype/SharedtypeGradlePluginFunctionalTest.java create mode 100644 gradle-plugin/src/main/java/online/sharedtype/SharedtypeGradlePlugin.java create mode 100644 gradle-plugin/src/test/java/online/sharedtype/SharedtypeGradlePluginTest.java diff --git a/gradle-plugin/.gitattributes b/gradle-plugin/.gitattributes new file mode 100644 index 00000000..f91f6460 --- /dev/null +++ b/gradle-plugin/.gitattributes @@ -0,0 +1,12 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + +# Binary files should be left untouched +*.jar binary + diff --git a/gradle-plugin/.gitignore b/gradle-plugin/.gitignore new file mode 100644 index 00000000..1b6985c0 --- /dev/null +++ b/gradle-plugin/.gitignore @@ -0,0 +1,5 @@ +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build diff --git a/gradle-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts new file mode 100644 index 00000000..9bb2db2d --- /dev/null +++ b/gradle-plugin/build.gradle.kts @@ -0,0 +1,43 @@ +plugins { + `java-gradle-plugin` +} + +repositories { + mavenCentral() +} + +dependencies { + testImplementation(libs.junit.jupiter) + testRuntimeOnly("org.junit.platform:junit-platform-launcher") +} + +gradlePlugin { + val greeting by plugins.creating { + id = "online.sharedtype.sharedtype-gradle-plugin" + implementationClass = "online.sharedtype.SharedtypeGradlePlugin" + } +} + +// Add a source set for the functional test suite +val functionalTestSourceSet = sourceSets.create("functionalTest") { +} + +configurations["functionalTestImplementation"].extendsFrom(configurations["testImplementation"]) +configurations["functionalTestRuntimeOnly"].extendsFrom(configurations["testRuntimeOnly"]) + +// Add a task to run the functional tests +val functionalTest by tasks.registering(Test::class) { + testClassesDirs = functionalTestSourceSet.output.classesDirs + classpath = functionalTestSourceSet.runtimeClasspath + useJUnitPlatform() +} + +gradlePlugin.testSourceSets.add(functionalTestSourceSet) + +tasks.named("check") { + dependsOn(functionalTest) +} + +tasks.named("test") { + useJUnitPlatform() +} diff --git a/gradle-plugin/gradle.properties b/gradle-plugin/gradle.properties new file mode 100644 index 00000000..377538c9 --- /dev/null +++ b/gradle-plugin/gradle.properties @@ -0,0 +1,5 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties + +org.gradle.configuration-cache=true + diff --git a/gradle-plugin/gradle/libs.versions.toml b/gradle-plugin/gradle/libs.versions.toml new file mode 100644 index 00000000..c88d35d6 --- /dev/null +++ b/gradle-plugin/gradle/libs.versions.toml @@ -0,0 +1,8 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format + +[versions] +junit-jupiter = "5.12.1" + +[libraries] +junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" } diff --git a/gradle-plugin/gradle/wrapper/gradle-wrapper.jar b/gradle-plugin/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..1b33c55baabb587c669f562ae36f953de2481846 GIT binary patch literal 43764 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradle-plugin/settings.gradle.kts b/gradle-plugin/settings.gradle.kts new file mode 100644 index 00000000..e2da201c --- /dev/null +++ b/gradle-plugin/settings.gradle.kts @@ -0,0 +1,8 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/8.14.3/userguide/multi_project_builds.html in the Gradle documentation. + */ + +rootProject.name = "sharedtype-gradle-plugin" diff --git a/gradle-plugin/src/functionalTest/java/online/sharedtype/SharedtypeGradlePluginFunctionalTest.java b/gradle-plugin/src/functionalTest/java/online/sharedtype/SharedtypeGradlePluginFunctionalTest.java new file mode 100644 index 00000000..7b20ae52 --- /dev/null +++ b/gradle-plugin/src/functionalTest/java/online/sharedtype/SharedtypeGradlePluginFunctionalTest.java @@ -0,0 +1,56 @@ +/* + * This source file was generated by the Gradle 'init' task + */ +package online.sharedtype; + +import java.io.File; +import java.io.IOException; +import java.io.Writer; +import java.io.FileWriter; + +import org.gradle.testkit.runner.GradleRunner; +import org.gradle.testkit.runner.BuildResult; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import static org.junit.jupiter.api.Assertions.*; + +/** + * A simple functional test for the 'org.example.greeting' plugin. + */ +class SharedtypeGradlePluginFunctionalTest { + @TempDir + File projectDir; + + private File getBuildFile() { + return new File(projectDir, "build.gradle"); + } + + private File getSettingsFile() { + return new File(projectDir, "settings.gradle"); + } + + @Test void canRunTask() throws IOException { + writeString(getSettingsFile(), ""); + writeString(getBuildFile(), + "plugins {" + + " id('org.example.greeting')" + + "}"); + + // Run the build + GradleRunner runner = GradleRunner.create(); + runner.forwardOutput(); + runner.withPluginClasspath(); + runner.withArguments("greeting"); + runner.withProjectDir(projectDir); + BuildResult result = runner.build(); + + // Verify the result + assertTrue(result.getOutput().contains("Hello from plugin 'org.example.greeting'")); + } + + private void writeString(File file, String string) throws IOException { + try (Writer writer = new FileWriter(file)) { + writer.write(string); + } + } +} diff --git a/gradle-plugin/src/main/java/online/sharedtype/SharedtypeGradlePlugin.java b/gradle-plugin/src/main/java/online/sharedtype/SharedtypeGradlePlugin.java new file mode 100644 index 00000000..c4f13411 --- /dev/null +++ b/gradle-plugin/src/main/java/online/sharedtype/SharedtypeGradlePlugin.java @@ -0,0 +1,19 @@ +/* + * This source file was generated by the Gradle 'init' task + */ +package online.sharedtype; + +import org.gradle.api.Project; +import org.gradle.api.Plugin; + +/** + * A simple 'hello world' plugin. + */ +public class SharedtypeGradlePlugin implements Plugin { + public void apply(Project project) { + // Register a task + project.getTasks().register("greeting", task -> { + task.doLast(s -> System.out.println("Hello from plugin 'org.example.greeting'")); + }); + } +} diff --git a/gradle-plugin/src/test/java/online/sharedtype/SharedtypeGradlePluginTest.java b/gradle-plugin/src/test/java/online/sharedtype/SharedtypeGradlePluginTest.java new file mode 100644 index 00000000..852a50fb --- /dev/null +++ b/gradle-plugin/src/test/java/online/sharedtype/SharedtypeGradlePluginTest.java @@ -0,0 +1,23 @@ +/* + * This source file was generated by the Gradle 'init' task + */ +package online.sharedtype; + +import org.gradle.testfixtures.ProjectBuilder; +import org.gradle.api.Project; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; + +/** + * A simple unit test for the 'org.example.greeting' plugin. + */ +class SharedtypeGradlePluginTest { + @Test void pluginRegistersATask() { + // Create a test project and apply the plugin + Project project = ProjectBuilder.builder().build(); + project.getPlugins().apply("org.example.greeting"); + + // Verify the result + assertNotNull(project.getTasks().findByName("greeting")); + } +} diff --git a/mount-tmpfs.sh b/mount-tmpfs.sh index b10e5bf8..471ea16e 100755 --- a/mount-tmpfs.sh +++ b/mount-tmpfs.sh @@ -24,6 +24,8 @@ mountTmpfs "$DIR/it/java8/target" 64M mountTmpfs "$DIR/e2e/target" 64M mountTmpfs "$DIR/maven-plugin/target" 32M mountTmpfs "$DIR/maven-plugin/it/target" 16M +mountTmpfs "$DIR/gradle-plugin/.gradle" 16M +mountTmpfs "$DIR/gradle-plugin/build" 32M mountTmpfs "$MAVEN_REPO_DIR" 64M mountTmpfs "$DIR/client-test/rust/target" 512M mountTmpfs "$DIR/client-test/typescript/dist" 32M diff --git a/setenv b/setenv index de1330f5..11636172 100755 --- a/setenv +++ b/setenv @@ -19,7 +19,7 @@ else return fi -export MAVEN_OPTS="-Xmx512m -Xms512m" +export MAVEN_OPTS="-Xmx512m -Xms128m" export PATH=$JAVA_HOME/bin:$MVND_HOME/bin:$PATH if [ -z "$MVND_HOME" ];then From 43d5d643a9e79f039c3af4a2985d897f8d90654a Mon Sep 17 00:00:00 2001 From: Cause Chung Date: Fri, 11 Jul 2025 11:48:12 -0400 Subject: [PATCH 02/21] Arrange plugin module dirs --- build-tool-plugins/core/pom.xml | 49 +++++++++++ .../maven/common/SharedTypeApExecutor.java | 76 ++++++++++++++++++ .../maven/common/SourceFileVisitor.java | 29 +++++++ ...code_shared_among_maven_and_gradle_plugins | 0 .../gradle-plugin}/.gitattributes | 0 .../gradle-plugin}/.gitignore | 0 .../gradle-plugin}/build.gradle.kts | 3 + .../gradle-plugin}/gradle.properties | 0 .../gradle-plugin}/gradle/libs.versions.toml | 6 +- .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../gradle-plugin}/gradlew | 0 .../gradle-plugin}/settings.gradle.kts | 0 .../SharedtypeGradlePluginFunctionalTest.java | 10 +-- .../gradle}/SharedtypeGradlePlugin.java | 8 +- .../gradle}/SharedtypeGradlePluginTest.java | 14 +--- .../it/.mvn/wrapper/maven-wrapper.properties | 0 .../maven-plugin}/it/mvne | 0 .../maven-plugin}/it/mvnw | 0 .../maven-plugin}/it/pom.xml | 2 +- .../maven-plugin}/it/sharedtype.properties | 0 .../online/sharedtype/maven/it/MyClass.java | 0 .../maven/it/MavenPluginIntegrationTest.java | 0 .../it/src/test/resources/expected-types.ts | 0 .../maven-plugin}/pom.xml | 20 ++++- .../sharedtype/maven/DependencyResolver.java | 0 .../maven/SharedTypeDiagnosticListener.java | 0 .../sharedtype/maven/SharedTypeGenMojo.java | 0 .../sharedtype/maven/SharedTypeLogger.java | 0 .../sharedtype/maven/SourceFileVisitor.java | 0 .../SharedTypeDiagnosticListenerTest.java | 0 .../maven/SharedTypeLoggerTest.java | 0 mount-tmpfs.sh | 9 ++- pom.xml | 15 +++- 34 files changed, 206 insertions(+), 35 deletions(-) create mode 100644 build-tool-plugins/core/pom.xml create mode 100644 build-tool-plugins/core/src/main/java/online/sharedtype/maven/common/SharedTypeApExecutor.java create mode 100644 build-tool-plugins/core/src/main/java/online/sharedtype/maven/common/SourceFileVisitor.java create mode 100644 build-tool-plugins/core/src/main/java/online/sharedtype/maven/common/code_shared_among_maven_and_gradle_plugins rename {gradle-plugin => build-tool-plugins/gradle-plugin}/.gitattributes (100%) rename {gradle-plugin => build-tool-plugins/gradle-plugin}/.gitignore (100%) rename {gradle-plugin => build-tool-plugins/gradle-plugin}/build.gradle.kts (92%) rename {gradle-plugin => build-tool-plugins/gradle-plugin}/gradle.properties (100%) rename {gradle-plugin => build-tool-plugins/gradle-plugin}/gradle/libs.versions.toml (51%) rename {gradle-plugin => build-tool-plugins/gradle-plugin}/gradle/wrapper/gradle-wrapper.jar (100%) rename {gradle-plugin => build-tool-plugins/gradle-plugin}/gradle/wrapper/gradle-wrapper.properties (100%) rename {gradle-plugin => build-tool-plugins/gradle-plugin}/gradlew (100%) rename {gradle-plugin => build-tool-plugins/gradle-plugin}/settings.gradle.kts (100%) rename {gradle-plugin/src/functionalTest/java/online/sharedtype => build-tool-plugins/gradle-plugin/src/functionalTest/java/online/sharedtype/gradle}/SharedtypeGradlePluginFunctionalTest.java (86%) rename {gradle-plugin/src/main/java/online/sharedtype => build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle}/SharedtypeGradlePlugin.java (73%) rename {gradle-plugin/src/test/java/online/sharedtype => build-tool-plugins/gradle-plugin/src/test/java/online/sharedtype/gradle}/SharedtypeGradlePluginTest.java (57%) rename {maven-plugin => build-tool-plugins/maven-plugin}/it/.mvn/wrapper/maven-wrapper.properties (100%) rename {maven-plugin => build-tool-plugins/maven-plugin}/it/mvne (100%) rename {maven-plugin => build-tool-plugins/maven-plugin}/it/mvnw (100%) rename {maven-plugin => build-tool-plugins/maven-plugin}/it/pom.xml (98%) rename {maven-plugin => build-tool-plugins/maven-plugin}/it/sharedtype.properties (100%) rename {maven-plugin => build-tool-plugins/maven-plugin}/it/src/main/java/online/sharedtype/maven/it/MyClass.java (100%) rename {maven-plugin => build-tool-plugins/maven-plugin}/it/src/test/java/online/sharedtype/maven/it/MavenPluginIntegrationTest.java (100%) rename {maven-plugin => build-tool-plugins/maven-plugin}/it/src/test/resources/expected-types.ts (100%) rename {maven-plugin => build-tool-plugins/maven-plugin}/pom.xml (87%) rename {maven-plugin => build-tool-plugins/maven-plugin}/src/main/java/online/sharedtype/maven/DependencyResolver.java (100%) rename {maven-plugin => build-tool-plugins/maven-plugin}/src/main/java/online/sharedtype/maven/SharedTypeDiagnosticListener.java (100%) rename {maven-plugin => build-tool-plugins/maven-plugin}/src/main/java/online/sharedtype/maven/SharedTypeGenMojo.java (100%) rename {maven-plugin => build-tool-plugins/maven-plugin}/src/main/java/online/sharedtype/maven/SharedTypeLogger.java (100%) rename {maven-plugin => build-tool-plugins/maven-plugin}/src/main/java/online/sharedtype/maven/SourceFileVisitor.java (100%) rename {maven-plugin => build-tool-plugins/maven-plugin}/src/test/java/online/sharedtype/maven/SharedTypeDiagnosticListenerTest.java (100%) rename {maven-plugin => build-tool-plugins/maven-plugin}/src/test/java/online/sharedtype/maven/SharedTypeLoggerTest.java (100%) diff --git a/build-tool-plugins/core/pom.xml b/build-tool-plugins/core/pom.xml new file mode 100644 index 00000000..9c4dc206 --- /dev/null +++ b/build-tool-plugins/core/pom.xml @@ -0,0 +1,49 @@ + + + 4.0.0 + + online.sharedtype + sharedtype-parent + 0.14.0-SNAPSHOT + ../../pom.xml + + + sharedtype-maven-plugin-core + 0.14.0-SNAPSHOT + SharedType Maven Plugin Core + + + + ${project.groupId} + sharedtype-ap + ${project.version} + + + + org.junit.jupiter + junit-jupiter + test + + + org.junit-pioneer + junit-pioneer + test + + + org.assertj + assertj-core + test + + + org.mockito + mockito-core + test + + + org.mockito + mockito-junit-jupiter + test + + + diff --git a/build-tool-plugins/core/src/main/java/online/sharedtype/maven/common/SharedTypeApExecutor.java b/build-tool-plugins/core/src/main/java/online/sharedtype/maven/common/SharedTypeApExecutor.java new file mode 100644 index 00000000..da5111f4 --- /dev/null +++ b/build-tool-plugins/core/src/main/java/online/sharedtype/maven/common/SharedTypeApExecutor.java @@ -0,0 +1,76 @@ +package online.sharedtype.maven.common; + +import online.sharedtype.processor.SharedTypeAnnotationProcessor; +import online.sharedtype.processor.support.annotation.Nullable; +import online.sharedtype.processor.support.exception.SharedTypeException; + +import javax.tools.JavaCompiler; +import javax.tools.ToolProvider; +import java.io.File; +import java.io.IOException; +import java.nio.charset.Charset; +import java.nio.charset.UnsupportedCharsetException; +import java.nio.file.FileVisitOption; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.EnumSet; +import java.util.List; + +public final class SharedTypeApExecutor { + private static final String JAVA8_VERSION = "1.8"; + private static final List DEFAULT_COMPILER_OPTIONS = Arrays.asList("-proc:only", "-Asharedtype.enabled=true"); + + + + private static List walkAllSourceFiles(Iterable compileSourceRoots) throws IOException { + SourceFileVisitor visitor = new SourceFileVisitor(); + for (String compileSourceRoot : compileSourceRoots) { + Files.walkFileTree(Paths.get(compileSourceRoot), EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, visitor); + } + return visitor.getFiles(); + } + + private static List getCompilerOptions(@Nullable String propertyFile) { + List options = new ArrayList<>(DEFAULT_COMPILER_OPTIONS.size() + 1); + options.addAll(DEFAULT_COMPILER_OPTIONS); + if (propertyFile != null) { + if (Files.notExists(Paths.get(propertyFile))) { + throw new SharedTypeException("Property file not found: " + propertyFile); + } + options.add("-Asharedtype.propsFile=" + propertyFile); + } + return options; + } + + private static JavaCompiler getJavaCompiler() throws SharedTypeException { + String javaVersion = System.getProperty("java.specification.version"); + JavaCompiler compiler; + if (JAVA8_VERSION.equals(javaVersion)) { + try { + Class javacToolClass = SharedTypeAnnotationProcessor.class.getClassLoader().loadClass("com.sun.tools.javac.api.JavacTool"); + compiler = (JavaCompiler) javacToolClass.getConstructor().newInstance(); + } catch (Exception e) { + throw new SharedTypeException("Failed to load JavaCompiler.", e); + } + } else { + compiler = ToolProvider.getSystemJavaCompiler(); + } + if (compiler != null) { + return compiler; + } + throw new SharedTypeException("Java compiler not found, currently only compiler from jdk.compiler module is supported."); + } + + private static Charset getCharset(@Nullable String encoding) { + if (encoding != null) { + try { + return Charset.forName(encoding); + } catch (UnsupportedCharsetException e) { + throw new SharedTypeException("Invalid 'encoding' option: " + encoding, e); + } + } + return null; + } +} diff --git a/build-tool-plugins/core/src/main/java/online/sharedtype/maven/common/SourceFileVisitor.java b/build-tool-plugins/core/src/main/java/online/sharedtype/maven/common/SourceFileVisitor.java new file mode 100644 index 00000000..5a1aa1b0 --- /dev/null +++ b/build-tool-plugins/core/src/main/java/online/sharedtype/maven/common/SourceFileVisitor.java @@ -0,0 +1,29 @@ +package online.sharedtype.maven.common; + +import java.io.File; +import java.nio.file.FileVisitResult; +import java.nio.file.Path; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.attribute.BasicFileAttributes; +import java.util.ArrayList; +import java.util.List; + +/** + * @author Cause Chung + */ +final class SourceFileVisitor extends SimpleFileVisitor { + private static final String FILE_EXTENSION = ".java"; + private final List files = new ArrayList<>(); + + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { + if (file.toString().endsWith(FILE_EXTENSION)) { + files.add(file.toFile()); + } + return FileVisitResult.CONTINUE; + } + + List getFiles() { + return files; + } +} diff --git a/build-tool-plugins/core/src/main/java/online/sharedtype/maven/common/code_shared_among_maven_and_gradle_plugins b/build-tool-plugins/core/src/main/java/online/sharedtype/maven/common/code_shared_among_maven_and_gradle_plugins new file mode 100644 index 00000000..e69de29b diff --git a/gradle-plugin/.gitattributes b/build-tool-plugins/gradle-plugin/.gitattributes similarity index 100% rename from gradle-plugin/.gitattributes rename to build-tool-plugins/gradle-plugin/.gitattributes diff --git a/gradle-plugin/.gitignore b/build-tool-plugins/gradle-plugin/.gitignore similarity index 100% rename from gradle-plugin/.gitignore rename to build-tool-plugins/gradle-plugin/.gitignore diff --git a/gradle-plugin/build.gradle.kts b/build-tool-plugins/gradle-plugin/build.gradle.kts similarity index 92% rename from gradle-plugin/build.gradle.kts rename to build-tool-plugins/gradle-plugin/build.gradle.kts index 9bb2db2d..22ea8042 100644 --- a/gradle-plugin/build.gradle.kts +++ b/build-tool-plugins/gradle-plugin/build.gradle.kts @@ -4,10 +4,13 @@ plugins { repositories { mavenCentral() + mavenLocal() } dependencies { + implementation(libs.sharedtype.ap) testImplementation(libs.junit.jupiter) + testImplementation(libs.assertj) testRuntimeOnly("org.junit.platform:junit-platform-launcher") } diff --git a/gradle-plugin/gradle.properties b/build-tool-plugins/gradle-plugin/gradle.properties similarity index 100% rename from gradle-plugin/gradle.properties rename to build-tool-plugins/gradle-plugin/gradle.properties diff --git a/gradle-plugin/gradle/libs.versions.toml b/build-tool-plugins/gradle-plugin/gradle/libs.versions.toml similarity index 51% rename from gradle-plugin/gradle/libs.versions.toml rename to build-tool-plugins/gradle-plugin/gradle/libs.versions.toml index c88d35d6..9769a4a9 100644 --- a/gradle-plugin/gradle/libs.versions.toml +++ b/build-tool-plugins/gradle-plugin/gradle/libs.versions.toml @@ -2,7 +2,11 @@ # https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format [versions] -junit-jupiter = "5.12.1" +junit-jupiter = "5.10.2" +assertj = "3.25.3" +sharedtype-ap = "0.14.0-SNAPSHOT" [libraries] junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" } +assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" } +sharedtype-ap = { module = "online.sharedtype:sharedtype-ap", version.ref = "sharedtype-ap" } diff --git a/gradle-plugin/gradle/wrapper/gradle-wrapper.jar b/build-tool-plugins/gradle-plugin/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from gradle-plugin/gradle/wrapper/gradle-wrapper.jar rename to build-tool-plugins/gradle-plugin/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/build-tool-plugins/gradle-plugin/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from gradle-plugin/gradle/wrapper/gradle-wrapper.properties rename to build-tool-plugins/gradle-plugin/gradle/wrapper/gradle-wrapper.properties diff --git a/gradle-plugin/gradlew b/build-tool-plugins/gradle-plugin/gradlew similarity index 100% rename from gradle-plugin/gradlew rename to build-tool-plugins/gradle-plugin/gradlew diff --git a/gradle-plugin/settings.gradle.kts b/build-tool-plugins/gradle-plugin/settings.gradle.kts similarity index 100% rename from gradle-plugin/settings.gradle.kts rename to build-tool-plugins/gradle-plugin/settings.gradle.kts diff --git a/gradle-plugin/src/functionalTest/java/online/sharedtype/SharedtypeGradlePluginFunctionalTest.java b/build-tool-plugins/gradle-plugin/src/functionalTest/java/online/sharedtype/gradle/SharedtypeGradlePluginFunctionalTest.java similarity index 86% rename from gradle-plugin/src/functionalTest/java/online/sharedtype/SharedtypeGradlePluginFunctionalTest.java rename to build-tool-plugins/gradle-plugin/src/functionalTest/java/online/sharedtype/gradle/SharedtypeGradlePluginFunctionalTest.java index 7b20ae52..eeee5f3c 100644 --- a/gradle-plugin/src/functionalTest/java/online/sharedtype/SharedtypeGradlePluginFunctionalTest.java +++ b/build-tool-plugins/gradle-plugin/src/functionalTest/java/online/sharedtype/gradle/SharedtypeGradlePluginFunctionalTest.java @@ -1,7 +1,4 @@ -/* - * This source file was generated by the Gradle 'init' task - */ -package online.sharedtype; +package online.sharedtype.gradle; import java.io.File; import java.io.IOException; @@ -14,10 +11,7 @@ import org.junit.jupiter.api.io.TempDir; import static org.junit.jupiter.api.Assertions.*; -/** - * A simple functional test for the 'org.example.greeting' plugin. - */ -class SharedtypeGradlePluginFunctionalTest { +final class SharedtypeGradlePluginFunctionalTest { @TempDir File projectDir; diff --git a/gradle-plugin/src/main/java/online/sharedtype/SharedtypeGradlePlugin.java b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGradlePlugin.java similarity index 73% rename from gradle-plugin/src/main/java/online/sharedtype/SharedtypeGradlePlugin.java rename to build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGradlePlugin.java index c4f13411..43567d58 100644 --- a/gradle-plugin/src/main/java/online/sharedtype/SharedtypeGradlePlugin.java +++ b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGradlePlugin.java @@ -1,14 +1,8 @@ -/* - * This source file was generated by the Gradle 'init' task - */ -package online.sharedtype; +package online.sharedtype.gradle; import org.gradle.api.Project; import org.gradle.api.Plugin; -/** - * A simple 'hello world' plugin. - */ public class SharedtypeGradlePlugin implements Plugin { public void apply(Project project) { // Register a task diff --git a/gradle-plugin/src/test/java/online/sharedtype/SharedtypeGradlePluginTest.java b/build-tool-plugins/gradle-plugin/src/test/java/online/sharedtype/gradle/SharedtypeGradlePluginTest.java similarity index 57% rename from gradle-plugin/src/test/java/online/sharedtype/SharedtypeGradlePluginTest.java rename to build-tool-plugins/gradle-plugin/src/test/java/online/sharedtype/gradle/SharedtypeGradlePluginTest.java index 852a50fb..ad6fa739 100644 --- a/gradle-plugin/src/test/java/online/sharedtype/SharedtypeGradlePluginTest.java +++ b/build-tool-plugins/gradle-plugin/src/test/java/online/sharedtype/gradle/SharedtypeGradlePluginTest.java @@ -1,19 +1,13 @@ -/* - * This source file was generated by the Gradle 'init' task - */ -package online.sharedtype; +package online.sharedtype.gradle; import org.gradle.testfixtures.ProjectBuilder; import org.gradle.api.Project; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; -/** - * A simple unit test for the 'org.example.greeting' plugin. - */ -class SharedtypeGradlePluginTest { - @Test void pluginRegistersATask() { - // Create a test project and apply the plugin +final class SharedtypeGradlePluginTest { + @Test + void pluginRegistersATask() { Project project = ProjectBuilder.builder().build(); project.getPlugins().apply("org.example.greeting"); diff --git a/maven-plugin/it/.mvn/wrapper/maven-wrapper.properties b/build-tool-plugins/maven-plugin/it/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from maven-plugin/it/.mvn/wrapper/maven-wrapper.properties rename to build-tool-plugins/maven-plugin/it/.mvn/wrapper/maven-wrapper.properties diff --git a/maven-plugin/it/mvne b/build-tool-plugins/maven-plugin/it/mvne similarity index 100% rename from maven-plugin/it/mvne rename to build-tool-plugins/maven-plugin/it/mvne diff --git a/maven-plugin/it/mvnw b/build-tool-plugins/maven-plugin/it/mvnw similarity index 100% rename from maven-plugin/it/mvnw rename to build-tool-plugins/maven-plugin/it/mvnw diff --git a/maven-plugin/it/pom.xml b/build-tool-plugins/maven-plugin/it/pom.xml similarity index 98% rename from maven-plugin/it/pom.xml rename to build-tool-plugins/maven-plugin/it/pom.xml index 10c471ac..bc09131f 100644 --- a/maven-plugin/it/pom.xml +++ b/build-tool-plugins/maven-plugin/it/pom.xml @@ -6,7 +6,7 @@ online.sharedtype sharedtype-parent 0.14.0-SNAPSHOT - ../../pom.xml + ../../../pom.xml sharedtype-maven-plugin-it diff --git a/maven-plugin/it/sharedtype.properties b/build-tool-plugins/maven-plugin/it/sharedtype.properties similarity index 100% rename from maven-plugin/it/sharedtype.properties rename to build-tool-plugins/maven-plugin/it/sharedtype.properties diff --git a/maven-plugin/it/src/main/java/online/sharedtype/maven/it/MyClass.java b/build-tool-plugins/maven-plugin/it/src/main/java/online/sharedtype/maven/it/MyClass.java similarity index 100% rename from maven-plugin/it/src/main/java/online/sharedtype/maven/it/MyClass.java rename to build-tool-plugins/maven-plugin/it/src/main/java/online/sharedtype/maven/it/MyClass.java diff --git a/maven-plugin/it/src/test/java/online/sharedtype/maven/it/MavenPluginIntegrationTest.java b/build-tool-plugins/maven-plugin/it/src/test/java/online/sharedtype/maven/it/MavenPluginIntegrationTest.java similarity index 100% rename from maven-plugin/it/src/test/java/online/sharedtype/maven/it/MavenPluginIntegrationTest.java rename to build-tool-plugins/maven-plugin/it/src/test/java/online/sharedtype/maven/it/MavenPluginIntegrationTest.java diff --git a/maven-plugin/it/src/test/resources/expected-types.ts b/build-tool-plugins/maven-plugin/it/src/test/resources/expected-types.ts similarity index 100% rename from maven-plugin/it/src/test/resources/expected-types.ts rename to build-tool-plugins/maven-plugin/it/src/test/resources/expected-types.ts diff --git a/maven-plugin/pom.xml b/build-tool-plugins/maven-plugin/pom.xml similarity index 87% rename from maven-plugin/pom.xml rename to build-tool-plugins/maven-plugin/pom.xml index 8ae89b4f..f00e8c52 100644 --- a/maven-plugin/pom.xml +++ b/build-tool-plugins/maven-plugin/pom.xml @@ -6,7 +6,7 @@ online.sharedtype sharedtype-parent 0.14.0-SNAPSHOT - ../pom.xml + ../../pom.xml sharedtype-maven-plugin @@ -104,6 +104,24 @@ + + org.codehaus.mojo + build-helper-maven-plugin + + + add-source + generate-sources + + add-source + + + + ${project.basedir}/src/common/java + + + + + diff --git a/maven-plugin/src/main/java/online/sharedtype/maven/DependencyResolver.java b/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/DependencyResolver.java similarity index 100% rename from maven-plugin/src/main/java/online/sharedtype/maven/DependencyResolver.java rename to build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/DependencyResolver.java diff --git a/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeDiagnosticListener.java b/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeDiagnosticListener.java similarity index 100% rename from maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeDiagnosticListener.java rename to build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeDiagnosticListener.java diff --git a/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeGenMojo.java b/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeGenMojo.java similarity index 100% rename from maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeGenMojo.java rename to build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeGenMojo.java diff --git a/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeLogger.java b/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeLogger.java similarity index 100% rename from maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeLogger.java rename to build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeLogger.java diff --git a/maven-plugin/src/main/java/online/sharedtype/maven/SourceFileVisitor.java b/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SourceFileVisitor.java similarity index 100% rename from maven-plugin/src/main/java/online/sharedtype/maven/SourceFileVisitor.java rename to build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SourceFileVisitor.java diff --git a/maven-plugin/src/test/java/online/sharedtype/maven/SharedTypeDiagnosticListenerTest.java b/build-tool-plugins/maven-plugin/src/test/java/online/sharedtype/maven/SharedTypeDiagnosticListenerTest.java similarity index 100% rename from maven-plugin/src/test/java/online/sharedtype/maven/SharedTypeDiagnosticListenerTest.java rename to build-tool-plugins/maven-plugin/src/test/java/online/sharedtype/maven/SharedTypeDiagnosticListenerTest.java diff --git a/maven-plugin/src/test/java/online/sharedtype/maven/SharedTypeLoggerTest.java b/build-tool-plugins/maven-plugin/src/test/java/online/sharedtype/maven/SharedTypeLoggerTest.java similarity index 100% rename from maven-plugin/src/test/java/online/sharedtype/maven/SharedTypeLoggerTest.java rename to build-tool-plugins/maven-plugin/src/test/java/online/sharedtype/maven/SharedTypeLoggerTest.java diff --git a/mount-tmpfs.sh b/mount-tmpfs.sh index 471ea16e..3153e1a8 100755 --- a/mount-tmpfs.sh +++ b/mount-tmpfs.sh @@ -22,10 +22,11 @@ mountTmpfs "$DIR/processor/target" 64M mountTmpfs "$DIR/it/java17/target" 64M mountTmpfs "$DIR/it/java8/target" 64M mountTmpfs "$DIR/e2e/target" 64M -mountTmpfs "$DIR/maven-plugin/target" 32M -mountTmpfs "$DIR/maven-plugin/it/target" 16M -mountTmpfs "$DIR/gradle-plugin/.gradle" 16M -mountTmpfs "$DIR/gradle-plugin/build" 32M +mountTmpfs "$DIR/build-tool-plugins/core/target" 32M +mountTmpfs "$DIR/build-tool-plugins/maven-plugin/target" 32M +mountTmpfs "$DIR/build-tool-plugins/maven-plugin/it/target" 16M +mountTmpfs "$DIR/build-tool-plugins/gradle-plugin/.gradle" 16M +mountTmpfs "$DIR/build-tool-plugins/gradle-plugin/build" 32M mountTmpfs "$MAVEN_REPO_DIR" 64M mountTmpfs "$DIR/client-test/rust/target" 512M mountTmpfs "$DIR/client-test/typescript/dist" 32M diff --git a/pom.xml b/pom.xml index 886633ca..c9efbfd1 100644 --- a/pom.xml +++ b/pom.xml @@ -270,8 +270,6 @@ annotation processor it - maven-plugin - maven-plugin/it @@ -280,12 +278,23 @@ e2e + + dev-build-tool-plugins + + true + + + build-tool-plugins/core + build-tool-plugins/maven-plugin + build-tool-plugins/maven-plugin/it + + release annotation processor - maven-plugin + build-tool-plugins/maven-plugin From 9a3fdf32146e0046e5c71e22c498e08d0a515a98 Mon Sep 17 00:00:00 2001 From: Cause Chung Date: Sat, 12 Jul 2025 11:13:11 -0400 Subject: [PATCH 03/21] Put processor execution logic in its module --- .../maven/common/SourceFileVisitor.java | 29 ----- ...code_shared_among_maven_and_gradle_plugins | 0 build-tool-plugins/{core => exec}/pom.xml | 5 +- .../common/AnnotationProcessorExecutor.java} | 56 +++++--- .../exec/common/DependencyResolver.java | 8 ++ .../online/sharedtype/exec/common/Logger.java | 7 + .../common/SharedTypeApCompilerOptions.java | 31 +++++ .../common/SimpleDiagnosticListener.java} | 11 +- .../exec/common/SimpleLoggerWriter.java} | 10 +- .../exec/common}/SourceFileVisitor.java | 2 +- .../SharedTypeDiagnosticListenerTest.java | 10 +- .../exec/common/SimpleLoggerWriterTest.java} | 11 +- build-tool-plugins/maven-plugin/pom.xml | 14 +- ...lver.java => MavenDependencyResolver.java} | 8 +- .../sharedtype/maven/MavenLoggerAdaptor.java | 24 ++++ .../sharedtype/maven/SharedTypeGenMojo.java | 120 +++--------------- pom.xml | 7 +- processor/pom.xml | 9 -- 18 files changed, 165 insertions(+), 197 deletions(-) delete mode 100644 build-tool-plugins/core/src/main/java/online/sharedtype/maven/common/SourceFileVisitor.java delete mode 100644 build-tool-plugins/core/src/main/java/online/sharedtype/maven/common/code_shared_among_maven_and_gradle_plugins rename build-tool-plugins/{core => exec}/pom.xml (89%) rename build-tool-plugins/{core/src/main/java/online/sharedtype/maven/common/SharedTypeApExecutor.java => exec/src/main/java/online/sharedtype/exec/common/AnnotationProcessorExecutor.java} (53%) create mode 100644 build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/DependencyResolver.java create mode 100644 build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/Logger.java create mode 100644 build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SharedTypeApCompilerOptions.java rename build-tool-plugins/{maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeDiagnosticListener.java => exec/src/main/java/online/sharedtype/exec/common/SimpleDiagnosticListener.java} (81%) rename build-tool-plugins/{maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeLogger.java => exec/src/main/java/online/sharedtype/exec/common/SimpleLoggerWriter.java} (81%) rename build-tool-plugins/{maven-plugin/src/main/java/online/sharedtype/maven => exec/src/main/java/online/sharedtype/exec/common}/SourceFileVisitor.java (95%) rename build-tool-plugins/{maven-plugin/src/test/java/online/sharedtype/maven => exec/src/test/java/online/sharedtype/exec/common}/SharedTypeDiagnosticListenerTest.java (86%) rename build-tool-plugins/{maven-plugin/src/test/java/online/sharedtype/maven/SharedTypeLoggerTest.java => exec/src/test/java/online/sharedtype/exec/common/SimpleLoggerWriterTest.java} (78%) rename build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/{DependencyResolver.java => MavenDependencyResolver.java} (86%) create mode 100644 build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/MavenLoggerAdaptor.java diff --git a/build-tool-plugins/core/src/main/java/online/sharedtype/maven/common/SourceFileVisitor.java b/build-tool-plugins/core/src/main/java/online/sharedtype/maven/common/SourceFileVisitor.java deleted file mode 100644 index 5a1aa1b0..00000000 --- a/build-tool-plugins/core/src/main/java/online/sharedtype/maven/common/SourceFileVisitor.java +++ /dev/null @@ -1,29 +0,0 @@ -package online.sharedtype.maven.common; - -import java.io.File; -import java.nio.file.FileVisitResult; -import java.nio.file.Path; -import java.nio.file.SimpleFileVisitor; -import java.nio.file.attribute.BasicFileAttributes; -import java.util.ArrayList; -import java.util.List; - -/** - * @author Cause Chung - */ -final class SourceFileVisitor extends SimpleFileVisitor { - private static final String FILE_EXTENSION = ".java"; - private final List files = new ArrayList<>(); - - @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { - if (file.toString().endsWith(FILE_EXTENSION)) { - files.add(file.toFile()); - } - return FileVisitResult.CONTINUE; - } - - List getFiles() { - return files; - } -} diff --git a/build-tool-plugins/core/src/main/java/online/sharedtype/maven/common/code_shared_among_maven_and_gradle_plugins b/build-tool-plugins/core/src/main/java/online/sharedtype/maven/common/code_shared_among_maven_and_gradle_plugins deleted file mode 100644 index e69de29b..00000000 diff --git a/build-tool-plugins/core/pom.xml b/build-tool-plugins/exec/pom.xml similarity index 89% rename from build-tool-plugins/core/pom.xml rename to build-tool-plugins/exec/pom.xml index 9c4dc206..cc33b87a 100644 --- a/build-tool-plugins/core/pom.xml +++ b/build-tool-plugins/exec/pom.xml @@ -9,9 +9,10 @@ ../../pom.xml - sharedtype-maven-plugin-core + sharedtype-ap-exec 0.14.0-SNAPSHOT - SharedType Maven Plugin Core + SharedType Annotation Processor Executor + Call javac to execute annotation processing with -proc:only diff --git a/build-tool-plugins/core/src/main/java/online/sharedtype/maven/common/SharedTypeApExecutor.java b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/AnnotationProcessorExecutor.java similarity index 53% rename from build-tool-plugins/core/src/main/java/online/sharedtype/maven/common/SharedTypeApExecutor.java rename to build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/AnnotationProcessorExecutor.java index da5111f4..e6616c0b 100644 --- a/build-tool-plugins/core/src/main/java/online/sharedtype/maven/common/SharedTypeApExecutor.java +++ b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/AnnotationProcessorExecutor.java @@ -1,10 +1,14 @@ -package online.sharedtype.maven.common; +package online.sharedtype.exec.common; import online.sharedtype.processor.SharedTypeAnnotationProcessor; import online.sharedtype.processor.support.annotation.Nullable; import online.sharedtype.processor.support.exception.SharedTypeException; +import javax.annotation.processing.Processor; import javax.tools.JavaCompiler; +import javax.tools.JavaFileObject; +import javax.tools.StandardJavaFileManager; +import javax.tools.StandardLocation; import javax.tools.ToolProvider; import java.io.File; import java.io.IOException; @@ -12,17 +16,47 @@ import java.nio.charset.UnsupportedCharsetException; import java.nio.file.FileVisitOption; import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; import java.util.EnumSet; import java.util.List; -public final class SharedTypeApExecutor { +public final class AnnotationProcessorExecutor { private static final String JAVA8_VERSION = "1.8"; - private static final List DEFAULT_COMPILER_OPTIONS = Arrays.asList("-proc:only", "-Asharedtype.enabled=true"); + private final Processor processor; + private final Logger log; + private final DependencyResolver dependencyResolver; + public AnnotationProcessorExecutor(Processor processor, Logger log, DependencyResolver dependencyResolver) { + this.processor = processor; + this.log = log; + this.dependencyResolver = dependencyResolver; + } + + public void execute(Path projectBaseDir, + Path outputDir, + Iterable compileSourceRoots, + String sourceEncoding, + Collection compilerOptions) throws Exception { + SimpleDiagnosticListener diagnosticListener = new SimpleDiagnosticListener(log, projectBaseDir); + JavaCompiler compiler = getJavaCompiler(); + StandardJavaFileManager fileManager = compiler.getStandardFileManager(null, null, getCharset(sourceEncoding)); + try (SimpleLoggerWriter logger = new SimpleLoggerWriter(log)) { + if (Files.notExists(outputDir)) { + Files.createDirectories(outputDir); + } + fileManager.setLocation(StandardLocation.SOURCE_OUTPUT, Collections.singleton(outputDir.toFile())); + fileManager.setLocation(StandardLocation.CLASS_PATH, dependencyResolver.getClasspathDependencies()); + Iterable sources = fileManager.getJavaFileObjectsFromFiles(walkAllSourceFiles(compileSourceRoots)); + + JavaCompiler.CompilationTask task = compiler.getTask(logger, fileManager, diagnosticListener, compilerOptions, null, sources); + task.setProcessors(Collections.singleton(processor)); + task.call(); + } + } private static List walkAllSourceFiles(Iterable compileSourceRoots) throws IOException { SourceFileVisitor visitor = new SourceFileVisitor(); @@ -32,18 +66,6 @@ private static List walkAllSourceFiles(Iterable compileSourceRoots return visitor.getFiles(); } - private static List getCompilerOptions(@Nullable String propertyFile) { - List options = new ArrayList<>(DEFAULT_COMPILER_OPTIONS.size() + 1); - options.addAll(DEFAULT_COMPILER_OPTIONS); - if (propertyFile != null) { - if (Files.notExists(Paths.get(propertyFile))) { - throw new SharedTypeException("Property file not found: " + propertyFile); - } - options.add("-Asharedtype.propsFile=" + propertyFile); - } - return options; - } - private static JavaCompiler getJavaCompiler() throws SharedTypeException { String javaVersion = System.getProperty("java.specification.version"); JavaCompiler compiler; diff --git a/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/DependencyResolver.java b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/DependencyResolver.java new file mode 100644 index 00000000..1748a7a2 --- /dev/null +++ b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/DependencyResolver.java @@ -0,0 +1,8 @@ +package online.sharedtype.exec.common; + +import java.io.File; +import java.util.List; + +public interface DependencyResolver { + List getClasspathDependencies() throws Exception; +} diff --git a/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/Logger.java b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/Logger.java new file mode 100644 index 00000000..30733b27 --- /dev/null +++ b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/Logger.java @@ -0,0 +1,7 @@ +package online.sharedtype.exec.common; + +public interface Logger { + void info(String message); + void warn(String message); + void error(String message); +} diff --git a/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SharedTypeApCompilerOptions.java b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SharedTypeApCompilerOptions.java new file mode 100644 index 00000000..70a2f4e2 --- /dev/null +++ b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SharedTypeApCompilerOptions.java @@ -0,0 +1,31 @@ +package online.sharedtype.exec.common; + +import online.sharedtype.processor.support.exception.SharedTypeException; + +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public final class SharedTypeApCompilerOptions { + private static final List DEFAULT_COMPILER_OPTIONS = Arrays.asList("-proc:only", "-Asharedtype.enabled=true"); + private static final String OPTION_PROPS_FILE_KEY = "-Asharedtype.propsFile="; + private final String propertyFile; + + public SharedTypeApCompilerOptions(String propertyFile) { + this.propertyFile = propertyFile; + } + + public List toList() { + List options = new ArrayList<>(DEFAULT_COMPILER_OPTIONS.size() + 1); + options.addAll(DEFAULT_COMPILER_OPTIONS); + if (propertyFile != null) { + if (Files.notExists(Paths.get(propertyFile))) { + throw new SharedTypeException("Property file not found: " + propertyFile); + } + options.add(OPTION_PROPS_FILE_KEY + propertyFile); + } + return options; + } +} diff --git a/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeDiagnosticListener.java b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SimpleDiagnosticListener.java similarity index 81% rename from build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeDiagnosticListener.java rename to build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SimpleDiagnosticListener.java index 7f0c372f..9fd4c933 100644 --- a/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeDiagnosticListener.java +++ b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SimpleDiagnosticListener.java @@ -1,8 +1,6 @@ -package online.sharedtype.maven; +package online.sharedtype.exec.common; -import com.google.common.annotations.VisibleForTesting; import online.sharedtype.processor.support.annotation.SideEffect; -import org.apache.maven.plugin.logging.Log; import javax.tools.Diagnostic; import javax.tools.DiagnosticListener; @@ -10,10 +8,10 @@ import java.nio.file.Path; import java.nio.file.Paths; -final class SharedTypeDiagnosticListener implements DiagnosticListener { - private final Log log; +final class SimpleDiagnosticListener implements DiagnosticListener { + private final Logger log; private final Path projectBaseDir; - SharedTypeDiagnosticListener(Log log, Path projectBaseDir) { + SimpleDiagnosticListener(Logger log, Path projectBaseDir) { this.log = log; this.projectBaseDir = projectBaseDir; } @@ -40,7 +38,6 @@ public void report(Diagnostic diagnostic) { } } - @VisibleForTesting void addSourceInfo(@SideEffect StringBuilder sb, Diagnostic diagnostic) { if (diagnostic.getSource() == null) { return; diff --git a/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeLogger.java b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SimpleLoggerWriter.java similarity index 81% rename from build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeLogger.java rename to build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SimpleLoggerWriter.java index 838cb9f7..77939296 100644 --- a/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeLogger.java +++ b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SimpleLoggerWriter.java @@ -1,14 +1,12 @@ -package online.sharedtype.maven; - -import org.apache.maven.plugin.logging.Log; +package online.sharedtype.exec.common; import java.io.Writer; -final class SharedTypeLogger extends Writer { - private final Log log; +final class SimpleLoggerWriter extends Writer { + private final Logger log; private final StringBuffer buffer = new StringBuffer(); - SharedTypeLogger(Log log) { + SimpleLoggerWriter(Logger log) { this.log = log; } diff --git a/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SourceFileVisitor.java b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SourceFileVisitor.java similarity index 95% rename from build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SourceFileVisitor.java rename to build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SourceFileVisitor.java index 586e2ce6..3ad87e58 100644 --- a/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SourceFileVisitor.java +++ b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SourceFileVisitor.java @@ -1,4 +1,4 @@ -package online.sharedtype.maven; +package online.sharedtype.exec.common; import java.io.File; import java.nio.file.FileVisitResult; diff --git a/build-tool-plugins/maven-plugin/src/test/java/online/sharedtype/maven/SharedTypeDiagnosticListenerTest.java b/build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/SharedTypeDiagnosticListenerTest.java similarity index 86% rename from build-tool-plugins/maven-plugin/src/test/java/online/sharedtype/maven/SharedTypeDiagnosticListenerTest.java rename to build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/SharedTypeDiagnosticListenerTest.java index 2d197761..1e60a0f5 100644 --- a/build-tool-plugins/maven-plugin/src/test/java/online/sharedtype/maven/SharedTypeDiagnosticListenerTest.java +++ b/build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/SharedTypeDiagnosticListenerTest.java @@ -1,6 +1,5 @@ -package online.sharedtype.maven; +package online.sharedtype.exec.common; -import org.apache.maven.plugin.logging.Log; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -9,7 +8,6 @@ import javax.tools.Diagnostic; import javax.tools.JavaFileObject; - import java.nio.file.Path; import java.nio.file.Paths; @@ -19,15 +17,15 @@ @ExtendWith(MockitoExtension.class) final class SharedTypeDiagnosticListenerTest { private @Mock Diagnostic diagnostic; - private @Mock Log log; + private @Mock Logger log; private final Path baseDir = Paths.get("/test/project/dir"); - private SharedTypeDiagnosticListener listener; + private SimpleDiagnosticListener listener; private @Mock JavaFileObject source; @BeforeEach void setup() { - listener = new SharedTypeDiagnosticListener(log, baseDir); + listener = new SimpleDiagnosticListener(log, baseDir); } @Test diff --git a/build-tool-plugins/maven-plugin/src/test/java/online/sharedtype/maven/SharedTypeLoggerTest.java b/build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/SimpleLoggerWriterTest.java similarity index 78% rename from build-tool-plugins/maven-plugin/src/test/java/online/sharedtype/maven/SharedTypeLoggerTest.java rename to build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/SimpleLoggerWriterTest.java index d4fb1d30..5c44b78a 100644 --- a/build-tool-plugins/maven-plugin/src/test/java/online/sharedtype/maven/SharedTypeLoggerTest.java +++ b/build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/SimpleLoggerWriterTest.java @@ -1,6 +1,5 @@ -package online.sharedtype.maven; +package online.sharedtype.exec.common; -import org.apache.maven.plugin.logging.Log; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -13,14 +12,14 @@ import static org.mockito.Mockito.verify; @ExtendWith(MockitoExtension.class) -final class SharedTypeLoggerTest { - private @Mock Log log; - private SharedTypeLogger logger; +final class SimpleLoggerWriterTest { + private @Mock Logger log; + private SimpleLoggerWriter logger; private @Captor ArgumentCaptor messageCaptor; @BeforeEach void setup() { - logger = new SharedTypeLogger(log); + logger = new SimpleLoggerWriter(log); } @Test diff --git a/build-tool-plugins/maven-plugin/pom.xml b/build-tool-plugins/maven-plugin/pom.xml index f00e8c52..39b3c082 100644 --- a/build-tool-plugins/maven-plugin/pom.xml +++ b/build-tool-plugins/maven-plugin/pom.xml @@ -20,6 +20,11 @@ + + ${project.groupId} + sharedtype-ap-exec + ${project.version} + ${project.groupId} sharedtype-ap @@ -142,15 +147,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - -javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar - - - diff --git a/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/DependencyResolver.java b/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/MavenDependencyResolver.java similarity index 86% rename from build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/DependencyResolver.java rename to build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/MavenDependencyResolver.java index 67e3038f..e0f79c1d 100644 --- a/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/DependencyResolver.java +++ b/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/MavenDependencyResolver.java @@ -1,5 +1,6 @@ package online.sharedtype.maven; +import online.sharedtype.exec.common.DependencyResolver; import org.apache.maven.RepositoryUtils; import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.MojoExecutionException; @@ -17,18 +18,19 @@ /** * @author Cause Chung */ -final class DependencyResolver { +final class MavenDependencyResolver implements DependencyResolver { private final RepositorySystem repositorySystem; private final MavenSession session; private final MavenProject project; - DependencyResolver(RepositorySystem repositorySystem, MavenSession session, MavenProject project) { + MavenDependencyResolver(RepositorySystem repositorySystem, MavenSession session, MavenProject project) { this.repositorySystem = repositorySystem; this.session = session; this.project = project; } - List getClasspathDependencies() throws MojoExecutionException { + @Override + public List getClasspathDependencies() throws Exception { try { ArtifactTypeRegistry artifactTypeRegistry = session.getRepositorySession().getArtifactTypeRegistry(); diff --git a/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/MavenLoggerAdaptor.java b/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/MavenLoggerAdaptor.java new file mode 100644 index 00000000..ba200956 --- /dev/null +++ b/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/MavenLoggerAdaptor.java @@ -0,0 +1,24 @@ +package online.sharedtype.maven; + +import online.sharedtype.exec.common.Logger; +import org.apache.maven.plugin.logging.Log; + +final class MavenLoggerAdaptor implements Logger { + private final Log log; + MavenLoggerAdaptor(Log log) { + this.log = log; + } + + @Override + public void info(String message) { + log.info(message); + } + @Override + public void warn(String message) { + log.warn(message); + } + @Override + public void error(String message) { + log.error(message); + } +} diff --git a/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeGenMojo.java b/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeGenMojo.java index 10f1d5b5..94f9e6c2 100644 --- a/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeGenMojo.java +++ b/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeGenMojo.java @@ -1,35 +1,20 @@ package online.sharedtype.maven; import online.sharedtype.SharedType; +import online.sharedtype.exec.common.AnnotationProcessorExecutor; +import online.sharedtype.exec.common.SharedTypeApCompilerOptions; import online.sharedtype.processor.SharedTypeAnnotationProcessor; import online.sharedtype.processor.support.annotation.Nullable; import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; import org.eclipse.aether.RepositorySystem; import javax.inject.Inject; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.StandardJavaFileManager; -import javax.tools.StandardLocation; -import javax.tools.ToolProvider; -import java.io.File; -import java.nio.charset.Charset; -import java.nio.charset.UnsupportedCharsetException; -import java.nio.file.FileVisitOption; -import java.nio.file.Files; -import java.nio.file.Path; import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.EnumSet; -import java.util.List; import java.util.Map; /** @@ -40,15 +25,9 @@ */ @Mojo(name = "gen") public final class SharedTypeGenMojo extends AbstractMojo { - private static final String JAVA8_VERSION = "1.8"; - private static final List DEFAULT_COMPILER_OPTIONS = Arrays.asList("-proc:only", "-Asharedtype.enabled=true"); private @Inject RepositorySystem repositorySystem; - - @Inject - private MavenSession session; - - @Inject - private MavenProject project; + private @Inject MavenSession session; + private @Inject MavenProject project; /** * Output directory for generated types. Defaults to '${project.build.directory}/generated-sources'. @@ -74,85 +53,24 @@ public final class SharedTypeGenMojo extends AbstractMojo { private Map properties; @Override - public void execute() throws MojoExecutionException, MojoFailureException { - SharedTypeDiagnosticListener diagnosticListener = new SharedTypeDiagnosticListener(getLog(), project.getBasedir().toPath()); - JavaCompiler compiler = getJavaCompiler(); - - DependencyResolver dependencyResolver = new DependencyResolver(repositorySystem, session, project); - StandardJavaFileManager fileManager = compiler.getStandardFileManager(null, null, getCharset()); - try { - Path outputDirPath = Paths.get(outputDirectory); - if (Files.notExists(outputDirPath)) { - Files.createDirectories(outputDirPath); - } - fileManager.setLocation(StandardLocation.SOURCE_OUTPUT, Collections.singleton(outputDirPath.toFile())); - fileManager.setLocation(StandardLocation.CLASS_PATH, dependencyResolver.getClasspathDependencies()); - } catch (Exception e) { - throw new MojoExecutionException(e); - } - Iterable sources = fileManager.getJavaFileObjectsFromFiles(walkAllSourceFiles()); - - try (SharedTypeLogger logger = new SharedTypeLogger(getLog())) { - JavaCompiler.CompilationTask task = compiler.getTask(logger, fileManager, diagnosticListener, getCompilerOptions(), null, sources); - SharedTypeAnnotationProcessor annotationProcessor = new SharedTypeAnnotationProcessor(); - annotationProcessor.setUserProps(properties); - task.setProcessors(Collections.singleton(annotationProcessor)); - task.call(); - } - } - - private List walkAllSourceFiles() throws MojoExecutionException { - SourceFileVisitor visitor = new SourceFileVisitor(); + public void execute() throws MojoExecutionException { + SharedTypeAnnotationProcessor processor = new SharedTypeAnnotationProcessor(); + processor.setUserProps(properties); + AnnotationProcessorExecutor apExecutor = new AnnotationProcessorExecutor( + processor, + new MavenLoggerAdaptor(getLog()), + new MavenDependencyResolver(repositorySystem, session, project) + ); try { - for (String compileSourceRoot : project.getCompileSourceRoots()) { - Files.walkFileTree(Paths.get(compileSourceRoot), EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, visitor); - } + apExecutor.execute( + project.getBasedir().toPath(), + Paths.get(outputDirectory), + project.getCompileSourceRoots(), + project.getProperties().getProperty("project.build.sourceEncoding"), + new SharedTypeApCompilerOptions(propertyFile).toList() + ); } catch (Exception e) { throw new MojoExecutionException(e); } - return visitor.getFiles(); - } - - private List getCompilerOptions() throws MojoFailureException { - List options = new ArrayList<>(DEFAULT_COMPILER_OPTIONS.size() + 1); - options.addAll(DEFAULT_COMPILER_OPTIONS); - if (propertyFile != null) { - if (Files.notExists(Paths.get(propertyFile))) { - throw new MojoFailureException("Property file not found: " + propertyFile); - } - options.add("-Asharedtype.propsFile=" + propertyFile); - } - return options; - } - - private static JavaCompiler getJavaCompiler() throws MojoExecutionException { - String javaVersion = System.getProperty("java.specification.version"); - JavaCompiler compiler; - if (JAVA8_VERSION.equals(javaVersion)) { - try { - Class javacToolClass = SharedTypeAnnotationProcessor.class.getClassLoader().loadClass("com.sun.tools.javac.api.JavacTool"); - compiler = (JavaCompiler) javacToolClass.getConstructor().newInstance(); - } catch (Exception e) { - throw new MojoExecutionException("Failed to load JavaCompiler.", e); - } - } else { - compiler = ToolProvider.getSystemJavaCompiler(); - } - if (compiler != null) { - return compiler; - } - throw new MojoExecutionException("Java compiler not found, currently only compiler from jdk.compiler module is supported."); - } - - private Charset getCharset() throws MojoFailureException { - String encoding = project.getProperties().getProperty("project.build.sourceEncoding"); - if (encoding != null) { - try { - return Charset.forName(encoding); - } catch (UnsupportedCharsetException e) { - throw new MojoFailureException("Invalid 'encoding' option: " + encoding, e); - } - } - return null; } } diff --git a/pom.xml b/pom.xml index c9efbfd1..d1610b79 100644 --- a/pom.xml +++ b/pom.xml @@ -215,6 +215,11 @@ maven-surefire-plugin 3.2.5 + + + -javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar + + maven-jar-plugin @@ -284,7 +289,7 @@ true - build-tool-plugins/core + build-tool-plugins/exec build-tool-plugins/maven-plugin build-tool-plugins/maven-plugin/it diff --git a/processor/pom.xml b/processor/pom.xml index eb3f53b2..27626d71 100644 --- a/processor/pom.xml +++ b/processor/pom.xml @@ -177,15 +177,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - -javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar - - - From 1663366852c934d5f0e8bd39c1b8a4eb8e4ed160 Mon Sep 17 00:00:00 2001 From: Cause Chung Date: Sat, 12 Jul 2025 11:59:40 -0400 Subject: [PATCH 04/21] Add unit test for AnnotationProcessorExecutor --- build-tool-plugins/exec/pom.xml | 6 -- .../common/AnnotationProcessorExecutor.java | 33 ++++----- .../exec/common/DependencyResolver.java | 4 ++ .../online/sharedtype/exec/common/Logger.java | 4 ++ .../common/SharedTypeApCompilerOptions.java | 8 ++- .../exec/common/SimpleDiagnosticListener.java | 7 +- .../exec/common/SimpleLoggerWriter.java | 3 + .../AnnotationProcessorExecutorTest.java | 68 +++++++++++++++++++ .../sharedtype/exec/common/SampleAnno.java | 4 ++ .../exec/src/test/resources/SampleSource.java | 4 ++ build-tool-plugins/maven-plugin/pom.xml | 5 ++ 11 files changed, 113 insertions(+), 33 deletions(-) create mode 100644 build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/AnnotationProcessorExecutorTest.java create mode 100644 build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/SampleAnno.java create mode 100644 build-tool-plugins/exec/src/test/resources/SampleSource.java diff --git a/build-tool-plugins/exec/pom.xml b/build-tool-plugins/exec/pom.xml index cc33b87a..b7743bc2 100644 --- a/build-tool-plugins/exec/pom.xml +++ b/build-tool-plugins/exec/pom.xml @@ -15,12 +15,6 @@ Call javac to execute annotation processing with -proc:only - - ${project.groupId} - sharedtype-ap - ${project.version} - - org.junit.jupiter junit-jupiter diff --git a/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/AnnotationProcessorExecutor.java b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/AnnotationProcessorExecutor.java index e6616c0b..cf897638 100644 --- a/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/AnnotationProcessorExecutor.java +++ b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/AnnotationProcessorExecutor.java @@ -1,9 +1,5 @@ package online.sharedtype.exec.common; -import online.sharedtype.processor.SharedTypeAnnotationProcessor; -import online.sharedtype.processor.support.annotation.Nullable; -import online.sharedtype.processor.support.exception.SharedTypeException; - import javax.annotation.processing.Processor; import javax.tools.JavaCompiler; import javax.tools.JavaFileObject; @@ -13,16 +9,19 @@ import java.io.File; import java.io.IOException; import java.nio.charset.Charset; -import java.nio.charset.UnsupportedCharsetException; import java.nio.file.FileVisitOption; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Collection; import java.util.Collections; import java.util.EnumSet; import java.util.List; +/** + * Generic annotation processor executor. This module does not depend on sharedtype-ap. + * @see SharedTypeApCompilerOptions + * @author Cause Chung + */ public final class AnnotationProcessorExecutor { private static final String JAVA8_VERSION = "1.8"; private final Processor processor; @@ -39,7 +38,7 @@ public void execute(Path projectBaseDir, Path outputDir, Iterable compileSourceRoots, String sourceEncoding, - Collection compilerOptions) throws Exception { + Iterable compilerOptions) throws Exception { SimpleDiagnosticListener diagnosticListener = new SimpleDiagnosticListener(log, projectBaseDir); JavaCompiler compiler = getJavaCompiler(); @@ -66,32 +65,24 @@ private static List walkAllSourceFiles(Iterable compileSourceRoots return visitor.getFiles(); } - private static JavaCompiler getJavaCompiler() throws SharedTypeException { + private static JavaCompiler getJavaCompiler() throws Exception { String javaVersion = System.getProperty("java.specification.version"); JavaCompiler compiler; if (JAVA8_VERSION.equals(javaVersion)) { - try { - Class javacToolClass = SharedTypeAnnotationProcessor.class.getClassLoader().loadClass("com.sun.tools.javac.api.JavacTool"); - compiler = (JavaCompiler) javacToolClass.getConstructor().newInstance(); - } catch (Exception e) { - throw new SharedTypeException("Failed to load JavaCompiler.", e); - } + Class javacToolClass = Class.forName("com.sun.tools.javac.api.JavacTool"); + compiler = (JavaCompiler) javacToolClass.getConstructor().newInstance(); } else { compiler = ToolProvider.getSystemJavaCompiler(); } if (compiler != null) { return compiler; } - throw new SharedTypeException("Java compiler not found, currently only compiler from jdk.compiler module is supported."); + throw new ClassNotFoundException("Java compiler not found, currently only compiler from jdk.compiler module is supported."); } - private static Charset getCharset(@Nullable String encoding) { + private static Charset getCharset(String encoding) { if (encoding != null) { - try { - return Charset.forName(encoding); - } catch (UnsupportedCharsetException e) { - throw new SharedTypeException("Invalid 'encoding' option: " + encoding, e); - } + return Charset.forName(encoding); } return null; } diff --git a/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/DependencyResolver.java b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/DependencyResolver.java index 1748a7a2..4618e103 100644 --- a/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/DependencyResolver.java +++ b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/DependencyResolver.java @@ -3,6 +3,10 @@ import java.io.File; import java.util.List; +/** + * Adapter interface for retrieving classpath dependencies. + * @author Cause Chung + */ public interface DependencyResolver { List getClasspathDependencies() throws Exception; } diff --git a/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/Logger.java b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/Logger.java index 30733b27..36a34502 100644 --- a/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/Logger.java +++ b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/Logger.java @@ -1,5 +1,9 @@ package online.sharedtype.exec.common; +/** + * Adapter for logging. + * @author Cause Chung + */ public interface Logger { void info(String message); void warn(String message); diff --git a/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SharedTypeApCompilerOptions.java b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SharedTypeApCompilerOptions.java index 70a2f4e2..b4153939 100644 --- a/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SharedTypeApCompilerOptions.java +++ b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SharedTypeApCompilerOptions.java @@ -1,13 +1,15 @@ package online.sharedtype.exec.common; -import online.sharedtype.processor.support.exception.SharedTypeException; - import java.nio.file.Files; import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +/** + * Assumed options for sharedtype annotation processor. + * @author Cause Chung + */ public final class SharedTypeApCompilerOptions { private static final List DEFAULT_COMPILER_OPTIONS = Arrays.asList("-proc:only", "-Asharedtype.enabled=true"); private static final String OPTION_PROPS_FILE_KEY = "-Asharedtype.propsFile="; @@ -22,7 +24,7 @@ public List toList() { options.addAll(DEFAULT_COMPILER_OPTIONS); if (propertyFile != null) { if (Files.notExists(Paths.get(propertyFile))) { - throw new SharedTypeException("Property file not found: " + propertyFile); + throw new IllegalArgumentException("Property file not found: " + propertyFile); } options.add(OPTION_PROPS_FILE_KEY + propertyFile); } diff --git a/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SimpleDiagnosticListener.java b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SimpleDiagnosticListener.java index 9fd4c933..c077f7cf 100644 --- a/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SimpleDiagnosticListener.java +++ b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SimpleDiagnosticListener.java @@ -1,13 +1,14 @@ package online.sharedtype.exec.common; -import online.sharedtype.processor.support.annotation.SideEffect; - import javax.tools.Diagnostic; import javax.tools.DiagnosticListener; import javax.tools.JavaFileObject; import java.nio.file.Path; import java.nio.file.Paths; +/** + * @author Cause Chung + */ final class SimpleDiagnosticListener implements DiagnosticListener { private final Logger log; private final Path projectBaseDir; @@ -38,7 +39,7 @@ public void report(Diagnostic diagnostic) { } } - void addSourceInfo(@SideEffect StringBuilder sb, Diagnostic diagnostic) { + void addSourceInfo(StringBuilder sb, Diagnostic diagnostic) { if (diagnostic.getSource() == null) { return; } diff --git a/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SimpleLoggerWriter.java b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SimpleLoggerWriter.java index 77939296..2db74ba3 100644 --- a/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SimpleLoggerWriter.java +++ b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SimpleLoggerWriter.java @@ -2,6 +2,9 @@ import java.io.Writer; +/** + * @author Cause Chung + */ final class SimpleLoggerWriter extends Writer { private final Logger log; private final StringBuffer buffer = new StringBuffer(); diff --git a/build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/AnnotationProcessorExecutorTest.java b/build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/AnnotationProcessorExecutorTest.java new file mode 100644 index 00000000..d525823d --- /dev/null +++ b/build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/AnnotationProcessorExecutorTest.java @@ -0,0 +1,68 @@ +package online.sharedtype.exec.common; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.io.TempDir; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import javax.annotation.processing.Processor; +import javax.annotation.processing.RoundEnvironment; +import javax.lang.model.SourceVersion; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Collections; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +@ExtendWith(MockitoExtension.class) +final class AnnotationProcessorExecutorTest { + private @Mock Processor processor; + private @Mock Logger log; + private @Mock DependencyResolver dependencyResolver; + private AnnotationProcessorExecutor executor; + @TempDir + private Path projectBaseDir; + private Path outputDir; + private Path sourceDir; + + @BeforeEach + void setup() throws Exception { + sourceDir = projectBaseDir.resolve("src/main/java"); + Files.createDirectories(sourceDir); + outputDir = projectBaseDir.resolve("generated-sources"); + copySampleSourceToSourceDir(sourceDir); + Files.createDirectory(outputDir); + executor = new AnnotationProcessorExecutor(processor, log, dependencyResolver); + + when(processor.getSupportedSourceVersion()).thenReturn(SourceVersion.RELEASE_21); + when(processor.getSupportedAnnotationTypes()).thenReturn(Collections.singleton("online.sharedtype.exec.common.SampleAnno")); + when(processor.process(any(), any())).then(invocation -> { + RoundEnvironment env = invocation.getArgument(1); + if (env.processingOver()) { + Files.write(outputDir.resolve("out.txt"), "OK".getBytes()); + } + return true; + }); + } + + @Test + void execute() throws Exception { + executor.execute(projectBaseDir, outputDir, Collections.singleton(sourceDir.toString()), "UTF-8", Collections.singleton("-proc:only")); + verify(processor).init(any()); + verify(processor, times(2)).process(any(), any()); + assertThat(Files.readString(outputDir.resolve("out.txt"))).isEqualTo("OK"); + } + + private static void copySampleSourceToSourceDir(Path sourceDir) throws Exception { + try (var input = AnnotationProcessorExecutor.class.getClassLoader().getResourceAsStream("SampleSource.java")) { + assertThat(input).isNotNull(); + Files.copy(input, sourceDir.resolve("SampleSource.java")); + } + } +} diff --git a/build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/SampleAnno.java b/build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/SampleAnno.java new file mode 100644 index 00000000..8a1df31c --- /dev/null +++ b/build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/SampleAnno.java @@ -0,0 +1,4 @@ +package online.sharedtype.exec.common; + +public @interface SampleAnno { +} diff --git a/build-tool-plugins/exec/src/test/resources/SampleSource.java b/build-tool-plugins/exec/src/test/resources/SampleSource.java new file mode 100644 index 00000000..b16451c0 --- /dev/null +++ b/build-tool-plugins/exec/src/test/resources/SampleSource.java @@ -0,0 +1,4 @@ +@online.sharedtype.exec.common.SampleAnno +class A { + +} diff --git a/build-tool-plugins/maven-plugin/pom.xml b/build-tool-plugins/maven-plugin/pom.xml index 39b3c082..4d611da2 100644 --- a/build-tool-plugins/maven-plugin/pom.xml +++ b/build-tool-plugins/maven-plugin/pom.xml @@ -20,6 +20,11 @@ + + ${project.groupId} + sharedtype-ap + ${project.version} + ${project.groupId} sharedtype-ap-exec From e4f8bd7c751d1e7fd7909833a1469de3774da5a1 Mon Sep 17 00:00:00 2001 From: Cause Chung Date: Sat, 12 Jul 2025 12:03:48 -0400 Subject: [PATCH 05/21] Add ap-exec as depend to gradle plugin --- build-tool-plugins/exec/pom.xml | 2 +- build-tool-plugins/gradle-plugin/build.gradle.kts | 1 + build-tool-plugins/gradle-plugin/gradle/libs.versions.toml | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build-tool-plugins/exec/pom.xml b/build-tool-plugins/exec/pom.xml index b7743bc2..9805fcc4 100644 --- a/build-tool-plugins/exec/pom.xml +++ b/build-tool-plugins/exec/pom.xml @@ -12,7 +12,7 @@ sharedtype-ap-exec 0.14.0-SNAPSHOT SharedType Annotation Processor Executor - Call javac to execute annotation processing with -proc:only + Call javac to execute annotation processing. diff --git a/build-tool-plugins/gradle-plugin/build.gradle.kts b/build-tool-plugins/gradle-plugin/build.gradle.kts index 22ea8042..a0eda76a 100644 --- a/build-tool-plugins/gradle-plugin/build.gradle.kts +++ b/build-tool-plugins/gradle-plugin/build.gradle.kts @@ -9,6 +9,7 @@ repositories { dependencies { implementation(libs.sharedtype.ap) + implementation(libs.sharedtype.ap.exec) testImplementation(libs.junit.jupiter) testImplementation(libs.assertj) testRuntimeOnly("org.junit.platform:junit-platform-launcher") diff --git a/build-tool-plugins/gradle-plugin/gradle/libs.versions.toml b/build-tool-plugins/gradle-plugin/gradle/libs.versions.toml index 9769a4a9..6c4f5aa2 100644 --- a/build-tool-plugins/gradle-plugin/gradle/libs.versions.toml +++ b/build-tool-plugins/gradle-plugin/gradle/libs.versions.toml @@ -4,9 +4,10 @@ [versions] junit-jupiter = "5.10.2" assertj = "3.25.3" -sharedtype-ap = "0.14.0-SNAPSHOT" +sharedtype = "0.14.0-SNAPSHOT" [libraries] junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" } assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" } -sharedtype-ap = { module = "online.sharedtype:sharedtype-ap", version.ref = "sharedtype-ap" } +sharedtype-ap = { module = "online.sharedtype:sharedtype-ap", version.ref = "sharedtype" } +sharedtype-ap-exec = { module = "online.sharedtype:sharedtype-ap-exec", version.ref = "sharedtype" } From 7309915a83b03e459bc2726d314bd3411be803d5 Mon Sep 17 00:00:00 2001 From: Cause Chung Date: Sun, 13 Jul 2025 12:05:30 -0400 Subject: [PATCH 06/21] Add Gradle plugin skeleton --- .../gradle-plugin/build.gradle.kts | 2 +- .../SharedtypeGradlePluginFunctionalTest.java | 51 ++++++++----------- .../src/functionalTest/resources/build.gradle | 12 +++++ .../resources/sharedtype-test.properties | 0 .../gradle/SharedtypeConfigExtension.java | 17 +++++++ .../sharedtype/gradle/SharedtypeGenTask.java | 33 ++++++++++++ .../gradle/SharedtypeGradlePlugin.java | 15 ++++-- .../sharedtype/maven/SharedTypeGenMojo.java | 3 +- doc/Development.md | 9 ++-- mount-tmpfs.sh | 2 +- pom.xml | 2 +- 11 files changed, 105 insertions(+), 41 deletions(-) create mode 100644 build-tool-plugins/gradle-plugin/src/functionalTest/resources/build.gradle create mode 100644 build-tool-plugins/gradle-plugin/src/functionalTest/resources/sharedtype-test.properties create mode 100644 build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeConfigExtension.java create mode 100644 build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGenTask.java diff --git a/build-tool-plugins/gradle-plugin/build.gradle.kts b/build-tool-plugins/gradle-plugin/build.gradle.kts index a0eda76a..303a84ea 100644 --- a/build-tool-plugins/gradle-plugin/build.gradle.kts +++ b/build-tool-plugins/gradle-plugin/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { gradlePlugin { val greeting by plugins.creating { id = "online.sharedtype.sharedtype-gradle-plugin" - implementationClass = "online.sharedtype.SharedtypeGradlePlugin" + implementationClass = "online.sharedtype.gradle.SharedtypeGradlePlugin" } } diff --git a/build-tool-plugins/gradle-plugin/src/functionalTest/java/online/sharedtype/gradle/SharedtypeGradlePluginFunctionalTest.java b/build-tool-plugins/gradle-plugin/src/functionalTest/java/online/sharedtype/gradle/SharedtypeGradlePluginFunctionalTest.java index eeee5f3c..39e5af73 100644 --- a/build-tool-plugins/gradle-plugin/src/functionalTest/java/online/sharedtype/gradle/SharedtypeGradlePluginFunctionalTest.java +++ b/build-tool-plugins/gradle-plugin/src/functionalTest/java/online/sharedtype/gradle/SharedtypeGradlePluginFunctionalTest.java @@ -1,50 +1,43 @@ package online.sharedtype.gradle; -import java.io.File; -import java.io.IOException; -import java.io.Writer; -import java.io.FileWriter; - -import org.gradle.testkit.runner.GradleRunner; import org.gradle.testkit.runner.BuildResult; +import org.gradle.testkit.runner.GradleRunner; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import static org.junit.jupiter.api.Assertions.*; + +import java.nio.file.Files; +import java.nio.file.Path; + +import static org.assertj.core.api.Assertions.assertThat; final class SharedtypeGradlePluginFunctionalTest { @TempDir - File projectDir; - - private File getBuildFile() { - return new File(projectDir, "build.gradle"); - } + private Path projectDir; - private File getSettingsFile() { - return new File(projectDir, "settings.gradle"); + @BeforeEach + void setup() throws Exception { + Files.createFile(projectDir.resolve("settings.gradle")); + copyResourceToProjectDir("build.gradle"); + copyResourceToProjectDir("sharedtype-test.properties"); } - @Test void canRunTask() throws IOException { - writeString(getSettingsFile(), ""); - writeString(getBuildFile(), - "plugins {" + - " id('org.example.greeting')" + - "}"); - - // Run the build + @Test + void canRunTask() { GradleRunner runner = GradleRunner.create(); runner.forwardOutput(); + runner.withArguments("--stacktrace", "--info", "stypeGen"); runner.withPluginClasspath(); - runner.withArguments("greeting"); - runner.withProjectDir(projectDir); + runner.withProjectDir(projectDir.toFile()); BuildResult result = runner.build(); - // Verify the result - assertTrue(result.getOutput().contains("Hello from plugin 'org.example.greeting'")); + assertThat(result.getOutput()).contains(""); } - private void writeString(File file, String string) throws IOException { - try (Writer writer = new FileWriter(file)) { - writer.write(string); + private void copyResourceToProjectDir(String resourceName) throws Exception { + try (var input = getClass().getClassLoader().getResourceAsStream(resourceName)) { + assertThat(input).isNotNull(); + Files.copy(input, projectDir.resolve(resourceName)); } } } diff --git a/build-tool-plugins/gradle-plugin/src/functionalTest/resources/build.gradle b/build-tool-plugins/gradle-plugin/src/functionalTest/resources/build.gradle new file mode 100644 index 00000000..88b9a8e8 --- /dev/null +++ b/build-tool-plugins/gradle-plugin/src/functionalTest/resources/build.gradle @@ -0,0 +1,12 @@ +plugins { + id("online.sharedtype.sharedtype-gradle-plugin") +} + +repositories { +// mavenCentral() + mavenLocal() +} + +sharedtype { + propertyFile = project.file("sharedtype-test.properties") +} diff --git a/build-tool-plugins/gradle-plugin/src/functionalTest/resources/sharedtype-test.properties b/build-tool-plugins/gradle-plugin/src/functionalTest/resources/sharedtype-test.properties new file mode 100644 index 00000000..e69de29b diff --git a/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeConfigExtension.java b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeConfigExtension.java new file mode 100644 index 00000000..2052d2df --- /dev/null +++ b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeConfigExtension.java @@ -0,0 +1,17 @@ +package online.sharedtype.gradle; + +import java.io.File; +import java.util.Map; + + +/** + * This will enable lazy configuration so that the actual values will only be resolved when they are needed + * and can be reconfigured at any time during build configuration. See Gradle extension doc. + * + * @author Cause Chung + */ +final class SharedtypeConfigExtension { + File outputDirectory; + File propertyFile; + Map properties; +} diff --git a/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGenTask.java b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGenTask.java new file mode 100644 index 00000000..5387d2fa --- /dev/null +++ b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGenTask.java @@ -0,0 +1,33 @@ +package online.sharedtype.gradle; + +import org.gradle.api.DefaultTask; +import org.gradle.api.Project; +import org.gradle.api.tasks.TaskAction; + +import javax.inject.Inject; + +/** + * @author Cause Chung + */ +class SharedtypeGenTask extends DefaultTask { + private final Project project; + private SharedtypeConfigExtension extension; + + @Inject + public SharedtypeGenTask(Project project) { + super(); + this.project = project; + } + void setExtension(SharedtypeConfigExtension extension) { + this.extension = extension; + } + + @TaskAction + void action() { + System.out.println("####################################"); + System.out.println(extension.properties); + System.out.println(extension.propertyFile); + System.out.println(extension.outputDirectory); + System.out.println(project); + } +} diff --git a/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGradlePlugin.java b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGradlePlugin.java index 43567d58..4d3eb667 100644 --- a/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGradlePlugin.java +++ b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGradlePlugin.java @@ -3,11 +3,16 @@ import org.gradle.api.Project; import org.gradle.api.Plugin; -public class SharedtypeGradlePlugin implements Plugin { +/** + * @author Cause Chung + */ +final class SharedtypeGradlePlugin implements Plugin { + private static final String EXTENSION_METHOD_NAME = "sharedtype"; + private static final String TASK_NAME = "stypeGen"; + public void apply(Project project) { - // Register a task - project.getTasks().register("greeting", task -> { - task.doLast(s -> System.out.println("Hello from plugin 'org.example.greeting'")); - }); + var extension = new SharedtypeConfigExtension(); + project.getExtensions().add(EXTENSION_METHOD_NAME, extension); + project.getTasks().register(TASK_NAME, SharedtypeGenTask.class, task -> task.setExtension(extension)); } } diff --git a/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeGenMojo.java b/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeGenMojo.java index 94f9e6c2..9e9d6222 100644 --- a/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeGenMojo.java +++ b/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeGenMojo.java @@ -25,6 +25,7 @@ */ @Mojo(name = "gen") public final class SharedTypeGenMojo extends AbstractMojo { + private static final String PROP_PROJECT_SOURCE_ENCODING = "project.build.sourceEncoding"; private @Inject RepositorySystem repositorySystem; private @Inject MavenSession session; private @Inject MavenProject project; @@ -66,7 +67,7 @@ public void execute() throws MojoExecutionException { project.getBasedir().toPath(), Paths.get(outputDirectory), project.getCompileSourceRoots(), - project.getProperties().getProperty("project.build.sourceEncoding"), + project.getProperties().getProperty(PROP_PROJECT_SOURCE_ENCODING), new SharedTypeApCompilerOptions(propertyFile).toList() ); } catch (Exception e) { diff --git a/doc/Development.md b/doc/Development.md index 39cef68e..187fada7 100644 --- a/doc/Development.md +++ b/doc/Development.md @@ -14,14 +14,16 @@ Internal types also have javadoc for more information. * `java17` uses symlink to reuse types in `java8` then does more type checks, e.g. for Java `record`. * `client-test` contains target languages' tests respectively against generated code. * `e2e` contains e2e json 2-way serialization and deserialization tests against target languages' http servers. -* `maven-plugin` contains maven plugin for SharedType annotation, and `maven-plugin/it` contains integration tests for maven plugin. +* `build-tool-plugins` contains Maven and Gradle plugin for SharedType annotation. + * `exec` contains generic annotation processor executor. + * `maven-plugin/it` contains integration tests for maven plugin. Domain types are shared among processor and integration tests to reduce maven module count. ## Setup -**Linux is assumed**. If you use Windows, you can use WSL with a remotely connected IDE. Windows 11 supports GUI app inside WSL. +**Linux/macOS is assumed**. If you use Windows, you can use WSL with a remotely connected IDE. Windows 11 supports GUI app inside WSL. -Setup Java env vars (>= Java17 for development), configure `JAVA17_HOME` to point to your Java installation: +Setup Java env vars (>= Java21 for development), configure `JAVA21_HOME` to point to your Java installation: ```bash . setenv ``` @@ -39,6 +41,7 @@ Choose maven profiles in IDE accordingly as below. IDE may not able to properly resolve classes in `internal` folder for both modules. Enable this profile to enable `it` modules in IDE, and disable it when developing against `processor` module. * `it-no-jpms` and `it-jpms` - control whether to enable Java 9 Jigsaw module test in `it`. `it/java8` sources are reused to test on jdk9. Turn on `it-jpms` for IDE to correctly resolve `it/java8` classes. +* `dev-build-tool` - controls build tool plugin modules. ## Development ### Run test diff --git a/mount-tmpfs.sh b/mount-tmpfs.sh index 3153e1a8..d4578a43 100755 --- a/mount-tmpfs.sh +++ b/mount-tmpfs.sh @@ -22,7 +22,7 @@ mountTmpfs "$DIR/processor/target" 64M mountTmpfs "$DIR/it/java17/target" 64M mountTmpfs "$DIR/it/java8/target" 64M mountTmpfs "$DIR/e2e/target" 64M -mountTmpfs "$DIR/build-tool-plugins/core/target" 32M +mountTmpfs "$DIR/build-tool-plugins/exec/target" 32M mountTmpfs "$DIR/build-tool-plugins/maven-plugin/target" 32M mountTmpfs "$DIR/build-tool-plugins/maven-plugin/it/target" 16M mountTmpfs "$DIR/build-tool-plugins/gradle-plugin/.gradle" 16M diff --git a/pom.xml b/pom.xml index d1610b79..26518444 100644 --- a/pom.xml +++ b/pom.xml @@ -284,7 +284,7 @@ - dev-build-tool-plugins + dev-build-tool true From 4605f95492b0f171e2b3a12dbc62af1dacf01fe8 Mon Sep 17 00:00:00 2001 From: Cause Chung Date: Sun, 13 Jul 2025 12:19:10 -0400 Subject: [PATCH 07/21] Simplify README --- README.md | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/README.md b/README.md index 4072f4ea..12d02a35 100644 --- a/README.md +++ b/README.md @@ -18,22 +18,6 @@ export interface User { email: string; } ``` -Go: -```golang -type User struct { - Name string - Age int - Email string -} -``` -Rust: -```rust -pub struct User { - name: String, - age: i32, - email: String, -} -``` ## Features * Java8+ compatible. @@ -41,6 +25,7 @@ pub struct User { * Compile-time constant support. * Fast. (Execution takes milliseconds with `-proc:only`.) * Simple global + type level configurations. +* Multiple target language options: Typescript, Go, Rust. ## Documentation * [User Guide](doc/Usage.md) From aad35391fb0c12f4358a53da1377725d2dc5b59d Mon Sep 17 00:00:00 2001 From: Cause Chung Date: Sun, 20 Jul 2025 14:09:27 -0400 Subject: [PATCH 08/21] Basic gradle plugin impl and it --- .../common/AnnotationProcessorExecutor.java | 9 +- .../common/SharedTypeApCompilerOptions.java | 4 + .../AnnotationProcessorExecutorTest.java | 2 +- .../SharedTypeApCompilerOptionsTest.java | 7 + .../gradle-plugin/build.gradle.kts | 32 +-- .../gradle-plugin/it/build.gradle | 21 ++ .../it/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 63375 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + build-tool-plugins/gradle-plugin/it/gradlew | 248 ++++++++++++++++++ .../gradle-plugin/it/settings.gradle | 7 + .../it/sharedtype-test.properties | 1 + .../sharedtype/gradle/it/MyGradleClass.java | 8 + .../SharedtypeGradlePluginFunctionalTest.java | 43 --- .../src/functionalTest/resources/build.gradle | 12 - .../resources/sharedtype-test.properties | 0 .../gradle/GradleLoggerAdaptor.java | 22 ++ .../gradle/SharedtypeConfigExtension.java | 34 ++- .../sharedtype/gradle/SharedtypeGenTask.java | 58 +++- .../gradle/SharedtypeGradlePlugin.java | 5 +- .../gradle/SharedtypeGradlePluginTest.java | 4 +- build-tool-plugins/maven-plugin/pom.xml | 5 - .../sharedtype/maven/SharedTypeGenMojo.java | 3 +- mount-tmpfs.sh | 2 + pom.xml | 1 + 24 files changed, 434 insertions(+), 101 deletions(-) create mode 100644 build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/SharedTypeApCompilerOptionsTest.java create mode 100644 build-tool-plugins/gradle-plugin/it/build.gradle create mode 100644 build-tool-plugins/gradle-plugin/it/gradle/wrapper/gradle-wrapper.jar create mode 100644 build-tool-plugins/gradle-plugin/it/gradle/wrapper/gradle-wrapper.properties create mode 100755 build-tool-plugins/gradle-plugin/it/gradlew create mode 100644 build-tool-plugins/gradle-plugin/it/settings.gradle create mode 100644 build-tool-plugins/gradle-plugin/it/sharedtype-test.properties create mode 100644 build-tool-plugins/gradle-plugin/it/src/main/java/online/sharedtype/gradle/it/MyGradleClass.java delete mode 100644 build-tool-plugins/gradle-plugin/src/functionalTest/java/online/sharedtype/gradle/SharedtypeGradlePluginFunctionalTest.java delete mode 100644 build-tool-plugins/gradle-plugin/src/functionalTest/resources/build.gradle delete mode 100644 build-tool-plugins/gradle-plugin/src/functionalTest/resources/sharedtype-test.properties create mode 100644 build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/GradleLoggerAdaptor.java diff --git a/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/AnnotationProcessorExecutor.java b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/AnnotationProcessorExecutor.java index cf897638..5f52819c 100644 --- a/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/AnnotationProcessorExecutor.java +++ b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/AnnotationProcessorExecutor.java @@ -12,7 +12,6 @@ import java.nio.file.FileVisitOption; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.Collections; import java.util.EnumSet; import java.util.List; @@ -36,7 +35,7 @@ public AnnotationProcessorExecutor(Processor processor, Logger log, DependencyRe public void execute(Path projectBaseDir, Path outputDir, - Iterable compileSourceRoots, + Iterable compileSourceRoots, String sourceEncoding, Iterable compilerOptions) throws Exception { SimpleDiagnosticListener diagnosticListener = new SimpleDiagnosticListener(log, projectBaseDir); @@ -57,10 +56,10 @@ public void execute(Path projectBaseDir, } } - private static List walkAllSourceFiles(Iterable compileSourceRoots) throws IOException { + private static List walkAllSourceFiles(Iterable compileSourceRoots) throws IOException { SourceFileVisitor visitor = new SourceFileVisitor(); - for (String compileSourceRoot : compileSourceRoots) { - Files.walkFileTree(Paths.get(compileSourceRoot), EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, visitor); + for (Path compileSourceRoot : compileSourceRoots) { + Files.walkFileTree(compileSourceRoot, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, visitor); } return visitor.getFiles(); } diff --git a/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SharedTypeApCompilerOptions.java b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SharedTypeApCompilerOptions.java index b4153939..ea93564b 100644 --- a/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SharedTypeApCompilerOptions.java +++ b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/SharedTypeApCompilerOptions.java @@ -1,5 +1,6 @@ package online.sharedtype.exec.common; +import java.io.File; import java.nio.file.Files; import java.nio.file.Paths; import java.util.ArrayList; @@ -18,6 +19,9 @@ public final class SharedTypeApCompilerOptions { public SharedTypeApCompilerOptions(String propertyFile) { this.propertyFile = propertyFile; } + public SharedTypeApCompilerOptions(File propertyFile) { + this(propertyFile == null ? null : propertyFile.getAbsolutePath()); + } public List toList() { List options = new ArrayList<>(DEFAULT_COMPILER_OPTIONS.size() + 1); diff --git a/build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/AnnotationProcessorExecutorTest.java b/build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/AnnotationProcessorExecutorTest.java index d525823d..c5b86acf 100644 --- a/build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/AnnotationProcessorExecutorTest.java +++ b/build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/AnnotationProcessorExecutorTest.java @@ -53,7 +53,7 @@ void setup() throws Exception { @Test void execute() throws Exception { - executor.execute(projectBaseDir, outputDir, Collections.singleton(sourceDir.toString()), "UTF-8", Collections.singleton("-proc:only")); + executor.execute(projectBaseDir, outputDir, Collections.singleton(sourceDir), "UTF-8", Collections.singleton("-proc:only")); verify(processor).init(any()); verify(processor, times(2)).process(any(), any()); assertThat(Files.readString(outputDir.resolve("out.txt"))).isEqualTo("OK"); diff --git a/build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/SharedTypeApCompilerOptionsTest.java b/build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/SharedTypeApCompilerOptionsTest.java new file mode 100644 index 00000000..e7da75ae --- /dev/null +++ b/build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/SharedTypeApCompilerOptionsTest.java @@ -0,0 +1,7 @@ +package online.sharedtype.exec.common; + +import static org.assertj.core.api.Assertions.assertThat; + +final class SharedTypeApCompilerOptionsTest { + +} diff --git a/build-tool-plugins/gradle-plugin/build.gradle.kts b/build-tool-plugins/gradle-plugin/build.gradle.kts index 303a84ea..367096ec 100644 --- a/build-tool-plugins/gradle-plugin/build.gradle.kts +++ b/build-tool-plugins/gradle-plugin/build.gradle.kts @@ -1,7 +1,19 @@ plugins { `java-gradle-plugin` + `maven-publish` } +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +group = "online.sharedtype" +version = "0.14.0-SNAPSHOT" + repositories { mavenCentral() mavenLocal() @@ -22,26 +34,6 @@ gradlePlugin { } } -// Add a source set for the functional test suite -val functionalTestSourceSet = sourceSets.create("functionalTest") { -} - -configurations["functionalTestImplementation"].extendsFrom(configurations["testImplementation"]) -configurations["functionalTestRuntimeOnly"].extendsFrom(configurations["testRuntimeOnly"]) - -// Add a task to run the functional tests -val functionalTest by tasks.registering(Test::class) { - testClassesDirs = functionalTestSourceSet.output.classesDirs - classpath = functionalTestSourceSet.runtimeClasspath - useJUnitPlatform() -} - -gradlePlugin.testSourceSets.add(functionalTestSourceSet) - -tasks.named("check") { - dependsOn(functionalTest) -} - tasks.named("test") { useJUnitPlatform() } diff --git a/build-tool-plugins/gradle-plugin/it/build.gradle b/build-tool-plugins/gradle-plugin/it/build.gradle new file mode 100644 index 00000000..0493e4e6 --- /dev/null +++ b/build-tool-plugins/gradle-plugin/it/build.gradle @@ -0,0 +1,21 @@ +plugins { + id("java") + id("online.sharedtype.sharedtype-gradle-plugin") version "0.14.0-SNAPSHOT" +} + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +dependencies { + compileOnly("online.sharedtype:sharedtype:0.14.0-SNAPSHOT") +} + +repositories { + mavenLocal() +} + +sharedtype { + propertyFile = project.file("sharedtype-test.properties") +} diff --git a/build-tool-plugins/gradle-plugin/it/gradle/wrapper/gradle-wrapper.jar b/build-tool-plugins/gradle-plugin/it/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..033e24c4cdf41af1ab109bc7f253b2b887023340 GIT binary patch literal 63375 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≫L+crb^Bz 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/build-tool-plugins/gradle-plugin/it/settings.gradle b/build-tool-plugins/gradle-plugin/it/settings.gradle new file mode 100644 index 00000000..05d25a1b --- /dev/null +++ b/build-tool-plugins/gradle-plugin/it/settings.gradle @@ -0,0 +1,7 @@ +pluginManagement { + repositories { + mavenLocal() + } +} + +rootProject.name="sharedtype-gradle-plugin-it" diff --git a/build-tool-plugins/gradle-plugin/it/sharedtype-test.properties b/build-tool-plugins/gradle-plugin/it/sharedtype-test.properties new file mode 100644 index 00000000..8d2dd8ab --- /dev/null +++ b/build-tool-plugins/gradle-plugin/it/sharedtype-test.properties @@ -0,0 +1 @@ +rootProject.name = 'sharedtype-gradle-plugin-it' diff --git a/build-tool-plugins/gradle-plugin/it/src/main/java/online/sharedtype/gradle/it/MyGradleClass.java b/build-tool-plugins/gradle-plugin/it/src/main/java/online/sharedtype/gradle/it/MyGradleClass.java new file mode 100644 index 00000000..e4f9aa7a --- /dev/null +++ b/build-tool-plugins/gradle-plugin/it/src/main/java/online/sharedtype/gradle/it/MyGradleClass.java @@ -0,0 +1,8 @@ +package online.sharedtype.gradle.it; + +import online.sharedtype.SharedType; + +@SharedType +final class MyGradleClass { + private int value; +} diff --git a/build-tool-plugins/gradle-plugin/src/functionalTest/java/online/sharedtype/gradle/SharedtypeGradlePluginFunctionalTest.java b/build-tool-plugins/gradle-plugin/src/functionalTest/java/online/sharedtype/gradle/SharedtypeGradlePluginFunctionalTest.java deleted file mode 100644 index 39e5af73..00000000 --- a/build-tool-plugins/gradle-plugin/src/functionalTest/java/online/sharedtype/gradle/SharedtypeGradlePluginFunctionalTest.java +++ /dev/null @@ -1,43 +0,0 @@ -package online.sharedtype.gradle; - -import org.gradle.testkit.runner.BuildResult; -import org.gradle.testkit.runner.GradleRunner; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.io.TempDir; - -import java.nio.file.Files; -import java.nio.file.Path; - -import static org.assertj.core.api.Assertions.assertThat; - -final class SharedtypeGradlePluginFunctionalTest { - @TempDir - private Path projectDir; - - @BeforeEach - void setup() throws Exception { - Files.createFile(projectDir.resolve("settings.gradle")); - copyResourceToProjectDir("build.gradle"); - copyResourceToProjectDir("sharedtype-test.properties"); - } - - @Test - void canRunTask() { - GradleRunner runner = GradleRunner.create(); - runner.forwardOutput(); - runner.withArguments("--stacktrace", "--info", "stypeGen"); - runner.withPluginClasspath(); - runner.withProjectDir(projectDir.toFile()); - BuildResult result = runner.build(); - - assertThat(result.getOutput()).contains(""); - } - - private void copyResourceToProjectDir(String resourceName) throws Exception { - try (var input = getClass().getClassLoader().getResourceAsStream(resourceName)) { - assertThat(input).isNotNull(); - Files.copy(input, projectDir.resolve(resourceName)); - } - } -} diff --git a/build-tool-plugins/gradle-plugin/src/functionalTest/resources/build.gradle b/build-tool-plugins/gradle-plugin/src/functionalTest/resources/build.gradle deleted file mode 100644 index 88b9a8e8..00000000 --- a/build-tool-plugins/gradle-plugin/src/functionalTest/resources/build.gradle +++ /dev/null @@ -1,12 +0,0 @@ -plugins { - id("online.sharedtype.sharedtype-gradle-plugin") -} - -repositories { -// mavenCentral() - mavenLocal() -} - -sharedtype { - propertyFile = project.file("sharedtype-test.properties") -} diff --git a/build-tool-plugins/gradle-plugin/src/functionalTest/resources/sharedtype-test.properties b/build-tool-plugins/gradle-plugin/src/functionalTest/resources/sharedtype-test.properties deleted file mode 100644 index e69de29b..00000000 diff --git a/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/GradleLoggerAdaptor.java b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/GradleLoggerAdaptor.java new file mode 100644 index 00000000..b6d85fc4 --- /dev/null +++ b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/GradleLoggerAdaptor.java @@ -0,0 +1,22 @@ +package online.sharedtype.gradle; + +import org.slf4j.Logger; + +final class GradleLoggerAdaptor implements online.sharedtype.exec.common.Logger { + private final Logger delegate; + GradleLoggerAdaptor(Logger delegate) { + this.delegate = delegate; + } + @Override + public void info(String s) { + delegate.info(s); + } + @Override + public void warn(String s) { + delegate.warn(s); + } + @Override + public void error(String s) { + delegate.error(s); + } +} diff --git a/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeConfigExtension.java b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeConfigExtension.java index 2052d2df..81a50315 100644 --- a/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeConfigExtension.java +++ b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeConfigExtension.java @@ -10,8 +10,34 @@ * * @author Cause Chung */ -final class SharedtypeConfigExtension { - File outputDirectory; - File propertyFile; - Map properties; +public final class SharedtypeConfigExtension { + private File outputDirectory; + private File propertyFile; + private Map properties; + private String sourceEncoding; + + public File getOutputDirectory() { + return outputDirectory; + } + public void setOutputDirectory(File outputDirectory) { + this.outputDirectory = outputDirectory; + } + public File getPropertyFile() { + return propertyFile; + } + public void setPropertyFile(File propertyFile) { + this.propertyFile = propertyFile; + } + public Map getProperties() { + return properties; + } + public void setProperties(Map properties) { + this.properties = properties; + } + public String getSourceEncoding() { + return sourceEncoding; + } + public void setSourceEncoding(String sourceEncoding) { + this.sourceEncoding = sourceEncoding; + } } diff --git a/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGenTask.java b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGenTask.java index 5387d2fa..3f7b0b49 100644 --- a/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGenTask.java +++ b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGenTask.java @@ -1,15 +1,26 @@ package online.sharedtype.gradle; +import online.sharedtype.exec.common.AnnotationProcessorExecutor; +import online.sharedtype.exec.common.SharedTypeApCompilerOptions; +import online.sharedtype.processor.SharedTypeAnnotationProcessor; +import online.sharedtype.processor.support.exception.SharedTypeException; import org.gradle.api.DefaultTask; import org.gradle.api.Project; +import org.gradle.api.plugins.JavaPluginExtension; import org.gradle.api.tasks.TaskAction; import javax.inject.Inject; +import java.io.File; +import java.nio.file.Path; +import java.util.List; +import java.util.stream.Collectors; /** * @author Cause Chung */ class SharedtypeGenTask extends DefaultTask { + static final String TASK_NAME = "stypeGen"; + private static final String DEFAULT_OUTPUT_DIRECTORY = "generated-sources"; private final Project project; private SharedtypeConfigExtension extension; @@ -24,10 +35,47 @@ void setExtension(SharedtypeConfigExtension extension) { @TaskAction void action() { - System.out.println("####################################"); - System.out.println(extension.properties); - System.out.println(extension.propertyFile); - System.out.println(extension.outputDirectory); - System.out.println(project); + try { + execute(); + } catch (Exception e) { + throw new SharedTypeException(String.format("Failed to execute task '%s'", TASK_NAME), e); + } + } + + private void execute() throws Exception { + JavaPluginExtension javaPluginExtension = project.getExtensions().findByType(JavaPluginExtension.class); + if (javaPluginExtension == null) { + throw new UnsupportedOperationException("Could not find JavaPluginExtension, only Java projects are supported."); + } + List sourceDirs = javaPluginExtension.getSourceSets().stream() + .flatMap(srcSet -> srcSet.getAllSource().getSrcDirs().stream()) + .map(File::toPath) + .filter(path -> path.getFileName().toString().endsWith(".java")) + .collect(Collectors.toList()); + List classpathDependencies = javaPluginExtension.getSourceSets().stream() + .flatMap(srcSet -> srcSet.getCompileClasspath().getFiles().stream()) + .collect(Collectors.toList()); + + SharedTypeAnnotationProcessor processor = new SharedTypeAnnotationProcessor(); + processor.setUserProps(extension.getProperties()); + AnnotationProcessorExecutor executor = new AnnotationProcessorExecutor( + processor, + new GradleLoggerAdaptor(project.getLogger()), + () -> classpathDependencies + ); + + executor.execute( + project.getProjectDir().toPath(), + resolveOutputDirectory().toPath(), + sourceDirs, + extension.getSourceEncoding(), + new SharedTypeApCompilerOptions(extension.getPropertyFile()).toList() + ); + } + + private File resolveOutputDirectory() { + return extension.getOutputDirectory() != null + ? extension.getOutputDirectory() + : project.getLayout().getBuildDirectory().dir(DEFAULT_OUTPUT_DIRECTORY).get().getAsFile(); } } diff --git a/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGradlePlugin.java b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGradlePlugin.java index 4d3eb667..a82ea95c 100644 --- a/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGradlePlugin.java +++ b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGradlePlugin.java @@ -8,11 +8,10 @@ */ final class SharedtypeGradlePlugin implements Plugin { private static final String EXTENSION_METHOD_NAME = "sharedtype"; - private static final String TASK_NAME = "stypeGen"; public void apply(Project project) { - var extension = new SharedtypeConfigExtension(); + SharedtypeConfigExtension extension = new SharedtypeConfigExtension(); project.getExtensions().add(EXTENSION_METHOD_NAME, extension); - project.getTasks().register(TASK_NAME, SharedtypeGenTask.class, task -> task.setExtension(extension)); + project.getTasks().register(SharedtypeGenTask.TASK_NAME, SharedtypeGenTask.class, task -> task.setExtension(extension)); } } diff --git a/build-tool-plugins/gradle-plugin/src/test/java/online/sharedtype/gradle/SharedtypeGradlePluginTest.java b/build-tool-plugins/gradle-plugin/src/test/java/online/sharedtype/gradle/SharedtypeGradlePluginTest.java index ad6fa739..70439831 100644 --- a/build-tool-plugins/gradle-plugin/src/test/java/online/sharedtype/gradle/SharedtypeGradlePluginTest.java +++ b/build-tool-plugins/gradle-plugin/src/test/java/online/sharedtype/gradle/SharedtypeGradlePluginTest.java @@ -9,9 +9,9 @@ final class SharedtypeGradlePluginTest { @Test void pluginRegistersATask() { Project project = ProjectBuilder.builder().build(); - project.getPlugins().apply("org.example.greeting"); + project.getPlugins().apply("online.sharedtype.sharedtype-gradle-plugin"); // Verify the result - assertNotNull(project.getTasks().findByName("greeting")); + assertNotNull(project.getTasks().findByName("stypeGen")); } } diff --git a/build-tool-plugins/maven-plugin/pom.xml b/build-tool-plugins/maven-plugin/pom.xml index 4d611da2..711b9f87 100644 --- a/build-tool-plugins/maven-plugin/pom.xml +++ b/build-tool-plugins/maven-plugin/pom.xml @@ -30,11 +30,6 @@ sharedtype-ap-exec ${project.version} - - ${project.groupId} - sharedtype-ap - ${project.version} - org.apache.maven maven-plugin-api diff --git a/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeGenMojo.java b/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeGenMojo.java index 9e9d6222..f64bc323 100644 --- a/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeGenMojo.java +++ b/build-tool-plugins/maven-plugin/src/main/java/online/sharedtype/maven/SharedTypeGenMojo.java @@ -16,6 +16,7 @@ import javax.inject.Inject; import java.nio.file.Paths; import java.util.Map; +import java.util.stream.Collectors; /** * Generate types from {@link SharedType} annotated classes. @@ -66,7 +67,7 @@ public void execute() throws MojoExecutionException { apExecutor.execute( project.getBasedir().toPath(), Paths.get(outputDirectory), - project.getCompileSourceRoots(), + project.getCompileSourceRoots().stream().map(Paths::get).collect(Collectors.toList()), project.getProperties().getProperty(PROP_PROJECT_SOURCE_ENCODING), new SharedTypeApCompilerOptions(propertyFile).toList() ); diff --git a/mount-tmpfs.sh b/mount-tmpfs.sh index d4578a43..3a86343b 100755 --- a/mount-tmpfs.sh +++ b/mount-tmpfs.sh @@ -27,6 +27,8 @@ mountTmpfs "$DIR/build-tool-plugins/maven-plugin/target" 32M mountTmpfs "$DIR/build-tool-plugins/maven-plugin/it/target" 16M mountTmpfs "$DIR/build-tool-plugins/gradle-plugin/.gradle" 16M mountTmpfs "$DIR/build-tool-plugins/gradle-plugin/build" 32M +mountTmpfs "$DIR/build-tool-plugins/gradle-plugin/it/.gradle" 16M +mountTmpfs "$DIR/build-tool-plugins/gradle-plugin/it/build" 16M mountTmpfs "$MAVEN_REPO_DIR" 64M mountTmpfs "$DIR/client-test/rust/target" 512M mountTmpfs "$DIR/client-test/typescript/dist" 32M diff --git a/pom.xml b/pom.xml index 26518444..60bf22ee 100644 --- a/pom.xml +++ b/pom.xml @@ -299,6 +299,7 @@ annotation processor + build-tool-plugins/exec build-tool-plugins/maven-plugin From 7bf335e8c12c280bc1261613b9868f1d9d6e4d15 Mon Sep 17 00:00:00 2001 From: Cause Chung Date: Sun, 20 Jul 2025 18:57:02 -0400 Subject: [PATCH 09/21] Add degradlew for debug gradle --- build-tool-plugins/gradle-plugin/it/degradlew | 3 +++ .../gradle-plugin/it/gradle/wrapper/gradle-wrapper.properties | 2 +- build-tool-plugins/maven-plugin/it/{mvne => demvnw} | 0 mvne => demvnw | 0 doc/Development.md | 4 ++-- 5 files changed, 6 insertions(+), 3 deletions(-) create mode 100755 build-tool-plugins/gradle-plugin/it/degradlew rename build-tool-plugins/maven-plugin/it/{mvne => demvnw} (100%) rename mvne => demvnw (100%) diff --git a/build-tool-plugins/gradle-plugin/it/degradlew b/build-tool-plugins/gradle-plugin/it/degradlew new file mode 100755 index 00000000..0d28dee1 --- /dev/null +++ b/build-tool-plugins/gradle-plugin/it/degradlew @@ -0,0 +1,3 @@ +#!/bin/sh +# port is 5005, can be seen from --info +./gradlew -Dorg.gradle.debug=true --no-daemon "$@" diff --git a/build-tool-plugins/gradle-plugin/it/gradle/wrapper/gradle-wrapper.properties b/build-tool-plugins/gradle-plugin/it/gradle/wrapper/gradle-wrapper.properties index 62f495df..d4081da4 100644 --- a/build-tool-plugins/gradle-plugin/it/gradle/wrapper/gradle-wrapper.properties +++ b/build-tool-plugins/gradle-plugin/it/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/build-tool-plugins/maven-plugin/it/mvne b/build-tool-plugins/maven-plugin/it/demvnw similarity index 100% rename from build-tool-plugins/maven-plugin/it/mvne rename to build-tool-plugins/maven-plugin/it/demvnw diff --git a/mvne b/demvnw similarity index 100% rename from mvne rename to demvnw diff --git a/doc/Development.md b/doc/Development.md index 187fada7..21cc324d 100644 --- a/doc/Development.md +++ b/doc/Development.md @@ -77,7 +77,7 @@ Style check: ``` Debug annotation processor by run maven build: ```bash -./mvne +./demvnw ``` Then attach your debugger on it. E.g. [IDEA run config](../.run/mvnDebug.run.xml). @@ -90,7 +90,7 @@ Compile specific classes, **along with debug, this is useful for developing a sp ### Maven Plugin Development Debug Maven plugin IT: ```bash -mvnd -pl maven-plugin clean install && ./mvne -pl maven-plugin/it sharedtype:gen +mvnd -pl maven-plugin clean install && ./demvnw -pl maven-plugin/it sharedtype:gen ``` ## Coding Style Guide / Keep it simple From b5d0013a11d8f5a9f0d0f8259226a0c95b01bee6 Mon Sep 17 00:00:00 2001 From: Cause Chung Date: Mon, 21 Jul 2025 20:14:40 -0400 Subject: [PATCH 10/21] Ignore non-dir src root --- .../exec/common/AnnotationProcessorExecutor.java | 4 +++- .../exec/common/AnnotationProcessorExecutorTest.java | 4 +++- .../sharedtype/gradle/SharedtypeConfigExtension.java | 11 +++++++++++ .../online/sharedtype/gradle/SharedtypeGenTask.java | 12 ++++++++---- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/AnnotationProcessorExecutor.java b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/AnnotationProcessorExecutor.java index 5f52819c..e3b3ab61 100644 --- a/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/AnnotationProcessorExecutor.java +++ b/build-tool-plugins/exec/src/main/java/online/sharedtype/exec/common/AnnotationProcessorExecutor.java @@ -59,7 +59,9 @@ public void execute(Path projectBaseDir, private static List walkAllSourceFiles(Iterable compileSourceRoots) throws IOException { SourceFileVisitor visitor = new SourceFileVisitor(); for (Path compileSourceRoot : compileSourceRoots) { - Files.walkFileTree(compileSourceRoot, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, visitor); + if (Files.isDirectory(compileSourceRoot)) { + Files.walkFileTree(compileSourceRoot, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, visitor); + } } return visitor.getFiles(); } diff --git a/build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/AnnotationProcessorExecutorTest.java b/build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/AnnotationProcessorExecutorTest.java index c5b86acf..1a346ea2 100644 --- a/build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/AnnotationProcessorExecutorTest.java +++ b/build-tool-plugins/exec/src/test/java/online/sharedtype/exec/common/AnnotationProcessorExecutorTest.java @@ -12,7 +12,9 @@ import javax.lang.model.SourceVersion; import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.Paths; import java.util.Collections; +import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -53,7 +55,7 @@ void setup() throws Exception { @Test void execute() throws Exception { - executor.execute(projectBaseDir, outputDir, Collections.singleton(sourceDir), "UTF-8", Collections.singleton("-proc:only")); + executor.execute(projectBaseDir, outputDir, List.of(sourceDir, Paths.get("not-exist")), "UTF-8", Collections.singleton("-proc:only")); verify(processor).init(any()); verify(processor, times(2)).process(any(), any()); assertThat(Files.readString(outputDir.resolve("out.txt"))).isEqualTo("OK"); diff --git a/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeConfigExtension.java b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeConfigExtension.java index 81a50315..efd45de9 100644 --- a/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeConfigExtension.java +++ b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeConfigExtension.java @@ -1,7 +1,9 @@ package online.sharedtype.gradle; import java.io.File; +import java.util.Collections; import java.util.Map; +import java.util.Set; /** @@ -11,10 +13,13 @@ * @author Cause Chung */ public final class SharedtypeConfigExtension { + private static final Set DEFAULT_SRC_SET_NAME = Collections.singleton("main"); + private File outputDirectory; private File propertyFile; private Map properties; private String sourceEncoding; + private Set sourceSetNames = DEFAULT_SRC_SET_NAME; public File getOutputDirectory() { return outputDirectory; @@ -40,4 +45,10 @@ public String getSourceEncoding() { public void setSourceEncoding(String sourceEncoding) { this.sourceEncoding = sourceEncoding; } + public Set getSourceSetNames() { + return sourceSetNames; + } + public void setSourceSetNames(Set sourceSetNames) { + this.sourceSetNames = sourceSetNames; + } } diff --git a/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGenTask.java b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGenTask.java index 3f7b0b49..df8c0953 100644 --- a/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGenTask.java +++ b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGenTask.java @@ -7,6 +7,8 @@ import org.gradle.api.DefaultTask; import org.gradle.api.Project; import org.gradle.api.plugins.JavaPluginExtension; +import org.gradle.api.tasks.SourceSet; +import org.gradle.api.tasks.SourceSetContainer; import org.gradle.api.tasks.TaskAction; import javax.inject.Inject; @@ -47,12 +49,14 @@ private void execute() throws Exception { if (javaPluginExtension == null) { throw new UnsupportedOperationException("Could not find JavaPluginExtension, only Java projects are supported."); } - List sourceDirs = javaPluginExtension.getSourceSets().stream() - .flatMap(srcSet -> srcSet.getAllSource().getSrcDirs().stream()) + List sourceSets = javaPluginExtension.getSourceSets().stream() + .filter(srcSet -> extension.getSourceSetNames().contains(srcSet.getName())) + .collect(Collectors.toList()); + List sourceDirs = sourceSets.stream() + .flatMap(srcSet -> srcSet.getAllJava().getSrcDirs().stream()) .map(File::toPath) - .filter(path -> path.getFileName().toString().endsWith(".java")) .collect(Collectors.toList()); - List classpathDependencies = javaPluginExtension.getSourceSets().stream() + List classpathDependencies = sourceSets.stream() .flatMap(srcSet -> srcSet.getCompileClasspath().getFiles().stream()) .collect(Collectors.toList()); From 81e901f9ae378e5811b1666b15f85b7a83a91398 Mon Sep 17 00:00:00 2001 From: Cause Chung Date: Mon, 21 Jul 2025 20:27:59 -0400 Subject: [PATCH 11/21] Add task description --- .../sharedtype/gradle/SharedtypeConfigExtension.java | 10 +++++----- .../online/sharedtype/gradle/SharedtypeGenTask.java | 5 ++--- .../sharedtype/gradle/SharedtypeGradlePlugin.java | 6 +++++- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeConfigExtension.java b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeConfigExtension.java index efd45de9..9fdabdab 100644 --- a/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeConfigExtension.java +++ b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeConfigExtension.java @@ -19,7 +19,7 @@ public final class SharedtypeConfigExtension { private File propertyFile; private Map properties; private String sourceEncoding; - private Set sourceSetNames = DEFAULT_SRC_SET_NAME; + private Set sourceSets = DEFAULT_SRC_SET_NAME; public File getOutputDirectory() { return outputDirectory; @@ -45,10 +45,10 @@ public String getSourceEncoding() { public void setSourceEncoding(String sourceEncoding) { this.sourceEncoding = sourceEncoding; } - public Set getSourceSetNames() { - return sourceSetNames; + public Set getSourceSets() { + return sourceSets; } - public void setSourceSetNames(Set sourceSetNames) { - this.sourceSetNames = sourceSetNames; + public void setSourceSets(Set sourceSets) { + this.sourceSets = sourceSets; } } diff --git a/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGenTask.java b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGenTask.java index df8c0953..cf8cb552 100644 --- a/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGenTask.java +++ b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGenTask.java @@ -8,7 +8,6 @@ import org.gradle.api.Project; import org.gradle.api.plugins.JavaPluginExtension; import org.gradle.api.tasks.SourceSet; -import org.gradle.api.tasks.SourceSetContainer; import org.gradle.api.tasks.TaskAction; import javax.inject.Inject; @@ -22,7 +21,7 @@ */ class SharedtypeGenTask extends DefaultTask { static final String TASK_NAME = "stypeGen"; - private static final String DEFAULT_OUTPUT_DIRECTORY = "generated-sources"; + private static final String DEFAULT_OUTPUT_DIRECTORY = "generated"; private final Project project; private SharedtypeConfigExtension extension; @@ -50,7 +49,7 @@ private void execute() throws Exception { throw new UnsupportedOperationException("Could not find JavaPluginExtension, only Java projects are supported."); } List sourceSets = javaPluginExtension.getSourceSets().stream() - .filter(srcSet -> extension.getSourceSetNames().contains(srcSet.getName())) + .filter(srcSet -> extension.getSourceSets().contains(srcSet.getName())) .collect(Collectors.toList()); List sourceDirs = sourceSets.stream() .flatMap(srcSet -> srcSet.getAllJava().getSrcDirs().stream()) diff --git a/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGradlePlugin.java b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGradlePlugin.java index a82ea95c..c6debf44 100644 --- a/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGradlePlugin.java +++ b/build-tool-plugins/gradle-plugin/src/main/java/online/sharedtype/gradle/SharedtypeGradlePlugin.java @@ -12,6 +12,10 @@ final class SharedtypeGradlePlugin implements Plugin { public void apply(Project project) { SharedtypeConfigExtension extension = new SharedtypeConfigExtension(); project.getExtensions().add(EXTENSION_METHOD_NAME, extension); - project.getTasks().register(SharedtypeGenTask.TASK_NAME, SharedtypeGenTask.class, task -> task.setExtension(extension)); + project.getTasks().register(SharedtypeGenTask.TASK_NAME, SharedtypeGenTask.class, task -> { + task.setExtension(extension); + task.setDescription("Generate shared types in target languages. See https://github.com/SharedType/sharedtype"); + task.setGroup("SharedType"); + }); } } From ca9ea5f382f784ec8fb227863e4106031bd53b95 Mon Sep 17 00:00:00 2001 From: Cause Chung Date: Mon, 21 Jul 2025 20:42:44 -0400 Subject: [PATCH 12/21] Add gradle usage doc --- .../gradle-plugin/it/build.gradle | 3 ++ .../gradle-plugin/it/custom-code.ts | 1 + doc/Usage.md | 37 ++++++++++++++++++- 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 build-tool-plugins/gradle-plugin/it/custom-code.ts diff --git a/build-tool-plugins/gradle-plugin/it/build.gradle b/build-tool-plugins/gradle-plugin/it/build.gradle index 0493e4e6..f6c116cf 100644 --- a/build-tool-plugins/gradle-plugin/it/build.gradle +++ b/build-tool-plugins/gradle-plugin/it/build.gradle @@ -18,4 +18,7 @@ repositories { sharedtype { propertyFile = project.file("sharedtype-test.properties") + properties = [ + "sharedtype.typescript.custom-code-path": project.file("custom-code.ts").absolutePath + ] } diff --git a/build-tool-plugins/gradle-plugin/it/custom-code.ts b/build-tool-plugins/gradle-plugin/it/custom-code.ts new file mode 100644 index 00000000..79a2f9a9 --- /dev/null +++ b/build-tool-plugins/gradle-plugin/it/custom-code.ts @@ -0,0 +1 @@ +// test gradle plugin custom code diff --git a/doc/Usage.md b/doc/Usage.md index 9d9830b4..258af6f2 100644 --- a/doc/Usage.md +++ b/doc/Usage.md @@ -1,6 +1,7 @@ # User Guide Menu: * [Setup Maven](#Maven) +* [Setup Gradle](#Gradle) * [A simple example](#A-simple-example) * [Configurations](#Configurations) @@ -37,6 +38,18 @@ Add sharedtype dependency: `sharedtype-maven-plugin` requires Maven 3.2.5+. Annotation processing can also be setup and configured via `maven-compiler-plugin`, see [example](../it/pom.xml). The advantage of using `sharedtype-maven-plugin` is that no need to execute other annotation processors if there are multiple. + +### Gradle +Add sharedtype plugin and annotation dependency: +```groovy +plugins { + id("online.sharedtype.sharedtype-gradle-plugin") version "${sharedtype.version}" +} + +dependencies { + compileOnly "online.sharedtype:sharedtype:${sharedtype.version}" +} +``` ## Usage ### A simple example @@ -47,7 +60,9 @@ record User(String name, int age, String email) {} ``` Execute: -* maven: `./mvnw stype:gen` (Why `stype`? Because it's easy to type while explicitly enough to remember.) +* maven: `./mvnw stype:gen` +* gradle: `./gradlew stypeGen` +(Why `stype`? Because it's easy to type while explicitly enough to remember.) By default, below code will be generated: ```typescript @@ -63,6 +78,8 @@ export interface User { #### Global options By default, the file `sharedtype.properties` on current cmd path will be picked up. You can customize the path: + +Maven: ```xml @@ -71,7 +88,16 @@ You can customize the path: ``` +Gradle: +```groovy +sharedtype { + propertyFile = project.file("sharedtype.properties") +} +``` + You can also specify individual properties: + +Maven: ```xml @@ -82,6 +108,15 @@ You can also specify individual properties: ``` +Gradle: +```groovy +sharedtype { + properties = [ + "sharedtype.typescript.custom-code-path": project.file("custom-code.ts").absolutePath + ] +} +``` + See [Default Properties](../processor/src/main/resources/sharedtype-default.properties) for all property entries. Execution goal `gen` can be bound to a Maven lifecycle phase. From 3c3442bfd507552b52b40345a7825e81eda1d934 Mon Sep 17 00:00:00 2001 From: Cause Chung Date: Tue, 22 Jul 2025 22:08:54 -0400 Subject: [PATCH 13/21] Add CI to execute gradle plugin build and test --- .github/workflows/ci.yaml | 23 +++++++++++++++---- .../gradle-plugin/build.gradle.kts | 11 ++++----- .../gradle-plugin/gradle/libs.versions.toml | 13 ----------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- build-tool-plugins/maven-plugin/pom.xml | 18 --------------- doc/Usage.md | 2 ++ mount-tmpfs.sh | 3 ++- 7 files changed, 27 insertions(+), 45 deletions(-) delete mode 100644 build-tool-plugins/gradle-plugin/gradle/libs.versions.toml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e3d86f3c..66de2fef 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -42,15 +42,23 @@ jobs: java-version: ${{env.JAVA_VERSION}} - uses: actions/cache@v4 with: - path: ~/.m2/repository - key: build_maven + path: | + ~/.m2/repository + ~/.gradle + key: manual_build_cache_key - name: Build And Test run: ./mvnw install -e --ntp -B - name: Test JPMS run: ./mvnw clean verify -pl it/java8 -P it-jpms -e --ntp -B - name: Test Maven 3.2.5 compatibility - working-directory: maven-plugin/it + working-directory: build-tool-plugins/maven-plugin/it run: ./mvnw stype:gen -e -B + - name: Build Gradle plugin + working-directory: build-tool-plugins/gradle-plugin + run: ./gradlew publishToMavenLocal --stacktrace + - name: Test Gradle plugin + working-directory: build-tool-plugins/gradle-plugin/it + run: ./gradlew stypeGen test --stacktrace - name: Javadoc run: ./mvnw -P release javadoc:javadoc --ntp -B - name: Upload generated sources @@ -92,13 +100,18 @@ jobs: # run: ls -lhR ~/.m2/repository/online/sharedtype - uses: actions/cache/restore@v4 with: - path: ~/.m2/repository - key: build_maven + path: | + ~/.m2/repository + ~/.gradle + key: manual_build_cache_key - name: Test run: ./mvnw verify -pl it/java8 -e --ntp -B - name: Maven Plugin Test working-directory: maven-plugin/it run: ./mvnw stype:gen -e -B + - name: Gradle Plugin Test + working-directory: build-tool-plugins/gradle-plugin/it + run: ./gradlew stypeGen test --stacktrace client_test: needs: [build_and_test] diff --git a/build-tool-plugins/gradle-plugin/build.gradle.kts b/build-tool-plugins/gradle-plugin/build.gradle.kts index 367096ec..e16971fc 100644 --- a/build-tool-plugins/gradle-plugin/build.gradle.kts +++ b/build-tool-plugins/gradle-plugin/build.gradle.kts @@ -4,9 +4,6 @@ plugins { } java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } @@ -20,10 +17,10 @@ repositories { } dependencies { - implementation(libs.sharedtype.ap) - implementation(libs.sharedtype.ap.exec) - testImplementation(libs.junit.jupiter) - testImplementation(libs.assertj) + implementation("online.sharedtype:sharedtype-ap:${project.version}") + implementation("online.sharedtype:sharedtype-ap-exec:${project.version}") + testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") + testImplementation("org.assertj:assertj-core:3.25.3") testRuntimeOnly("org.junit.platform:junit-platform-launcher") } diff --git a/build-tool-plugins/gradle-plugin/gradle/libs.versions.toml b/build-tool-plugins/gradle-plugin/gradle/libs.versions.toml deleted file mode 100644 index 6c4f5aa2..00000000 --- a/build-tool-plugins/gradle-plugin/gradle/libs.versions.toml +++ /dev/null @@ -1,13 +0,0 @@ -# This file was generated by the Gradle 'init' task. -# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format - -[versions] -junit-jupiter = "5.10.2" -assertj = "3.25.3" -sharedtype = "0.14.0-SNAPSHOT" - -[libraries] -junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" } -assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" } -sharedtype-ap = { module = "online.sharedtype:sharedtype-ap", version.ref = "sharedtype" } -sharedtype-ap-exec = { module = "online.sharedtype:sharedtype-ap-exec", version.ref = "sharedtype" } diff --git a/build-tool-plugins/gradle-plugin/it/gradle/wrapper/gradle-wrapper.properties b/build-tool-plugins/gradle-plugin/it/gradle/wrapper/gradle-wrapper.properties index d4081da4..b36ccea5 100644 --- a/build-tool-plugins/gradle-plugin/it/gradle/wrapper/gradle-wrapper.properties +++ b/build-tool-plugins/gradle-plugin/it/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/build-tool-plugins/maven-plugin/pom.xml b/build-tool-plugins/maven-plugin/pom.xml index 711b9f87..8a916ad0 100644 --- a/build-tool-plugins/maven-plugin/pom.xml +++ b/build-tool-plugins/maven-plugin/pom.xml @@ -109,24 +109,6 @@ - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - generate-sources - - add-source - - - - ${project.basedir}/src/common/java - - - - - diff --git a/doc/Usage.md b/doc/Usage.md index 258af6f2..6b158cd0 100644 --- a/doc/Usage.md +++ b/doc/Usage.md @@ -50,6 +50,8 @@ dependencies { compileOnly "online.sharedtype:sharedtype:${sharedtype.version}" } ``` + +`sharedtype-gradle-plugin` requires Gradle 7.6+. For old gradle versions, can setup annotation processing. ## Usage ### A simple example diff --git a/mount-tmpfs.sh b/mount-tmpfs.sh index 3a86343b..e26e2593 100755 --- a/mount-tmpfs.sh +++ b/mount-tmpfs.sh @@ -25,8 +25,9 @@ mountTmpfs "$DIR/e2e/target" 64M mountTmpfs "$DIR/build-tool-plugins/exec/target" 32M mountTmpfs "$DIR/build-tool-plugins/maven-plugin/target" 32M mountTmpfs "$DIR/build-tool-plugins/maven-plugin/it/target" 16M -mountTmpfs "$DIR/build-tool-plugins/gradle-plugin/.gradle" 16M +mountTmpfs "$DIR/build-tool-plugins/gradle-plugin/.gradle" 32M mountTmpfs "$DIR/build-tool-plugins/gradle-plugin/build" 32M +mountTmpfs "$DIR/build-tool-plugins/gradle-plugin/target" 32M mountTmpfs "$DIR/build-tool-plugins/gradle-plugin/it/.gradle" 16M mountTmpfs "$DIR/build-tool-plugins/gradle-plugin/it/build" 16M mountTmpfs "$MAVEN_REPO_DIR" 64M From ef617fbc86d0a2ffc242335898531ed935585a34 Mon Sep 17 00:00:00 2001 From: Cause Chung Date: Wed, 23 Jul 2025 21:30:37 -0400 Subject: [PATCH 14/21] Setup gradle plugin publish --- .github/workflows/ci.yaml | 4 +- .github/workflows/release.yaml | 2 + .../gradle-plugin/build.gradle.kts | 44 ++++++++++++++++--- .../gradle-plugin/gradle.properties | 8 ++-- .../gradle-plugin/it/build.gradle | 4 +- .../gradle-plugin/it/gradle.properties | 1 + misc/release.sh | 6 +++ setenv | 22 +++++----- 8 files changed, 66 insertions(+), 25 deletions(-) create mode 100644 build-tool-plugins/gradle-plugin/it/gradle.properties diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 66de2fef..c20ebe10 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -53,9 +53,9 @@ jobs: - name: Test Maven 3.2.5 compatibility working-directory: build-tool-plugins/maven-plugin/it run: ./mvnw stype:gen -e -B - - name: Build Gradle plugin + - name: Build and Test Gradle plugin working-directory: build-tool-plugins/gradle-plugin - run: ./gradlew publishToMavenLocal --stacktrace + run: ./gradlew test publishToMavenLocal --stacktrace - name: Test Gradle plugin working-directory: build-tool-plugins/gradle-plugin/it run: ./gradlew stypeGen test --stacktrace diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c8c16c85..46ab096e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -34,6 +34,8 @@ jobs: MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} SONATYPE_CENTRAL_USER: ${{ secrets.SONATYPE_CENTRAL_USER }} SONATYPE_CENTRAL_PASS: ${{ secrets.SONATYPE_CENTRAL_PASS }} + GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }} + GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }} run: | . ./misc/release.sh echo "new_version=$(cat NEW_VERSION.cache)" >> "$GITHUB_OUTPUT" diff --git a/build-tool-plugins/gradle-plugin/build.gradle.kts b/build-tool-plugins/gradle-plugin/build.gradle.kts index e16971fc..2c3516ee 100644 --- a/build-tool-plugins/gradle-plugin/build.gradle.kts +++ b/build-tool-plugins/gradle-plugin/build.gradle.kts @@ -1,6 +1,7 @@ plugins { `java-gradle-plugin` - `maven-publish` + id("com.gradle.plugin-publish") version "1.2.1" + id("com.vanniktech.maven.publish") version "0.34.0" } java { @@ -9,7 +10,6 @@ java { } group = "online.sharedtype" -version = "0.14.0-SNAPSHOT" repositories { mavenCentral() @@ -25,12 +25,46 @@ dependencies { } gradlePlugin { - val greeting by plugins.creating { - id = "online.sharedtype.sharedtype-gradle-plugin" - implementationClass = "online.sharedtype.gradle.SharedtypeGradlePlugin" + website = "https://github.com/SharedType/sharedtype" + vcsUrl = "https://github.com/SharedType/sharedtype.git" + plugins { + create("sharedtype") { + id = "online.sharedtype.sharedtype-gradle-plugin" + displayName = "SharedType Gradle Plugin" + description = "SharedType Gradle Plugin, SharedType is the tool to generate types from Java to target languages." + tags = listOf("sharedtype", "java", "annotation processing", "type generation") + implementationClass = "online.sharedtype.gradle.SharedtypeGradlePlugin" + } } } tasks.named("test") { useJUnitPlatform() } + +mavenPublishing { + pom { + name.set("SharedType Gradle Plugin") + description.set("SharedType Gradle Plugin, SharedType is the tool to generate types from Java to target languages.") + inceptionYear.set("2024") + url.set("https://github.com/SharedType/sharedtype") + licenses { + license { + name.set("CC BY 4.0") + url.set("https://creativecommons.org/licenses/by/4.0/deed.en") + distribution.set("https://creativecommons.org/licenses/by/4.0/deed.en") + } + } + developers { + developer { + id.set("cuzfrog") + name.set("Cause Chung") + url.set("https://github.com/cuzfrog") + } + } + scm { + url.set("https://github.com/SharedType/sharedtype") + connection.set("scm:git@github.com:SharedType/sharedtype.git") + } + } +} diff --git a/build-tool-plugins/gradle-plugin/gradle.properties b/build-tool-plugins/gradle-plugin/gradle.properties index 377538c9..6a7a5b48 100644 --- a/build-tool-plugins/gradle-plugin/gradle.properties +++ b/build-tool-plugins/gradle-plugin/gradle.properties @@ -1,5 +1,3 @@ -# This file was generated by the Gradle 'init' task. -# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties - -org.gradle.configuration-cache=true - +version=0.14.0-SNAPSHOT +mavenCentralPublishing=true +signAllPublications=true diff --git a/build-tool-plugins/gradle-plugin/it/build.gradle b/build-tool-plugins/gradle-plugin/it/build.gradle index f6c116cf..61a9d32e 100644 --- a/build-tool-plugins/gradle-plugin/it/build.gradle +++ b/build-tool-plugins/gradle-plugin/it/build.gradle @@ -1,6 +1,6 @@ plugins { id("java") - id("online.sharedtype.sharedtype-gradle-plugin") version "0.14.0-SNAPSHOT" + id("online.sharedtype.sharedtype-gradle-plugin") version project.version } java { @@ -9,7 +9,7 @@ java { } dependencies { - compileOnly("online.sharedtype:sharedtype:0.14.0-SNAPSHOT") + compileOnly("online.sharedtype:sharedtype:$project.version") } repositories { diff --git a/build-tool-plugins/gradle-plugin/it/gradle.properties b/build-tool-plugins/gradle-plugin/it/gradle.properties new file mode 100644 index 00000000..083f6652 --- /dev/null +++ b/build-tool-plugins/gradle-plugin/it/gradle.properties @@ -0,0 +1 @@ +version=0.14.0-SNAPSHOT diff --git a/misc/release.sh b/misc/release.sh index 552c2dd6..f143ce89 100755 --- a/misc/release.sh +++ b/misc/release.sh @@ -33,3 +33,9 @@ sed -i -E "s/[0-9]+\.[0-9\.\[0-9]+\.[0-9]+<\/sharedtype\.ve NEW_VERSION="$(increment_version "$version" 1)-SNAPSHOT" ./mvnw versions:set -DgenerateBackupPoms=false -DnewVersion="$NEW_VERSION" --ntp -B printf '%s' "$NEW_VERSION" > NEW_VERSION.cache + +# gradle plugin +cd build-tool-plugins/gradle-plugin || exit 1 +./gradlew publishPlugins -Pversion="$version" -Pgradle.publish.key="$GRADLE_PUBLISH_KEY" -Pgradle.publish.secret="$GRADLE_PUBLISH_SECRET" --no-daemon +sed -i -E "s/^version=.*\$/version=$version/g" build-tool-plugins/gradle-plugin/gradle.properties +sed -i -E "s/^version=.*\$/version=$version/g" build-tool-plugins/gradle-plugin/it/gradle.properties diff --git a/setenv b/setenv index 11636172..2b98650e 100755 --- a/setenv +++ b/setenv @@ -1,21 +1,21 @@ #!/bin/bash -version=$1 +javaVersion=$1 -if [ -z "$version" ];then - version="21" - echo "No version provided, use default jdk$version" +if [ -z "$javaVersion" ];then + javaVersion="21" + echo "No javaVersion provided, use default jdk$javaVersion" fi -if [[ "$version" == "17" ]];then +if [[ "$javaVersion" == "17" ]];then export JAVA_HOME=$JAVA17_HOME -elif [[ "$version" == "8" ]];then +elif [[ "$javaVersion" == "8" ]];then export JAVA_HOME=$JAVA8_HOME -elif [[ "$version" == "11" ]];then +elif [[ "$javaVersion" == "11" ]];then export JAVA_HOME=$JAVA11_HOME -elif [[ "$version" == "21" ]];then +elif [[ "$javaVersion" == "21" ]];then export JAVA_HOME=$JAVA21_HOME else - echo "Unsupported version $version" + echo "Unsupported javaVersion $javaVersion" return fi @@ -24,7 +24,7 @@ export PATH=$JAVA_HOME/bin:$MVND_HOME/bin:$PATH if [ -z "$MVND_HOME" ];then echo "MVND_HOME is not set, mvnd can speed up local build, see https://github.com/apache/maven-mvnd. (mvnd currently does not update plugins on each run, when developing maven plugin, use mvnw)" - java -version + java -javaVersion else - mvnd -version + mvnd -javaVersion fi From 15976b020941e2797134b10059f1c17e5421f249 Mon Sep 17 00:00:00 2001 From: Cause Chung Date: Wed, 23 Jul 2025 21:40:03 -0400 Subject: [PATCH 15/21] Only download gradle 7 in main build_and_test CI stage --- .github/workflows/ci.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c20ebe10..b450d132 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -55,10 +55,13 @@ jobs: run: ./mvnw stype:gen -e -B - name: Build and Test Gradle plugin working-directory: build-tool-plugins/gradle-plugin - run: ./gradlew test publishToMavenLocal --stacktrace - - name: Test Gradle plugin + run: ./gradlew --no-daemon test publishToMavenLocal --stacktrace + - name: Download Gradle in Gradle Plugin IT working-directory: build-tool-plugins/gradle-plugin/it - run: ./gradlew stypeGen test --stacktrace + run: ./gradlew --no-daemon --version +# - name: Test Gradle plugin # Gradle 7 does not support JDK21 +# working-directory: build-tool-plugins/gradle-plugin/it +# run: ./gradlew stypeGen test --stacktrace - name: Javadoc run: ./mvnw -P release javadoc:javadoc --ntp -B - name: Upload generated sources From 6a7d963e6414081c635fd737144d8503644d2a1c Mon Sep 17 00:00:00 2001 From: Cause Chung Date: Sat, 26 Jul 2025 12:01:36 -0400 Subject: [PATCH 16/21] Fix java8 it test by exclude mockito agent --- .../e2e/ObjectRemoteClientCaller.java | 1 + it/java8/pom.xml | 4 ++- pom.xml | 26 +++++++++++++++---- setenv | 4 +-- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/e2e/src/test/java/online/sharedtype/e2e/ObjectRemoteClientCaller.java b/e2e/src/test/java/online/sharedtype/e2e/ObjectRemoteClientCaller.java index 4740278c..f20753b5 100644 --- a/e2e/src/test/java/online/sharedtype/e2e/ObjectRemoteClientCaller.java +++ b/e2e/src/test/java/online/sharedtype/e2e/ObjectRemoteClientCaller.java @@ -31,6 +31,7 @@ final class ObjectRemoteClientCaller { objectMapper.registerModule(module); } + @SuppressWarnings("unchecked") T call(T t, SharedType.TargetType targetCodeType) throws Exception { String simpleName = t.getClass().getSimpleName(); String json = objectMapper.writeValueAsString(t); diff --git a/it/java8/pom.xml b/it/java8/pom.xml index 8df0d803..c47accf6 100644 --- a/it/java8/pom.xml +++ b/it/java8/pom.xml @@ -20,7 +20,9 @@ - + + maven-surefire-plugin + diff --git a/pom.xml b/pom.xml index 60bf22ee..9096f3d3 100644 --- a/pom.xml +++ b/pom.xml @@ -215,11 +215,6 @@ maven-surefire-plugin 3.2.5 - - - -javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar - - maven-jar-plugin @@ -360,5 +355,26 @@ + + mockito-agent + + [17,) + + + + + + maven-surefire-plugin + 3.2.5 + + + -javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar + + + + + + + diff --git a/setenv b/setenv index 2b98650e..eeb5700a 100755 --- a/setenv +++ b/setenv @@ -24,7 +24,7 @@ export PATH=$JAVA_HOME/bin:$MVND_HOME/bin:$PATH if [ -z "$MVND_HOME" ];then echo "MVND_HOME is not set, mvnd can speed up local build, see https://github.com/apache/maven-mvnd. (mvnd currently does not update plugins on each run, when developing maven plugin, use mvnw)" - java -javaVersion + java -version else - mvnd -javaVersion + mvnd -version fi From 969c307fb43fbd64be35c0f3359d1602ecbb1027 Mon Sep 17 00:00:00 2001 From: Cause Chung Date: Sat, 26 Jul 2025 12:44:46 -0400 Subject: [PATCH 17/21] Fix mockito and ci --- .github/workflows/ci.yaml | 2 +- build-tool-plugins/exec/pom.xml | 13 +++++++++++++ build-tool-plugins/maven-plugin/pom.xml | 8 ++++++++ it/java8/pom.xml | 8 -------- pom.xml | 21 --------------------- processor/pom.xml | 8 ++++++++ 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b450d132..0dbf571f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -110,7 +110,7 @@ jobs: - name: Test run: ./mvnw verify -pl it/java8 -e --ntp -B - name: Maven Plugin Test - working-directory: maven-plugin/it + working-directory: build-tool-plugins/maven-plugin/it run: ./mvnw stype:gen -e -B - name: Gradle Plugin Test working-directory: build-tool-plugins/gradle-plugin/it diff --git a/build-tool-plugins/exec/pom.xml b/build-tool-plugins/exec/pom.xml index 9805fcc4..21a3be76 100644 --- a/build-tool-plugins/exec/pom.xml +++ b/build-tool-plugins/exec/pom.xml @@ -41,4 +41,17 @@ test + + + + + maven-surefire-plugin + + + -javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar + + + + + diff --git a/build-tool-plugins/maven-plugin/pom.xml b/build-tool-plugins/maven-plugin/pom.xml index 8a916ad0..992017b4 100644 --- a/build-tool-plugins/maven-plugin/pom.xml +++ b/build-tool-plugins/maven-plugin/pom.xml @@ -89,6 +89,14 @@ + + maven-surefire-plugin + + + -javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar + + + maven-clean-plugin diff --git a/it/java8/pom.xml b/it/java8/pom.xml index c47accf6..9b7be552 100644 --- a/it/java8/pom.xml +++ b/it/java8/pom.xml @@ -18,14 +18,6 @@ ${java.version} - - - - maven-surefire-plugin - - - - it-no-jpms diff --git a/pom.xml b/pom.xml index 9096f3d3..b3155d4d 100644 --- a/pom.xml +++ b/pom.xml @@ -355,26 +355,5 @@ - - mockito-agent - - [17,) - - - - - - maven-surefire-plugin - 3.2.5 - - - -javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar - - - - - - - diff --git a/processor/pom.xml b/processor/pom.xml index 27626d71..e479b4fb 100644 --- a/processor/pom.xml +++ b/processor/pom.xml @@ -110,6 +110,14 @@ + + maven-surefire-plugin + + + -javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar + + + org.codehaus.mojo build-helper-maven-plugin From d4b8a58d4893117a87ce82b4c09152c4ef482df6 Mon Sep 17 00:00:00 2001 From: Cause Chung Date: Sat, 26 Jul 2025 18:03:19 -0400 Subject: [PATCH 18/21] Fix gradle plugin it version --- build-tool-plugins/gradle-plugin/build.gradle.kts | 2 +- build-tool-plugins/gradle-plugin/it/build.gradle | 6 +++--- build-tool-plugins/gradle-plugin/it/gradle.properties | 2 +- misc/release.sh | 2 +- misc/setversion.sh | 2 ++ 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build-tool-plugins/gradle-plugin/build.gradle.kts b/build-tool-plugins/gradle-plugin/build.gradle.kts index 2c3516ee..63b1594f 100644 --- a/build-tool-plugins/gradle-plugin/build.gradle.kts +++ b/build-tool-plugins/gradle-plugin/build.gradle.kts @@ -1,7 +1,7 @@ plugins { `java-gradle-plugin` id("com.gradle.plugin-publish") version "1.2.1" - id("com.vanniktech.maven.publish") version "0.34.0" + id("com.vanniktech.maven.publish") version "0.34.0" //currently only used for local publish, plugin is published bto Gradle Plugin Portal } java { diff --git a/build-tool-plugins/gradle-plugin/it/build.gradle b/build-tool-plugins/gradle-plugin/it/build.gradle index 61a9d32e..3f853ae5 100644 --- a/build-tool-plugins/gradle-plugin/it/build.gradle +++ b/build-tool-plugins/gradle-plugin/it/build.gradle @@ -1,6 +1,6 @@ plugins { - id("java") - id("online.sharedtype.sharedtype-gradle-plugin") version project.version + id "java" + id "online.sharedtype.sharedtype-gradle-plugin" version "${projectVersion}" } java { @@ -9,7 +9,7 @@ java { } dependencies { - compileOnly("online.sharedtype:sharedtype:$project.version") + compileOnly "online.sharedtype:sharedtype:${projectVersion}" } repositories { diff --git a/build-tool-plugins/gradle-plugin/it/gradle.properties b/build-tool-plugins/gradle-plugin/it/gradle.properties index 083f6652..77694d59 100644 --- a/build-tool-plugins/gradle-plugin/it/gradle.properties +++ b/build-tool-plugins/gradle-plugin/it/gradle.properties @@ -1 +1 @@ -version=0.14.0-SNAPSHOT +projectVersion=0.14.0-SNAPSHOT diff --git a/misc/release.sh b/misc/release.sh index f143ce89..d2d04d9e 100755 --- a/misc/release.sh +++ b/misc/release.sh @@ -38,4 +38,4 @@ printf '%s' "$NEW_VERSION" > NEW_VERSION.cache cd build-tool-plugins/gradle-plugin || exit 1 ./gradlew publishPlugins -Pversion="$version" -Pgradle.publish.key="$GRADLE_PUBLISH_KEY" -Pgradle.publish.secret="$GRADLE_PUBLISH_SECRET" --no-daemon sed -i -E "s/^version=.*\$/version=$version/g" build-tool-plugins/gradle-plugin/gradle.properties -sed -i -E "s/^version=.*\$/version=$version/g" build-tool-plugins/gradle-plugin/it/gradle.properties +sed -i -E "s/^projectVersion=.*\$/projectVersion=$version/g" build-tool-plugins/gradle-plugin/it/gradle.properties diff --git a/misc/setversion.sh b/misc/setversion.sh index a45b2c53..5c82fa1f 100755 --- a/misc/setversion.sh +++ b/misc/setversion.sh @@ -1,3 +1,5 @@ #!/bin/bash ./mvnw versions:set -DgenerateBackupPoms=false -DnewVersion="$1" --ntp +sed -i -E "s/^version=.*\$/version=$1/g" build-tool-plugins/gradle-plugin/gradle.properties +sed -i -E "s/^projectVersion=.*\$/projectVersion=$1/g" build-tool-plugins/gradle-plugin/it/gradle.properties From 0ddd2548879b5a6ab6f5b466c72bc467d9a9a618 Mon Sep 17 00:00:00 2001 From: Cause Chung Date: Sat, 26 Jul 2025 18:13:00 -0400 Subject: [PATCH 19/21] Refine doc --- doc/Development.md | 6 ++++-- doc/Usage.md | 10 ++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/doc/Development.md b/doc/Development.md index 21cc324d..a62c2c67 100644 --- a/doc/Development.md +++ b/doc/Development.md @@ -16,7 +16,8 @@ Internal types also have javadoc for more information. * `e2e` contains e2e json 2-way serialization and deserialization tests against target languages' http servers. * `build-tool-plugins` contains Maven and Gradle plugin for SharedType annotation. * `exec` contains generic annotation processor executor. - * `maven-plugin/it` contains integration tests for maven plugin. + * `maven-plugin` and `maven-plugin/it` contains Maven plugin and integration tests. + * `gradle-plugin` and `gradle-plugin/it` contains Gradle plugin and integration tests. Domain types are shared among processor and integration tests to reduce maven module count. @@ -33,7 +34,7 @@ Optionally mount tmpfs to save your disk by: ``` Optionally setup `MVND_HOME` to use [maven daemon](https://github.com/apache/maven-mvnd) by `mvnd` -Choose maven profiles in IDE accordingly as below. +**Choose maven profiles in IDE accordingly as below.** ### Maven profiles * `dev` and `release` - control whether to include test maven modules during build. @@ -41,6 +42,7 @@ Choose maven profiles in IDE accordingly as below. IDE may not able to properly resolve classes in `internal` folder for both modules. Enable this profile to enable `it` modules in IDE, and disable it when developing against `processor` module. * `it-no-jpms` and `it-jpms` - control whether to enable Java 9 Jigsaw module test in `it`. `it/java8` sources are reused to test on jdk9. Turn on `it-jpms` for IDE to correctly resolve `it/java8` classes. +* `java8-jdk-tools-jar` - auto managed for adding `tools.jar` dependency for annotation processor. * `dev-build-tool` - controls build tool plugin modules. ## Development diff --git a/doc/Usage.md b/doc/Usage.md index 6b158cd0..dca513ef 100644 --- a/doc/Usage.md +++ b/doc/Usage.md @@ -41,13 +41,19 @@ The advantage of using `sharedtype-maven-plugin` is that no need to execute othe ### Gradle Add sharedtype plugin and annotation dependency: +```properties +# gradle.properties +sharedtypeVersion= +``` + ```groovy +// build.gradle plugins { - id("online.sharedtype.sharedtype-gradle-plugin") version "${sharedtype.version}" + id "online.sharedtype.sharedtype-gradle-plugin" version "${sharedtypeVersion}" } dependencies { - compileOnly "online.sharedtype:sharedtype:${sharedtype.version}" + compileOnly "online.sharedtype:sharedtype:${sharedtypeVersion}" } ``` From dc072e8e9c22a72b03af8f253f112458bca2dc5c Mon Sep 17 00:00:00 2001 From: Cause Chung Date: Sat, 26 Jul 2025 18:14:09 -0400 Subject: [PATCH 20/21] Set project version to 1 --- annotation/pom.xml | 2 +- build-tool-plugins/exec/pom.xml | 4 ++-- build-tool-plugins/gradle-plugin/gradle.properties | 2 +- build-tool-plugins/gradle-plugin/it/gradle.properties | 2 +- build-tool-plugins/maven-plugin/it/pom.xml | 2 +- build-tool-plugins/maven-plugin/pom.xml | 4 ++-- e2e/pom.xml | 2 +- it/java17/pom.xml | 2 +- it/java8/pom.xml | 2 +- it/pom.xml | 2 +- pom.xml | 2 +- processor/pom.xml | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/annotation/pom.xml b/annotation/pom.xml index d89ffbb0..e1097279 100644 --- a/annotation/pom.xml +++ b/annotation/pom.xml @@ -4,7 +4,7 @@ online.sharedtype sharedtype-parent - 0.14.0-SNAPSHOT + 1.0.0-SNAPSHOT ../pom.xml diff --git a/build-tool-plugins/exec/pom.xml b/build-tool-plugins/exec/pom.xml index 21a3be76..d6a434b4 100644 --- a/build-tool-plugins/exec/pom.xml +++ b/build-tool-plugins/exec/pom.xml @@ -5,12 +5,12 @@ online.sharedtype sharedtype-parent - 0.14.0-SNAPSHOT + 1.0.0-SNAPSHOT ../../pom.xml sharedtype-ap-exec - 0.14.0-SNAPSHOT + 1.0.0-SNAPSHOT SharedType Annotation Processor Executor Call javac to execute annotation processing. diff --git a/build-tool-plugins/gradle-plugin/gradle.properties b/build-tool-plugins/gradle-plugin/gradle.properties index 6a7a5b48..fe7105d7 100644 --- a/build-tool-plugins/gradle-plugin/gradle.properties +++ b/build-tool-plugins/gradle-plugin/gradle.properties @@ -1,3 +1,3 @@ -version=0.14.0-SNAPSHOT +version=1.0.0-SNAPSHOT mavenCentralPublishing=true signAllPublications=true diff --git a/build-tool-plugins/gradle-plugin/it/gradle.properties b/build-tool-plugins/gradle-plugin/it/gradle.properties index 77694d59..68d821f4 100644 --- a/build-tool-plugins/gradle-plugin/it/gradle.properties +++ b/build-tool-plugins/gradle-plugin/it/gradle.properties @@ -1 +1 @@ -projectVersion=0.14.0-SNAPSHOT +projectVersion=1.0.0-SNAPSHOT diff --git a/build-tool-plugins/maven-plugin/it/pom.xml b/build-tool-plugins/maven-plugin/it/pom.xml index bc09131f..b0b59f82 100644 --- a/build-tool-plugins/maven-plugin/it/pom.xml +++ b/build-tool-plugins/maven-plugin/it/pom.xml @@ -5,7 +5,7 @@ online.sharedtype sharedtype-parent - 0.14.0-SNAPSHOT + 1.0.0-SNAPSHOT ../../../pom.xml diff --git a/build-tool-plugins/maven-plugin/pom.xml b/build-tool-plugins/maven-plugin/pom.xml index 992017b4..d2d46610 100644 --- a/build-tool-plugins/maven-plugin/pom.xml +++ b/build-tool-plugins/maven-plugin/pom.xml @@ -5,12 +5,12 @@ online.sharedtype sharedtype-parent - 0.14.0-SNAPSHOT + 1.0.0-SNAPSHOT ../../pom.xml sharedtype-maven-plugin - 0.14.0-SNAPSHOT + 1.0.0-SNAPSHOT maven-plugin SharedType Maven Plugin diff --git a/e2e/pom.xml b/e2e/pom.xml index 2b267e02..667aee18 100644 --- a/e2e/pom.xml +++ b/e2e/pom.xml @@ -4,7 +4,7 @@ online.sharedtype sharedtype-parent - 0.14.0-SNAPSHOT + 1.0.0-SNAPSHOT ../pom.xml diff --git a/it/java17/pom.xml b/it/java17/pom.xml index 6c1740ab..859b5525 100644 --- a/it/java17/pom.xml +++ b/it/java17/pom.xml @@ -4,7 +4,7 @@ online.sharedtype sharedtype-it-parent - 0.14.0-SNAPSHOT + 1.0.0-SNAPSHOT ../pom.xml diff --git a/it/java8/pom.xml b/it/java8/pom.xml index 9b7be552..1c849877 100644 --- a/it/java8/pom.xml +++ b/it/java8/pom.xml @@ -4,7 +4,7 @@ online.sharedtype sharedtype-it-parent - 0.14.0-SNAPSHOT + 1.0.0-SNAPSHOT ../pom.xml diff --git a/it/pom.xml b/it/pom.xml index e597939c..5622debf 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -5,7 +5,7 @@ online.sharedtype sharedtype-parent - 0.14.0-SNAPSHOT + 1.0.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index b3155d4d..446497ac 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ online.sharedtype sharedtype-parent - 0.14.0-SNAPSHOT + 1.0.0-SNAPSHOT pom SharedType Parent diff --git a/processor/pom.xml b/processor/pom.xml index e479b4fb..087315cf 100644 --- a/processor/pom.xml +++ b/processor/pom.xml @@ -5,7 +5,7 @@ online.sharedtype sharedtype-parent - 0.14.0-SNAPSHOT + 1.0.0-SNAPSHOT ../pom.xml From eceb0354c894d783d15349ef71c95fff63171efc Mon Sep 17 00:00:00 2001 From: Cause Chung Date: Tue, 29 Jul 2025 18:59:06 -0400 Subject: [PATCH 21/21] Set version to 0.13.1 --- annotation/pom.xml | 2 +- build-tool-plugins/exec/pom.xml | 4 ++-- build-tool-plugins/gradle-plugin/gradle.properties | 2 +- build-tool-plugins/gradle-plugin/it/gradle.properties | 2 +- build-tool-plugins/maven-plugin/it/pom.xml | 2 +- build-tool-plugins/maven-plugin/pom.xml | 4 ++-- e2e/pom.xml | 2 +- it/java17/pom.xml | 2 +- it/java8/pom.xml | 2 +- it/pom.xml | 2 +- pom.xml | 2 +- processor/pom.xml | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/annotation/pom.xml b/annotation/pom.xml index e1097279..07d4b397 100644 --- a/annotation/pom.xml +++ b/annotation/pom.xml @@ -4,7 +4,7 @@ online.sharedtype sharedtype-parent - 1.0.0-SNAPSHOT + 0.13.1-SNAPSHOT ../pom.xml diff --git a/build-tool-plugins/exec/pom.xml b/build-tool-plugins/exec/pom.xml index d6a434b4..49083137 100644 --- a/build-tool-plugins/exec/pom.xml +++ b/build-tool-plugins/exec/pom.xml @@ -5,12 +5,12 @@ online.sharedtype sharedtype-parent - 1.0.0-SNAPSHOT + 0.13.1-SNAPSHOT ../../pom.xml sharedtype-ap-exec - 1.0.0-SNAPSHOT + 0.13.1-SNAPSHOT SharedType Annotation Processor Executor Call javac to execute annotation processing. diff --git a/build-tool-plugins/gradle-plugin/gradle.properties b/build-tool-plugins/gradle-plugin/gradle.properties index fe7105d7..feeb330f 100644 --- a/build-tool-plugins/gradle-plugin/gradle.properties +++ b/build-tool-plugins/gradle-plugin/gradle.properties @@ -1,3 +1,3 @@ -version=1.0.0-SNAPSHOT +version=0.13.1-SNAPSHOT mavenCentralPublishing=true signAllPublications=true diff --git a/build-tool-plugins/gradle-plugin/it/gradle.properties b/build-tool-plugins/gradle-plugin/it/gradle.properties index 68d821f4..e6e1a1cf 100644 --- a/build-tool-plugins/gradle-plugin/it/gradle.properties +++ b/build-tool-plugins/gradle-plugin/it/gradle.properties @@ -1 +1 @@ -projectVersion=1.0.0-SNAPSHOT +projectVersion=0.13.1-SNAPSHOT diff --git a/build-tool-plugins/maven-plugin/it/pom.xml b/build-tool-plugins/maven-plugin/it/pom.xml index b0b59f82..c577fe46 100644 --- a/build-tool-plugins/maven-plugin/it/pom.xml +++ b/build-tool-plugins/maven-plugin/it/pom.xml @@ -5,7 +5,7 @@ online.sharedtype sharedtype-parent - 1.0.0-SNAPSHOT + 0.13.1-SNAPSHOT ../../../pom.xml diff --git a/build-tool-plugins/maven-plugin/pom.xml b/build-tool-plugins/maven-plugin/pom.xml index d2d46610..e2cb8fa9 100644 --- a/build-tool-plugins/maven-plugin/pom.xml +++ b/build-tool-plugins/maven-plugin/pom.xml @@ -5,12 +5,12 @@ online.sharedtype sharedtype-parent - 1.0.0-SNAPSHOT + 0.13.1-SNAPSHOT ../../pom.xml sharedtype-maven-plugin - 1.0.0-SNAPSHOT + 0.13.1-SNAPSHOT maven-plugin SharedType Maven Plugin diff --git a/e2e/pom.xml b/e2e/pom.xml index 667aee18..325ea010 100644 --- a/e2e/pom.xml +++ b/e2e/pom.xml @@ -4,7 +4,7 @@ online.sharedtype sharedtype-parent - 1.0.0-SNAPSHOT + 0.13.1-SNAPSHOT ../pom.xml diff --git a/it/java17/pom.xml b/it/java17/pom.xml index 859b5525..8d91e812 100644 --- a/it/java17/pom.xml +++ b/it/java17/pom.xml @@ -4,7 +4,7 @@ online.sharedtype sharedtype-it-parent - 1.0.0-SNAPSHOT + 0.13.1-SNAPSHOT ../pom.xml diff --git a/it/java8/pom.xml b/it/java8/pom.xml index 1c849877..d326be26 100644 --- a/it/java8/pom.xml +++ b/it/java8/pom.xml @@ -4,7 +4,7 @@ online.sharedtype sharedtype-it-parent - 1.0.0-SNAPSHOT + 0.13.1-SNAPSHOT ../pom.xml diff --git a/it/pom.xml b/it/pom.xml index 5622debf..c9c98b73 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -5,7 +5,7 @@ online.sharedtype sharedtype-parent - 1.0.0-SNAPSHOT + 0.13.1-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 446497ac..417f97bb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ online.sharedtype sharedtype-parent - 1.0.0-SNAPSHOT + 0.13.1-SNAPSHOT pom SharedType Parent diff --git a/processor/pom.xml b/processor/pom.xml index 087315cf..877313e6 100644 --- a/processor/pom.xml +++ b/processor/pom.xml @@ -5,7 +5,7 @@ online.sharedtype sharedtype-parent - 1.0.0-SNAPSHOT + 0.13.1-SNAPSHOT ../pom.xml