From cf4870745c35aab5c3fea3c5cff11a0d251340b5 Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Sun, 5 Mar 2023 09:07:29 -0500 Subject: [PATCH] Made precompiledTemplateTypes plugin option not use HTML by default Cleanup minimal test project. --- app/build.gradle.kts | 1 + .../main/java/com/uwyn/rife2/gradle/Rife2Plugin.java | 1 - build-logic/src/test-projects/minimal/build.gradle | 3 ++- .../minimal/src/main/java/hello/AppUber.java | 11 ----------- .../META-INF/native-image/reflect-config.json | 6 ------ .../META-INF/native-image/resource-config.json | 8 -------- 6 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 build-logic/src/test-projects/minimal/src/main/java/hello/AppUber.java delete mode 100644 build-logic/src/test-projects/minimal/src/main/resources/META-INF/native-image/reflect-config.json delete mode 100644 build-logic/src/test-projects/minimal/src/main/resources/META-INF/native-image/resource-config.json diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 29c1b77..656dcab 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -33,6 +33,7 @@ repositories { rife2 { version.set("1.4.0") useAgent.set(true) + precompiledTemplateTypes.add(HTML) } dependencies { diff --git a/build-logic/src/main/java/com/uwyn/rife2/gradle/Rife2Plugin.java b/build-logic/src/main/java/com/uwyn/rife2/gradle/Rife2Plugin.java index 2777742..f4a6cda 100644 --- a/build-logic/src/main/java/com/uwyn/rife2/gradle/Rife2Plugin.java +++ b/build-logic/src/main/java/com/uwyn/rife2/gradle/Rife2Plugin.java @@ -174,7 +174,6 @@ public class Rife2Plugin implements Plugin { rife2.getUseAgent().convention(false); rife2.getUberMainClass().convention(project.getExtensions().getByType(JavaApplication.class).getMainClass() .map(mainClass -> mainClass + "Uber")); - rife2.getPrecompiledTemplateTypes().convention(Collections.singletonList(TemplateType.HTML)); return rife2; } diff --git a/build-logic/src/test-projects/minimal/build.gradle b/build-logic/src/test-projects/minimal/build.gradle index 697f9f5..5bc074f 100644 --- a/build-logic/src/test-projects/minimal/build.gradle +++ b/build-logic/src/test-projects/minimal/build.gradle @@ -1,4 +1,4 @@ -import com.uwyn.rife2.gradle.TemplateType.* +import com.uwyn.rife2.gradle.TemplateType plugins { id("application") @@ -28,6 +28,7 @@ repositories { rife2 { version = "1.4.0" useAgent = true + precompiledTemplateTypes.add(TemplateType.HTML) } dependencies { diff --git a/build-logic/src/test-projects/minimal/src/main/java/hello/AppUber.java b/build-logic/src/test-projects/minimal/src/main/java/hello/AppUber.java deleted file mode 100644 index 8dbf6a6..0000000 --- a/build-logic/src/test-projects/minimal/src/main/java/hello/AppUber.java +++ /dev/null @@ -1,11 +0,0 @@ -package hello; - -import rife.engine.Server; - -public class AppUber extends App { - public static void main(String[] args) { - new Server() - .staticUberJarResourceBase("webapp") - .start(new AppUber()); - } -} \ No newline at end of file diff --git a/build-logic/src/test-projects/minimal/src/main/resources/META-INF/native-image/reflect-config.json b/build-logic/src/test-projects/minimal/src/main/resources/META-INF/native-image/reflect-config.json deleted file mode 100644 index 9b0c3be..0000000 --- a/build-logic/src/test-projects/minimal/src/main/resources/META-INF/native-image/reflect-config.json +++ /dev/null @@ -1,6 +0,0 @@ -[ -{ - "name":"rife.template.html.hello", - "methods":[{"name":"","parameterTypes":[] }] -} -] diff --git a/build-logic/src/test-projects/minimal/src/main/resources/META-INF/native-image/resource-config.json b/build-logic/src/test-projects/minimal/src/main/resources/META-INF/native-image/resource-config.json deleted file mode 100644 index ad0b0a3..0000000 --- a/build-logic/src/test-projects/minimal/src/main/resources/META-INF/native-image/resource-config.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "resources":{ - "includes":[ - {"pattern":"^webapp/.*$"} - ] - }, - "bundles":[] -}