Merge pull request #111 from devatherock/upgrade-java-to-native

chore: Upgraded java-to-native to 2.1.0

.circleci/config.yml

@@ -122,7 +122,7 @@ jobs:
 
   java_to_native:
     docker:
-      - image: devatherock/java-to-native:2.0.0
+      - image: devatherock/java-to-native:2.1.0
         auth:
           username: $DOCKER_USERNAME
           password: $DOCKER_PASSWORD
@@ -156,7 +156,7 @@ jobs:
               --entrypoint='' \
               -e PARAMETER_JAR_NAME=build/native/libs/YamlValidator.jar \
               -e PARAMETER_CONFIG_FILE=config/graal.yml \
-              devatherock/java-to-native:2.0.0-arm64 sh /scripts/entry-point.sh && upx -4 YamlValidator
+              devatherock/java-to-native:2.1.0 sh /scripts/entry-point.sh && upx -4 YamlValidator
           TAG=${CIRCLE_SHA1:0:8}-arm64    
           echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
           docker build \

CHANGELOG.md

@@ -14,6 +14,7 @@
 - Cached build dependencies separately
 - Integration tested the arm image
 - [#106](https://github.com/devatherock/drone-yaml-validator/issues/106): Built the arm binary in an arm machine
+- Upgraded `java-to-native` to `2.1.0`
 
 ## [2.1.0] - 2022-05-18
 ### Added

Makefile

@@ -1,4 +1,5 @@
 docker_tag=latest
+java_to_native_version=2.1.0
 
 clean:
 	./gradlew clean
@@ -23,6 +24,6 @@ binary-build:
 	--entrypoint='' \
 	-e PLUGIN_JAR_NAME=build/native/libs/YamlValidator.jar \
 	-e PLUGIN_CONFIG_FILE=config/graal.yml \
-	devatherock/java-to-native:2.0.0 sh /scripts/entry-point.sh && upx -4 YamlValidator
+	devatherock/java-to-native:$(java_to_native_version) sh /scripts/entry-point.sh && upx -4 YamlValidator
 docker-build:
 	docker build -t devatherock/drone-yaml-validator:$(docker_tag) .

YamlValidator.groovy

@@ -1,5 +1,5 @@
 @Grab(group = 'org.yaml', module = 'snakeyaml', version = '1.27')
-@Grab(group = 'net.sourceforge.argparse4j', module = 'argparse4j', version = '0.8.1')
+@Grab(group = 'net.sourceforge.argparse4j', module = 'argparse4j', version = '0.9.0')
 
 import groovy.transform.Field
 import java.util.logging.Logger

build.gradle

@@ -12,7 +12,10 @@ sourceCompatibility = '1.6'
 targetCompatibility = '1.6'
 
 dependencies {
-    implementation group: 'org.codehaus.groovy', name: 'groovy', version: '2.5.22'
+    // Groovy version should match the version used within scriptjar
+    implementation group: 'org.codehaus.groovy', name: 'groovy', version: '2.5.7'
+
+    // Build dependency versions should match the ones used within the script 
     implementation group: 'org.yaml', name: 'snakeyaml', version: '2.0'
     implementation group: 'net.sourceforge.argparse4j', name: 'argparse4j', version: '0.9.0'
 
@@ -45,7 +48,7 @@ ext.jacoco = [
             'BRANCH': 0.67,  // DO NOT CHANGE unless there is a huge improvement. The values fluctuate in CI
             'COMPLEXITY': 0.66, // DO NOT CHANGE unless there is a huge improvement. The values fluctuate in CI
             'INSTRUCTION': 0.93,
-            'LINE': 0.94
+            'LINE': 0.90
         ]
     ]
 ]