Use runtime classpath to run generator (#263)

creek-service · Jun 25, 2024 · b8e25f7 · b8e25f7
1 parent 5dc3618
commit b8e25f7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/main/java/org/creekservice/api/json/schema/gradle/plugin/JsonSchemaPlugin.java b/src/main/java/org/creekservice/api/json/schema/gradle/plugin/JsonSchemaPlugin.java
@@ -122,7 +122,7 @@ private void registerGenerateSchemaTask(
                         afterEvaluate(
                                 proj,
                                 GENERATE_SCHEMA_TASK_NAME,
-                                JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME,
+                                JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME,
                                 List.of(
                                         JavaPlugin.COMPILE_JAVA_TASK_NAME,
                                         "compileKotlin",
@@ -144,7 +144,7 @@ private void registerGenerateTestSchemaTask(
                         afterEvaluate(
                                 proj,
                                 GENERATE_TEST_SCHEMA_TASK_NAME,
-                                JavaPlugin.TEST_COMPILE_CLASSPATH_CONFIGURATION_NAME,
+                                JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME,
                                 List.of(
                                         JavaPlugin.COMPILE_TEST_JAVA_TASK_NAME,
                                         "compileTestKotlin",

diff --git a/src/main/java/org/creekservice/api/json/schema/gradle/plugin/task/GenerateJsonSchema.java b/src/main/java/org/creekservice/api/json/schema/gradle/plugin/task/GenerateJsonSchema.java
@@ -251,17 +251,28 @@ public void setExtraArgumentsFromOption(final List<String> args) {
     public void run() {
         checkDependenciesIncludesRunner();
 
+        final boolean useModulePath = useModulePath();
+        final List<String> arguments = arguments();
+        final List<String> jvmArgs = jvmArgs();
+
+        getLogger().info("Executing JSON schema generator with:");
+        getLogger().info("useModulePath: {}", useModulePath);
+        getLogger().info("arguments: {}", arguments);
+        getLogger().info("jvmArgs: {}", jvmArgs);
+        getLogger().info("classpath:");
+        classPath.forEach(f -> getLogger().info(f.getAbsolutePath()));
+
         getProject()
                 .javaexec(
                         spec -> {
                             spec.getMainClass()
                                     .set(
                                             "org.creekservice.api.json.schema.generator.JsonSchemaGenerator");
                             spec.getMainModule().set("creek.json.schema.generator");
-                            spec.getModularity().getInferModulePath().set(useModulePath());
+                            spec.getModularity().getInferModulePath().set(useModulePath);
                             spec.setClasspath(classPath);
-                            spec.setArgs(arguments());
-                            spec.jvmArgs(jvmArgs());
+                            spec.setArgs(arguments);
+                            spec.jvmArgs(jvmArgs);
                         });
     }