From 02d5b610bece14be536e94df7550f7d222e8d61d Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Mon, 6 Mar 2023 16:43:04 -0500 Subject: [PATCH 1/2] Updated GitHub workflow actions to latest versions --- .github/workflows/gradle.yml | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index d8cbfc6..ca36b67 100644 --- a/.github/workflows/gradle.yml +++ b/.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 - - - name: Cleanup Gradle Cache - run: | - rm -f ~/.gradle/caches/modules-2/modules-2.lock - rm -f ~/.gradle/caches/modules-2/gc.properties \ No newline at end of file + uses: gradle/gradle-build-action@v2 + with: + arguments: build check --stacktrace \ No newline at end of file From 122db8a40e6a3c1aff4d367ea89d67d134234903 Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Mon, 6 Mar 2023 18:29:18 -0500 Subject: [PATCH 2/2] Small cleanup to match the manual better --- app/build.gradle.kts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index fd72634..c74bd38 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -9,16 +9,18 @@ plugins { id("org.graalvm.buildtools.native") version "0.9.20" } +rife2 { + version.set("1.4.0") + useAgent.set(true) + precompiledTemplateTypes.add(HTML) +} + base { archivesName.set("hello") version = 1.0 group = "com.example" } -application { - mainClass.set("hello.App") -} - java { toolchain { languageVersion.set(JavaLanguageVersion.of(17)) @@ -31,17 +33,15 @@ repositories { maven { url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots") } // only needed for SNAPSHOT } -rife2 { - version.set("1.4.0") - useAgent.set(true) - precompiledTemplateTypes.add(HTML) -} - dependencies { testImplementation("org.jsoup:jsoup:1.15.3") testImplementation("org.junit.jupiter:junit-jupiter:5.9.1") } +application { + mainClass.set("hello.App") +} + tasks { test { useJUnitPlatform()