Windcorp/JavaProgressia
Windcorp/JavaProgressia
Archived
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated all dependencies

Browse Source 
- Updated LWJGL to 3.3.0
  - Targets windows-arm64 and macos-arm64 are now available
- Updated Guava to 31.0.1
- Updated Log4j to 2.17.1
This commit is contained in:
OLEGSHA 2022-01-10 19:54:14 +03:00
parent c3c8a6e5e0
commit b18eac44b8
Signed by: OLEGSHA
GPG Key ID: E57A4B08D64AFF7A
4 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -60,7 +60,7 @@ repositories {
dependencies {
// Google Guava
// A generic utilities library
implementation 'com.google.guava:guava:30.0-jre'
implementation 'com.google.guava:guava:31.0.1-jre'
// Trove4j
// Provides optimized Collections for primitive types
@ -73,8 +73,8 @@ dependencies {
// Log4j
// A logging library
implementation 'org.apache.logging.log4j:log4j-api:2.17.0'
implementation 'org.apache.logging.log4j:log4j-core:2.17.0'
implementation 'org.apache.logging.log4j:log4j-api:2.17.1'
implementation 'org.apache.logging.log4j:log4j-core:2.17.1'
// JUnit
// A unit-testing library

13
build_logic/lwjgl.gradle
View File

@ -6,7 +6,7 @@
project.ext.lwjgl = new HashMap<>()
// Version of LWJGL
lwjgl.version = '3.2.3'
lwjgl.version = '3.3.0'
/*
* Target platforms for current operation.
@ -33,10 +33,13 @@ switch (OperatingSystem.current()) {
: 'linux'
break
case OperatingSystem.MAC_OS:
lwjgl.localArch = 'macos'
project.ext.lwjglNatives = System.getProperty('os.arch').startsWith('aarch64') ? 'macos-arm64' : 'macos'
break
case OperatingSystem.WINDOWS:
lwjgl.localArch = System.getProperty('os.arch').contains('64') ? 'windows' : 'windows-x86'
def osArch = System.getProperty('os.arch')
project.ext.lwjglNatives = osArch.contains('64')
? "windows${osArch.startsWith('aarch64') ? '-arm64' : ''}"
: 'windows-x86'
break
}
@ -113,5 +116,5 @@ def requestTask(String name, String... targets) {
}
requestTask 'Linux', 'linux', 'linux-arm32', 'linux-arm64'
requestTask 'Windows', 'windows', 'windows-x86'
requestTask 'MacOS', 'macos'
requestTask 'Windows', 'windows', 'windows-arm64', 'windows-x86'
requestTask 'MacOS', 'macos', 'macos-arm64'

4
docs/building/BuildGuide.md
View File

@ -143,8 +143,8 @@ build.
Some users might find the need to build for a specific set of platforms. Inclusion of GNU/Linux, Windows or MacOS
dependencies individually can be controlled with the following arguments to the `./gradlew build` command:
- `requestLinuxDependencies` requests that `natives-linux`, `natives-linux-arm32` and `natives-linux-arm64` binaries are included;
- `requestWindowsDependencies` requests that `natives-windows` and `natives-windows-x86` binaries are included;
- `requestMacOSDependencies` requests that `natives-macos` binaries are included.
- `requestWindowsDependencies` requests that `natives-windows`, `natives-windows-arm64` and `natives-windows-x86` binaries are included;
- `requestMacOSDependencies` requests that `natives-macos`, `natives-macos-arm64` binaries are included.
These requests can be applied in any combination. For example, the following command produces a build containing only
GNU/Linux and Windows natives:

22
docs/building/BuildScriptReference.md
View File

@ -12,8 +12,8 @@ This document is a user's reference for the build script of Progressia. For a be
- `packageDeb` – creates a Debian package. Incompatible with other `package` tasks.
- `packageNsis` – creates a Windows NSIS installer. Incompatible with other `package` tasks.
- `requestLinuxDependencies` – requests that `natives-linux`, `natives-linux-arm32` and `natives-linux-arm64` binaries are included when building.
- `requestWindowsDependencies` – requests that `natives-windows` and `natives-windows-x86` binaries are included when building.
- `requestMacOSDependencies` – requests that `natives-macos` binaries are included when building.
- `requestWindowsDependencies` – requests that `natives-windows`, `natives-windows-arm64` and `natives-windows-x86` binaries are included when building.
- `requestMacOSDependencies` – requests that `natives-macos` and `natives-macos-arm64` binaries are included when building.
- `requestCrossPlatformDependencies` – requests that all binaries are included when building.
To execute a task, run `./gradlew <task-name>`.
@ -93,11 +93,13 @@ detected current architecture.
### Available targets
| Name | Task |
|---------------|------------------------------|
| `linux` | `requestLinuxDependencies` |
| `linux-arm32` | `requestLinuxDependencies` |
| `linux-arm64` | `requestLinuxDependencies` |
| `windows` | `requestWindowsDependencies` |
| `windows-x86` | `requestWindowsDependencies` |
| `macos` | `requestMacOSDependencies` |
| Name | Task |
|-----------------|------------------------------|
| `linux` | `requestLinuxDependencies` |
| `linux-arm32` | `requestLinuxDependencies` |
| `linux-arm64` | `requestLinuxDependencies` |
| `windows` | `requestWindowsDependencies` |
| `windows-arm64` | `requestWindowsDependencies` |
| `windows-x86` | `requestWindowsDependencies` |
| `macos` | `requestMacOSDependencies` |
| `macos-arm64` | `requestMacOSDependencies` |