Updated RIFE2 Gradle plugin version

Made the template excludes adapt to the template types that are pre-compiled and use a more restrictive pattern.

.github/workflows/gradle.yml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        java-version: [ 17 ]
+        java-version: [ 17, 19 ]
 
     steps:
       - name: Checkout source repository
@@ -20,7 +20,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java-version }}
@@ -28,20 +28,7 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - name: Cache Gradle packages
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ matrix.java-version }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-${{ matrix.java-version }}-
-
       - name: Test with Gradle
-        run: ./gradlew build check --stacktrace
+        uses: gradle/gradle-build-action@v2
-
+        with:
-      - name: Cleanup Gradle Cache
+          arguments: build check --stacktrace
-        run: |
-          rm -f ~/.gradle/caches/modules-2/modules-2.lock
-          rm -f ~/.gradle/caches/modules-2/gc.properties

README.md

@@ -92,18 +92,23 @@ GraalVM supports creating a single Ahead-Of-Time
 [native executable](https://www.graalvm.org/native-image/) from your java
 bytecode.
 
-Once you have at least GraalVM 22.3.1 Java 19 installed, you can generate the
+Once you have at least GraalVM 22.3.1 Java 17 installed, you can generate the native binary with:
-UberJar as above, then create your native binary as such:
 
 ```bash
-native-image --no-fallback --enable-preview -jar app/build/libs/hello-uber-1.0.jar
+./gradlew nativeCompile
 ```
 
-You'll end up with a `hello-uber-1.0` file that can be executed directly without
+You'll end up with a `hello-1.0` file that can be executed directly without
 the need of a JVM:
 
 ```bash
-./hello-uber-1.0
+./app/build/native/nativeCompile/hello-1.0
+```
+
+Alternatively, you can run the native executable directly with:
+
+```bash
+./gradlew nativeRun
 ```
 
 > **NOTE:** RIFE2 support for GraalVM native-image is still in preliminary

app/build.gradle.kts

@@ -1,13 +1,32 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
+import com.uwyn.rife2.gradle.TemplateType.*
 
 plugins {
-    java
+    application
+    id("com.uwyn.rife2") version "1.0.6"
+    `maven-publish`
+    id("org.graalvm.buildtools.native") version "0.9.20"
+}
+
+version = 1.0
+group = "com.example"
+
+rife2 {
+    version.set("1.4.0")
+    uberMainClass.set("hello.AppUber")
+    useAgent.set(true)
+    precompiledTemplateTypes.add(HTML)
 }
 
 base {
     archivesName.set("hello")
-    version = 1.0
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
 }
 
 repositories {
@@ -16,90 +35,40 @@ repositories {
     maven { url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots") } // only needed for SNAPSHOT
 }
 
-sourceSets {
-    main {
-        runtimeClasspath = files(file("src/main/resources"), runtimeClasspath);
-    }
-}
-
-sourceSets.main {
-    resources.exclude("templates/**")
-}
-
 dependencies {
-    implementation("com.uwyn.rife2:rife2:1.3.0")
-    runtimeOnly("com.uwyn.rife2:rife2:1.3.0:agent")
-    runtimeOnly("org.eclipse.jetty:jetty-server:11.0.13")
-    runtimeOnly("org.eclipse.jetty:jetty-servlet:11.0.13")
-    runtimeOnly("org.slf4j:slf4j-simple:2.0.5")
-
     testImplementation("org.jsoup:jsoup:1.15.3")
     testImplementation("org.junit.jupiter:junit-jupiter:5.9.1")
 }
 
-tasks {
+application {
-    val dependencies = configurations
+    mainClass.set("hello.App")
-        .runtimeClasspath.get().files;
+}
-    val rifeAgentJar = dependencies
-        .filter { it.toString().contains("rife2") }
-        .filter { it.toString().endsWith("-agent.jar") }[0]
 
+tasks {
     test {
-        jvmArgs = listOf("-javaagent:$rifeAgentJar")
         useJUnitPlatform()
         testLogging {
             exceptionFormat = TestExceptionFormat.FULL
             events = setOf(TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.FAILED)
         }
     }
+}
 
-    // Pre-compile the RIFE2 templates to bytecode for deployment
+publishing {
-    register<JavaExec>("precompileHtmlTemplates") {
+    repositories {
-        classpath = sourceSets["main"].runtimeClasspath
+        maven {
-        mainClass.set("rife.template.TemplateDeployer")
+            name = "Build"
-        args = listOf(
+            url = uri(rootProject.layout.buildDirectory.dir("repo"))
-            "-verbose",
-            "-t", "html",
-            "-d", "${projectDir}/build/classes/java/main",
-            "-encoding", "UTF-8", "${projectDir}/src/main/resources/templates"
-        )
-    }
-
-    register("precompileTemplates") {
-        dependsOn("precompileHtmlTemplates")
-    }
-
-    // Ensure that the templates are pre-compiled before building the jar
-    jar {
-        dependsOn("precompileTemplates")
-    }
-
-    // Replace the run task with one that uses the RIFE2 agent
-    register<JavaExec>("run") {
-        classpath = sourceSets["main"].runtimeClasspath
-        mainClass.set("hello.App")
-        jvmArgs = listOf("-javaagent:$rifeAgentJar")
-    }
-
-    // These two tasks create a self-container UberJar
-    register<Copy>("copyWebapp") {
-        from("src/main/")
-        include("webapp/**")
-        into("$buildDir/webapp")
-    }
-
-    register<Jar>("uberJar") {
-        dependsOn("jar")
-        dependsOn("copyWebapp")
-        archiveBaseName.set("hello-uber")
-        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-        manifest {
-            attributes["Main-Class"] = "hello.AppUber"
         }
-        val uberDependencies = dependencies
-            .filter { !it.toString().matches("rife2-.*agent\\.jar".toRegex()) }
-            .map(::zipTree)
-        from(uberDependencies, "$buildDir/webapp")
-        with(jar.get())
     }
-}
+    publications {
+        create<MavenPublication>("maven") {
+            from(components["java"])
+        }
+    }
+}
+
+graalvmNative.binaries.all {
+    buildArgs.add("--enable-preview") // support for Jetty virtual threads with JDK 19
+    imageName.set("hello-$version")
+}

app/src/main/java/hello/App.java

@@ -13,4 +13,4 @@ public class App extends Site {
             .staticResourceBase("src/main/webapp")
             .start(new App());
     }
-}
+}

app/src/main/resources/META-INF/native-image/reflect-config.json

@@ -1,6 +1,6 @@
 [
-{
+  {
-    "name":"rife.template.html.hello",
+      "name":"rife.template.html.hello",
-    "methods":[{"name":"<init>","parameterTypes":[] }]
+      "methods":[{"name":"<init>","parameterTypes":[] }]
-}
+  }
 ]

app/src/main/resources/META-INF/native-image/resource-config.json

@@ -1,8 +0,0 @@
-{
-    "resources":{
-        "includes":[
-            {"pattern":"^webapp/.*$"}
-        ]
-    },
-    "bundles":[]
-}

app/src/main/resources/templates/hello.html

@@ -8,4 +8,4 @@
 <body>
 <p>Hello World</p>
 </body>
-</html>
+</html>

gradle.properties

@@ -0,0 +1,2 @@
+org.gradle.parallel=true
+org.gradle.caching=true

settings.gradle.kts

@@ -1,11 +1,9 @@
-/*
+pluginManagement {
- * This file was generated by the Gradle 'init' task.
+    repositories {
- *
+        mavenCentral()
- * The settings file is used to specify which projects to include in your build.
+        gradlePluginPortal()
- *
+    }
- * Detailed information about configuring a multi-project build in Gradle can be found
+}
- * in the user manual at https://docs.gradle.org/7.6/userguide/multi_project_builds.html
- */
 
 rootProject.name = "hello"
 include("app","war")

war/build.gradle.kts

@@ -2,9 +2,10 @@ plugins {
     war
 }
 
+version = 1.0
+
 base {
     archivesName.set("hello")
-    version = 1.0
 }
 
 repositories {
@@ -19,5 +20,4 @@ dependencies {
 tasks.war {
     webAppDirectory.set(file("../app/src/main/webapp"))
     webXml = file("src/web.xml")
-    rootSpec.exclude("**/jetty*.jar", "**/slf4j*.jar", "**/rife2*-agent.jar")
 }