From daa893fe310159575a2dace8d3437736e17726e8 Mon Sep 17 00:00:00 2001 From: vince Date: Sat, 20 Jun 2026 21:03:45 +0800 Subject: [PATCH 1/2] fix npe --- .../org/ktorm/ksp/compiler/maven/GenerateSourcesMojo.java | 5 ++++- .../ktorm/ksp/compiler/maven/GenerateTestSourcesMojo.java | 5 ++++- ktorm.version | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ktorm-ksp-compiler-maven-plugin/src/main/java/org/ktorm/ksp/compiler/maven/GenerateSourcesMojo.java b/ktorm-ksp-compiler-maven-plugin/src/main/java/org/ktorm/ksp/compiler/maven/GenerateSourcesMojo.java index 66232ea6..afbf0338 100644 --- a/ktorm-ksp-compiler-maven-plugin/src/main/java/org/ktorm/ksp/compiler/maven/GenerateSourcesMojo.java +++ b/ktorm-ksp-compiler-maven-plugin/src/main/java/org/ktorm/ksp/compiler/maven/GenerateSourcesMojo.java @@ -108,7 +108,10 @@ protected Xpp3Dom getKotlinCompileMojoConfiguration() { Xpp3Dom configuration = null; for (PluginExecution execution : plugin.getExecutions()) { - if (execution.getPhase().equals("compile")) { + String phase = execution.getPhase(); + List goals = execution.getGoals(); + + if (phase != null && phase.equals("compile") || goals != null && goals.contains("compile")) { configuration = Xpp3Dom.mergeXpp3Dom((Xpp3Dom) execution.getConfiguration(), configuration); } } diff --git a/ktorm-ksp-compiler-maven-plugin/src/main/java/org/ktorm/ksp/compiler/maven/GenerateTestSourcesMojo.java b/ktorm-ksp-compiler-maven-plugin/src/main/java/org/ktorm/ksp/compiler/maven/GenerateTestSourcesMojo.java index 8420d49e..0cea9049 100644 --- a/ktorm-ksp-compiler-maven-plugin/src/main/java/org/ktorm/ksp/compiler/maven/GenerateTestSourcesMojo.java +++ b/ktorm-ksp-compiler-maven-plugin/src/main/java/org/ktorm/ksp/compiler/maven/GenerateTestSourcesMojo.java @@ -108,7 +108,10 @@ protected Xpp3Dom getKotlinCompileMojoConfiguration() { Xpp3Dom configuration = null; for (PluginExecution execution : plugin.getExecutions()) { - if (execution.getPhase().equals("test-compile")) { + String phase = execution.getPhase(); + List goals = execution.getGoals(); + + if (phase != null && phase.equals("test-compile") || goals != null && goals.contains("test-compile")) { configuration = Xpp3Dom.mergeXpp3Dom((Xpp3Dom) execution.getConfiguration(), configuration); } } diff --git a/ktorm.version b/ktorm.version index 6aba2b24..43cbdef4 100644 --- a/ktorm.version +++ b/ktorm.version @@ -1 +1 @@ -4.2.0 +4.2.1-SNAPSHOT From eb3c69a762f1bef528d2aed0a1a9491f07a13317 Mon Sep 17 00:00:00 2001 From: vince Date: Sat, 20 Jun 2026 21:13:03 +0800 Subject: [PATCH 2/2] update version --- ktorm.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ktorm.version b/ktorm.version index 43cbdef4..fae6e3d0 100644 --- a/ktorm.version +++ b/ktorm.version @@ -1 +1 @@ -4.2.1-SNAPSHOT +4.2.1