Merge pull request #6 from KosyanMedia/sync-2-11

Sync 2 11

.github/release.yml

@@ -0,0 +1,10 @@
+# release.yml
+
+changelog:
+  categories:
+    - title: '🔬 Improvements'
+      labels:
+        - 'enhancement'
+    - title: '🐞 Bug Fixes'
+      labels:
+        - 'bug'

.github/workflows/build.yml

@@ -9,12 +9,10 @@ jobs:
   build:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v1
-      - name: set up JDK 1.8
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - uses: graalvm/setup-graalvm@v1
         with:
-          java-version: 1.8
-      - name: "Build"
-        run: ./gradlew build
-      - name: "Build Native Image"
-        run: ./gradlew nativeImage
+          java-version: '17'
+          distribution: 'graalvm'
+      - run: ./gradlew build
+      - run: ./gradlew nativeCompile

.github/workflows/release.yml

@@ -8,23 +8,18 @@ jobs:
   build:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v1
-      - name: set up JDK 1.8
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - uses: graalvm/setup-graalvm@v1
         with:
-          java-version: 1.8
-      - run: echo "::set-output name=name::${GITHUB_REF:10}"
-        id: version
-      - name: "Build ${{ steps.version.outputs.name }}"
-        run: ./gradlew build
-      - name: "Build Native Image"
-        run: ./gradlew nativeImage
-      - name: "Upload Native Image"
-        uses: actions/[email protected]
+          java-version: '17'
+          distribution: 'graalvm'
+      - run: ./gradlew build
+      - run: ./gradlew nativeCompile
+      - uses: actions/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ./build/graal/xcresults
+          asset_path: ./build/native/nativeCompile/xcresults
           asset_name: xcresults
           asset_content_type: application/octet-stream

.gitignore

@@ -6,3 +6,4 @@
 .gradle
 build
 
+.DS_Store

build.gradle.kts

@@ -1,12 +1,6 @@
 plugins {
     java
-    id("com.palantir.graal") version("0.9.0")
-}
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(8))
-    }
+    id("org.graalvm.buildtools.native") version "0.9.24"
 }
 
 group = "org.example"
@@ -15,14 +9,26 @@ version = "1.0-SNAPSHOT"
 description = "Allure Server Java Client"
 
 tasks.withType(Wrapper::class) {
-    gradleVersion = "7.4"
+    gradleVersion = "7.5.1"
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(8))
+    }
 }
 
-graal {
-    graalVersion(project.property("graalVersion") as String?)
+tasks.withType(JavaCompile::class) {
+    options.encoding = "UTF-8"
+}
 
-    mainClass("io.eroshenkoam.xcresults.XCResults")
-    outputName("xcresults")
+graalvmNative {
+    toolchainDetection.set(true)
+    binaries {
+        named("main") {
+            mainClass.set("io.eroshenkoam.xcresults.XCResults")
+        }
+    }
 }
 
 repositories {
@@ -34,6 +40,7 @@ dependencies {
 
     implementation("com.fasterxml.jackson.core:jackson-databind:2.10.2")
     implementation("io.qameta.allure:allure-model:2.13.1")
+    implementation("org.freemarker:freemarker:2.3.32")
     implementation("info.picocli:picocli:4.1.4")
     implementation("commons-io:commons-io:2.6")
 

gradle.properties

@@ -1,3 +1,3 @@
 version=3.18-SNAPSHOT
 # Graal VM
-graalVersion=19.2.0
+graalVersion=23.0.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists