From cb5c1ba5592067e2a281864adaf555bafb53aa4f Mon Sep 17 00:00:00 2001 From: Julien Boz Date: Thu, 18 Jan 2024 08:09:04 +0100 Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=8F=85=20support=20java=2011?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-and-deploy.yml | 2 +- pom.xml | 4 ++-- .../asciidoctor/gherkin/GherkinAsciidocBuilder.java | 10 ++++------ 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index b9191c8..9a5cf06 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -51,7 +51,7 @@ jobs: - name: Set up java uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 19 distribution: adopt cache: maven server-id: ossrh diff --git a/pom.xml b/pom.xml index 1ec059c..18f71fe 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ ch.ifocusit.asciidoctor asciidoctor-gherkin-extension - 1.0.0-SNAPSHOT + 1.1-SNAPSHOT jar asciidoctor-gherkin-extension @@ -43,7 +43,7 @@ UTF-8 UTF-8 - 17 + 11 diff --git a/src/main/java/ch/ifocusit/asciidoctor/gherkin/GherkinAsciidocBuilder.java b/src/main/java/ch/ifocusit/asciidoctor/gherkin/GherkinAsciidocBuilder.java index f41afde..4306499 100644 --- a/src/main/java/ch/ifocusit/asciidoctor/gherkin/GherkinAsciidocBuilder.java +++ b/src/main/java/ch/ifocusit/asciidoctor/gherkin/GherkinAsciidocBuilder.java @@ -56,12 +56,10 @@ public String build() { container.put("feature", GherkinExtensionHelper.parse(featureContent)); container.put("template_content", templateContent); - String result = (String) container.runScriptlet(""" - require('erb') - erb = ERB.new(template_content, trim_mode: "<>") - asciidoc = erb.result(binding) - asciidoc - """); + String result = (String) container.runScriptlet("require('erb')\n" + + "erb = ERB.new(template_content, trim_mode: \"<>\")\n" + + "asciidoc = erb.result(binding)\n" + + "asciidoc\n"); return result; }