Skip to content

Commit d497838

Browse files
Added javadoc, more logging to junit, and fixed hashupdate
1 parent 95261bc commit d497838

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ FROM eclipse-temurin:24-alpine AS builder
44
# bump: libwebp after ./hashupdate Dockerfile LIBWEBP $LATEST
55
ARG LIBWEBP_VERSION=1.6.0
66
ARG LIBWEBP_SHA256=1c5ffab71efecefa0e3c23516c3a3a1dccb45cc310ae1095c6f14ae268e38067
7+
ARG LIBWEBP_URL="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP_VERSION-linux-x86-64.tar.gz"
78
ARG LIBWEBP_FILE="libwebp-$LIBWEBP_VERSION-linux-x86-64.tar.gz"
8-
ARG LIBWEBP_URL="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/$LIBWEBP_FILE"
99

1010
WORKDIR /app
1111
RUN apk --no-cache add binutils curl tar

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ test {
7373
finalizedBy(jacocoTestReport)
7474

7575
testLogging {
76-
events 'passed'
76+
events 'passed', 'failed', 'skipped'
7777
}
7878
}
7979

buildSrc/src/main/java/com/github/stickerifier/stickerify/JlinkTask.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ public abstract class JlinkTask extends DefaultTask {
3030
@Input
3131
public abstract ListProperty<@NotNull String> getModules();
3232

33+
/**
34+
* If the selected JVM is <a href="https://openjdk.org/jeps/493">JEP 493</a> compatible, then this should be set to false.
35+
*/
3336
@Input
3437
public abstract Property<@NotNull Boolean> getIncludeModulePath();
3538

hashupdate

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
#!/bin/sh
2-
set -euo
1+
#!/usr/bin/env bash
2+
set -euo pipefail
33

44
# Usage: hashupdate <FILE> <NAME> <VERSION>
5-
URL_TEMPLATE=$(grep "$2_URL=" "$1" | sed -E 's/.*="(.*)"/\1/')
6-
URL=$(echo "$URL_TEMPLATE" | sed "s/\$$2_VERSION/$3/g")
5+
URL=$(grep "$2_URL=" "$1" | sed -E 's/.*="([^"]*)".*/\1/' | sed "s/\$$2_VERSION/$3/g")
76
SHA256=$(curl -sL "$URL" | sha256sum | sed -e 's/ -//g')
87
sed -i -E "s/$2_SHA256=.*/$2_SHA256=$SHA256/" "$1"

0 commit comments

Comments
 (0)