From 14a5ccf3c2e236e9b805fc2ff5eb2c443b872ef3 Mon Sep 17 00:00:00 2001 From: JFronny Date: Thu, 18 Apr 2024 22:04:25 +0200 Subject: [PATCH] fix(serialize-generator): Move example into tests to not pollute modules --- .../build.gradle.kts | 16 ---------------- .../src/main/java/module-info.java | 7 ------- commons-serialize-generator/build.gradle.kts | 3 +++ .../generator/test}/ExampleAdapter.java | 2 +- .../commons/serialize/generator/test}/Main.java | 3 +-- .../serialize/generator/test}/Static.java | 2 +- settings.gradle.kts | 1 - 7 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 commons-serialize-generator-example/build.gradle.kts delete mode 100644 commons-serialize-generator-example/src/main/java/module-info.java rename {commons-serialize-generator-example/src/main/java/io/gitlab/jfronny/commons/serialize/generator/example => commons-serialize-generator/src/test/java/io/gitlab/jfronny/commons/serialize/generator/test}/ExampleAdapter.java (89%) rename {commons-serialize-generator-example/src/main/java/io/gitlab/jfronny/commons/serialize/generator/example => commons-serialize-generator/src/test/java/io/gitlab/jfronny/commons/serialize/generator/test}/Main.java (97%) rename {commons-serialize-generator-example/src/main/java/io/gitlab/jfronny/commons/serialize/generator/example => commons-serialize-generator/src/test/java/io/gitlab/jfronny/commons/serialize/generator/test}/Static.java (79%) diff --git a/commons-serialize-generator-example/build.gradle.kts b/commons-serialize-generator-example/build.gradle.kts deleted file mode 100644 index d125ee6..0000000 --- a/commons-serialize-generator-example/build.gradle.kts +++ /dev/null @@ -1,16 +0,0 @@ -plugins { - java - application -} - -repositories { - mavenCentral() -} - -dependencies { - implementation(projects.commonsSerialize) - implementation(projects.commonsSerializeDatabindApi) - compileOnly(projects.commonsSerializeGeneratorAnnotations) - annotationProcessor(projects.commonsSerializeGenerator) -} - diff --git a/commons-serialize-generator-example/src/main/java/module-info.java b/commons-serialize-generator-example/src/main/java/module-info.java deleted file mode 100644 index 7890707..0000000 --- a/commons-serialize-generator-example/src/main/java/module-info.java +++ /dev/null @@ -1,7 +0,0 @@ -module io.gitlab.jfronny.commons.serialize.generator.example { - requires static io.gitlab.jfronny.commons.serialize.generator.annotations; - requires io.gitlab.jfronny.commons; - requires io.gitlab.jfronny.commons.serialize; - requires io.gitlab.jfronny.commons.serialize.databind.api; - exports io.gitlab.jfronny.commons.serialize.generator.example; -} \ No newline at end of file diff --git a/commons-serialize-generator/build.gradle.kts b/commons-serialize-generator/build.gradle.kts index a464d89..b57cf51 100644 --- a/commons-serialize-generator/build.gradle.kts +++ b/commons-serialize-generator/build.gradle.kts @@ -10,6 +10,9 @@ dependencies { implementation(projects.commonsSerializeGeneratorAnnotations) implementation(projects.commonsSerializeDatabindApi) implementation(libs.java.poet) + + testAnnotationProcessor(sourceSets.main.get().output) + configurations.testAnnotationProcessor.get().extendsFrom(configurations.implementation.get()) } publishing { diff --git a/commons-serialize-generator-example/src/main/java/io/gitlab/jfronny/commons/serialize/generator/example/ExampleAdapter.java b/commons-serialize-generator/src/test/java/io/gitlab/jfronny/commons/serialize/generator/test/ExampleAdapter.java similarity index 89% rename from commons-serialize-generator-example/src/main/java/io/gitlab/jfronny/commons/serialize/generator/example/ExampleAdapter.java rename to commons-serialize-generator/src/test/java/io/gitlab/jfronny/commons/serialize/generator/test/ExampleAdapter.java index 45988d6..10a143f 100644 --- a/commons-serialize-generator-example/src/main/java/io/gitlab/jfronny/commons/serialize/generator/example/ExampleAdapter.java +++ b/commons-serialize-generator/src/test/java/io/gitlab/jfronny/commons/serialize/generator/test/ExampleAdapter.java @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.commons.serialize.generator.example; +package io.gitlab.jfronny.commons.serialize.generator.test; import io.gitlab.jfronny.commons.serialize.SerializeReader; import io.gitlab.jfronny.commons.serialize.SerializeWriter; diff --git a/commons-serialize-generator-example/src/main/java/io/gitlab/jfronny/commons/serialize/generator/example/Main.java b/commons-serialize-generator/src/test/java/io/gitlab/jfronny/commons/serialize/generator/test/Main.java similarity index 97% rename from commons-serialize-generator-example/src/main/java/io/gitlab/jfronny/commons/serialize/generator/example/Main.java rename to commons-serialize-generator/src/test/java/io/gitlab/jfronny/commons/serialize/generator/test/Main.java index a8b9d55..277edb1 100644 --- a/commons-serialize-generator-example/src/main/java/io/gitlab/jfronny/commons/serialize/generator/example/Main.java +++ b/commons-serialize-generator/src/test/java/io/gitlab/jfronny/commons/serialize/generator/test/Main.java @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.commons.serialize.generator.example; +package io.gitlab.jfronny.commons.serialize.generator.test; import io.gitlab.jfronny.commons.serialize.SerializeReader; import io.gitlab.jfronny.commons.serialize.SerializeWriter; @@ -8,7 +8,6 @@ import io.gitlab.jfronny.commons.serialize.generator.annotations.GPrefer; import io.gitlab.jfronny.commons.serialize.generator.annotations.GSerializable; import io.gitlab.jfronny.commons.serialize.generator.annotations.GWith; -import java.io.Writer; import java.util.*; public class Main { diff --git a/commons-serialize-generator-example/src/main/java/io/gitlab/jfronny/commons/serialize/generator/example/Static.java b/commons-serialize-generator/src/test/java/io/gitlab/jfronny/commons/serialize/generator/test/Static.java similarity index 79% rename from commons-serialize-generator-example/src/main/java/io/gitlab/jfronny/commons/serialize/generator/example/Static.java rename to commons-serialize-generator/src/test/java/io/gitlab/jfronny/commons/serialize/generator/test/Static.java index 68d888a..abb2b33 100644 --- a/commons-serialize-generator-example/src/main/java/io/gitlab/jfronny/commons/serialize/generator/example/Static.java +++ b/commons-serialize-generator/src/test/java/io/gitlab/jfronny/commons/serialize/generator/test/Static.java @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.commons.serialize.generator.example; +package io.gitlab.jfronny.commons.serialize.generator.test; import io.gitlab.jfronny.commons.serialize.generator.annotations.GSerializable; diff --git a/settings.gradle.kts b/settings.gradle.kts index e69f15b..a1c6145 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,7 +15,6 @@ include("commons-serialize-databind-sql") include("commons-serialize-generator-core") include("commons-serialize-generator-annotations") include("commons-serialize-generator") -include("commons-serialize-generator-example") // new muscript include("muscript-all") include("muscript-core")