Updated all dependencies
- 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:
parent
c3c8a6e5e0
commit
b18eac44b8
@ -60,7 +60,7 @@ repositories {
|
|||||||
dependencies {
|
dependencies {
|
||||||
// Google Guava
|
// Google Guava
|
||||||
// A generic utilities library
|
// A generic utilities library
|
||||||
implementation 'com.google.guava:guava:30.0-jre'
|
implementation 'com.google.guava:guava:31.0.1-jre'
|
||||||
|
|
||||||
// Trove4j
|
// Trove4j
|
||||||
// Provides optimized Collections for primitive types
|
// Provides optimized Collections for primitive types
|
||||||
@ -73,8 +73,8 @@ dependencies {
|
|||||||
|
|
||||||
// Log4j
|
// Log4j
|
||||||
// A logging library
|
// A logging library
|
||||||
implementation 'org.apache.logging.log4j:log4j-api:2.17.0'
|
implementation 'org.apache.logging.log4j:log4j-api:2.17.1'
|
||||||
implementation 'org.apache.logging.log4j:log4j-core:2.17.0'
|
implementation 'org.apache.logging.log4j:log4j-core:2.17.1'
|
||||||
|
|
||||||
// JUnit
|
// JUnit
|
||||||
// A unit-testing library
|
// A unit-testing library
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
project.ext.lwjgl = new HashMap<>()
|
project.ext.lwjgl = new HashMap<>()
|
||||||
|
|
||||||
// Version of LWJGL
|
// Version of LWJGL
|
||||||
lwjgl.version = '3.2.3'
|
lwjgl.version = '3.3.0'
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Target platforms for current operation.
|
* Target platforms for current operation.
|
||||||
@ -33,10 +33,13 @@ switch (OperatingSystem.current()) {
|
|||||||
: 'linux'
|
: 'linux'
|
||||||
break
|
break
|
||||||
case OperatingSystem.MAC_OS:
|
case OperatingSystem.MAC_OS:
|
||||||
lwjgl.localArch = 'macos'
|
project.ext.lwjglNatives = System.getProperty('os.arch').startsWith('aarch64') ? 'macos-arm64' : 'macos'
|
||||||
break
|
break
|
||||||
case OperatingSystem.WINDOWS:
|
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
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -113,5 +116,5 @@ def requestTask(String name, String... targets) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
requestTask 'Linux', 'linux', 'linux-arm32', 'linux-arm64'
|
requestTask 'Linux', 'linux', 'linux-arm32', 'linux-arm64'
|
||||||
requestTask 'Windows', 'windows', 'windows-x86'
|
requestTask 'Windows', 'windows', 'windows-arm64', 'windows-x86'
|
||||||
requestTask 'MacOS', 'macos'
|
requestTask 'MacOS', 'macos', 'macos-arm64'
|
||||||
|
@ -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
|
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:
|
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;
|
- `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;
|
- `requestWindowsDependencies` requests that `natives-windows`, `natives-windows-arm64` and `natives-windows-x86` binaries are included;
|
||||||
- `requestMacOSDependencies` requests that `natives-macos` 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
|
These requests can be applied in any combination. For example, the following command produces a build containing only
|
||||||
GNU/Linux and Windows natives:
|
GNU/Linux and Windows natives:
|
||||||
|
|
||||||
|
@ -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.
|
- `packageDeb` – creates a Debian package. Incompatible with other `package` tasks.
|
||||||
- `packageNsis` – creates a Windows NSIS installer. 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.
|
- `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.
|
- `requestWindowsDependencies` – requests that `natives-windows`, `natives-windows-arm64` and `natives-windows-x86` binaries are included when building.
|
||||||
- `requestMacOSDependencies` – requests that `natives-macos` 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.
|
- `requestCrossPlatformDependencies` – requests that all binaries are included when building.
|
||||||
|
|
||||||
To execute a task, run `./gradlew <task-name>`.
|
To execute a task, run `./gradlew <task-name>`.
|
||||||
@ -94,10 +94,12 @@ detected current architecture.
|
|||||||
### Available targets
|
### Available targets
|
||||||
|
|
||||||
| Name | Task |
|
| Name | Task |
|
||||||
|---------------|------------------------------|
|
|-----------------|------------------------------|
|
||||||
| `linux` | `requestLinuxDependencies` |
|
| `linux` | `requestLinuxDependencies` |
|
||||||
| `linux-arm32` | `requestLinuxDependencies` |
|
| `linux-arm32` | `requestLinuxDependencies` |
|
||||||
| `linux-arm64` | `requestLinuxDependencies` |
|
| `linux-arm64` | `requestLinuxDependencies` |
|
||||||
| `windows` | `requestWindowsDependencies` |
|
| `windows` | `requestWindowsDependencies` |
|
||||||
|
| `windows-arm64` | `requestWindowsDependencies` |
|
||||||
| `windows-x86` | `requestWindowsDependencies` |
|
| `windows-x86` | `requestWindowsDependencies` |
|
||||||
| `macos` | `requestMacOSDependencies` |
|
| `macos` | `requestMacOSDependencies` |
|
||||||
|
| `macos-arm64` | `requestMacOSDependencies` |
|
||||||
|
Reference in New Issue
Block a user