Skip to content

Commit 6a44c9a

Browse files
committed
feat: Used latest scriptjar
Closes #5
1 parent 509af11 commit 6a44c9a

4 files changed

Lines changed: 11 additions & 6 deletions

File tree

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ version: 2.1
4747
jobs:
4848
groovy_script_to_jar:
4949
docker:
50-
- image: devatherock/vela-groovy-script-to-jar:0.6.2
50+
- image: devatherock/scriptjar:2.0.0
5151
auth:
5252
username: $DOCKER_USERNAME
5353
password: $DOCKER_PASSWORD
@@ -121,7 +121,7 @@ jobs:
121121
- v1-dependencies-{{ checksum "build.gradle" }}
122122
- v1-dependencies-
123123
- run: |
124-
./gradlew test
124+
make test
125125
- save_cache:
126126
paths:
127127
- ~/.gradle

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
### Added
55
- [#3](https://github.com/devatherock/java-to-native/issues/3): Functional tests
66

7+
### Changed
8+
- [#5](https://github.com/devatherock/java-to-native/issues/5): Used latest `scriptjar`
9+
710
## [2.2.0] - 2023-06-06
811
### Changed
912
- Updated base image with upx binary of correct architecture

CreateNativeImage.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@Grab(group = 'org.yaml', module = 'snakeyaml', version = '1.25')
2-
@Grab(group = 'org.codehaus.groovy', module = 'groovy-cli-commons', version = '2.5.7')
1+
@Grab(group = 'org.yaml', module = 'snakeyaml', version = '2.0')
2+
@Grab(group = 'org.codehaus.groovy', module = 'groovy-cli-commons', version = '3.0.9')
33

44
import java.nio.file.Files
55
import java.nio.file.Paths

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
docker_tag=latest
2+
scriptjar_image=scriptjar
3+
scriptjar_version=2.0.0
24

35
clean:
46
./gradlew clean
57
test:
6-
./gradlew spotlessApply test
8+
SCRIPTJAR_IMAGE=$(scriptjar_image) SCRIPTJAR_VERSION=$(scriptjar_version) ./gradlew spotlessApply test -x compileGroovy -Dtest.logs=true $(additional_gradle_args)
79
jar-build:
810
docker run --rm \
911
-v $(CURDIR):/work \
1012
-w=/work \
1113
-e PARAMETER_SCRIPT_PATH=CreateNativeImage.groovy \
12-
devatherock/vela-groovy-script-to-jar:0.6.2
14+
devatherock/$(scriptjar_image):$(scriptjar_version)
1315
docker-build:
1416
docker build -t devatherock/java-to-native:$(docker_tag) .

0 commit comments

Comments
 (0)