public/warp4j
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

Merge pull request 'hotfix/1.2.2' (#39) from hotfix/1.2.2 into github/master

Browse Source 
Reviewed-on: #39
This commit is contained in:
David 2025-02-01 09:05:48 +01:00
commit 4d1521eddd
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
## [v1.2.2] - 2025-02-01
### Fixed
- Submodules removed when Jdep collects necessary modules
- install.sh: Fix GitHubs warp4j download link
## [v1.2.1] - 2025-01-17 ## [v1.2.1] - 2025-01-17
### Fixed ### Fixed
- Improved transitive dependency detection for `jdeps` call - Improved transitive dependency detection for `jdeps` call
@ -32,6 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- See origin repository: https://github.com/guziks/warp4j - See origin repository: https://github.com/guziks/warp4j
[unreleased]: https://github.com/kirbylink/warp4j/compare/master...HEAD [unreleased]: https://github.com/kirbylink/warp4j/compare/master...HEAD
[v1.2.2]: https://github.com/kirbylink/warp4j/compare/v1.2.1...v1.2.2
[v1.2.1]: https://github.com/kirbylink/warp4j/compare/v1.2.0...v1.2.1 [v1.2.1]: https://github.com/kirbylink/warp4j/compare/v1.2.0...v1.2.1
[v1.2.0]: https://github.com/kirbylink/warp4j/compare/v1.1.0...v1.2.0 [v1.2.0]: https://github.com/kirbylink/warp4j/compare/v1.1.0...v1.2.0
[v1.1.0]: https://github.com/kirbylink/warp4j/compare/v1.0.0...v1.1.0 [v1.1.0]: https://github.com/kirbylink/warp4j/compare/v1.0.0...v1.1.0

2
README.md
View File

@ -20,7 +20,7 @@ Just put both `warp4j` and `warp-packer` somewhere in your PATH and run `warp4j
Curl one-liner installs the latest versions of both `warp4j` and `warp-packer`: Curl one-liner installs the latest versions of both `warp4j` and `warp-packer`:
``` ```
bash -c "$(curl -fsSL https://github.com/kirbylink/warp4j/raw/branch/master/install.sh)" bash -c "$(curl -fsSL https://github.com/kirbylink/warp4j/raw/refs/heads/master/install.sh)"
``` ```
This script will show missing dependencies (if there are any); they must be installed with your package manager. This script will show missing dependencies (if there are any); they must be installed with your package manager.

2
install.sh
View File

@ -128,7 +128,7 @@ get_missing_deps() {
fi fi
} }
WARP4J_LINK="https://github.com/kirbylink/warp4j/raw/branch/master/warp4j" WARP4J_LINK="https://github.com/kirbylink/warp4j/raw/refs/heads/master/warp4j"
echo "Getting information about warp-packer releases..." echo "Getting information about warp-packer releases..."
WARP_LINK=$(get_warp_link $THIS_PLATFORM $THIS_ARCHITECTURE) WARP_LINK=$(get_warp_link $THIS_PLATFORM $THIS_ARCHITECTURE)

3
warp4j
View File

@ -685,7 +685,7 @@ if [[ $JAVA_DISTRO_TYPE == $DISTRO_TYPE_JDK ]]; then
if [ -n "$CLASS_PATH" ] if [ -n "$CLASS_PATH" ]
then then
echo "Using given classpaths: $CLASS_PATH" echo "Using given classpaths: $CLASS_PATH"
MODULES=$($JDEPS --class-path $CLASS_PATH --ignore-missing-deps --list-deps --multi-release $JAVA_VERSION_BASE $JAR | awk '{print $1}' | grep -Ev '^(Warning|Error:|Not\sfound|.*\.jar$|ch\.|com\.|org\.)' | sort -u | paste -sd, -) MODULES=$($JDEPS --class-path $CLASS_PATH --ignore-missing-deps --list-deps --multi-release $JAVA_VERSION_BASE $JAR | awk '{print $1}' | grep -Ev '^(Warning|Error:|Not\sfound|.*\.jar$|ch\.|com\.|org\.)' | sed 's|/.*||' | sort -u | paste -sd, -)
elif [ "$AUTO_CLASS_PATH" ] elif [ "$AUTO_CLASS_PATH" ]
then then
echo "Extracting jar file to get classpath" echo "Extracting jar file to get classpath"
@ -706,6 +706,7 @@ if [[ $JAVA_DISTRO_TYPE == $DISTRO_TYPE_JDK ]]; then
echo "Adding additional modules to optimized JDK: $ADD_MODULES" echo "Adding additional modules to optimized JDK: $ADD_MODULES"
MODULES=$ADD_MODULES,$MODULES MODULES=$ADD_MODULES,$MODULES
fi fi
echo "Collected modules: $MODULES"
fi fi
# creates minimized runtime for the platform # creates minimized runtime for the platform