From fe9deac73a7d7911227d7be67d1d99cb1b2f6d73 Mon Sep 17 00:00:00 2001 From: JW Date: Tue, 22 Aug 2023 13:43:54 +0200 Subject: [PATCH] Update pom --- API/pom.xml | 6 ------ ensure-java-16 | 20 ++++++++++++++++++++ jitpack.yml | 7 ++++--- pom.xml | 9 +++++++++ 4 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 ensure-java-16 diff --git a/API/pom.xml b/API/pom.xml index 9efdb61..c4a055c 100644 --- a/API/pom.xml +++ b/API/pom.xml @@ -10,12 +10,6 @@ 4.0.0 API - - 16 - 16 - UTF-8 - - com.google.protobuf diff --git a/ensure-java-16 b/ensure-java-16 new file mode 100644 index 0000000..2bd5fd1 --- /dev/null +++ b/ensure-java-16 @@ -0,0 +1,20 @@ +#!/bin/bash + +JV=`java -version 2>&1 >/dev/null | head -1` +echo $JV | sed -E 's/^.*version "([^".]*)\.[^"]*".*$/\1/' + +if [ "$JV" != 16 ]; then + case "$1" in + install) + echo "Installing SDKMAN..." + curl -s "https://get.sdkman.io" | bash + source ~/.sdkman/bin/sdkman-init.sh + sdk version + sdk install java 16.0.1-adpt + ;; + use) + echo "must source ~/.sdkman/bin/sdkman-init.sh" + exit 1 + ;; + esac +fi \ No newline at end of file diff --git a/jitpack.yml b/jitpack.yml index 8b41472..0fafd31 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -2,9 +2,10 @@ jdk: - openjdk16 before_install: - echo "Before Install" - - bash ensure-java-16 install + - ./ensure-java-16 install install: - echo "Install" - - if ! bash ensure-java-16 use; then source ~/.sdkman/bin/sdkman-init.sh; fi + - if ! ./ensure-java-16 use; then source ~/.sdkman/bin/sdkman-init.sh; fi - java -version - - mvn install \ No newline at end of file + +# Thanks to https://github.com/jitpack/jitpack.io/issues/4355#issuecomment-744678253 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 481efea..b653f95 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,15 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 16 + 16 + + org.apache.maven.plugins maven-jar-plugin