mirror of
https://gitlab.bixilon.de/bixilon/minosoft.git
synced 2025-09-11 00:23:42 -04:00
bump dependencies, bump java to 16
This commit is contained in:
parent
3f9b91c8aa
commit
d192035b3d
@ -2,7 +2,7 @@ variables:
|
|||||||
MAVEN_OPTS: "-Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository"
|
MAVEN_OPTS: "-Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository"
|
||||||
MAVEN_CLI_OPTS: "--errors --fail-at-end --show-version"
|
MAVEN_CLI_OPTS: "--errors --fail-at-end --show-version"
|
||||||
|
|
||||||
image: maven:3-openjdk-15
|
image: maven:3-openjdk-16
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
paths:
|
paths:
|
||||||
|
@ -28,7 +28,7 @@ Minosoft is an open source minecraft client, written from scratch in java. It ai
|
|||||||
- RAM: ~500Mib. With overhead, etc 2Gib recommended
|
- RAM: ~500Mib. With overhead, etc 2Gib recommended
|
||||||
- Disk space: Minosoft itself is pretty small (2-3 Mib), the libraries are a bit bigger. You also need to have the "normal" minecraft assets (~ 300 MB for one version).
|
- Disk space: Minosoft itself is pretty small (2-3 Mib), the libraries are a bit bigger. You also need to have the "normal" minecraft assets (~ 300 MB for one version).
|
||||||
- GPU: OpenGL 3.3+. Every moden GPU works and is recommended.
|
- GPU: OpenGL 3.3+. Every moden GPU works and is recommended.
|
||||||
- Java 15 (This is really important, we use experimental features that are only available in this version. Java 8 is currently **not** supported).
|
- Java 16 (This is really important, we use features that are only available in this version. Java 8 is currently **not** supported).
|
||||||
|
|
||||||
## Rendering
|
## Rendering
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
before_install:
|
before_install:
|
||||||
- wget https://github.com/sormuras/bach/raw/master/install-jdk.sh
|
- wget https://github.com/sormuras/bach/raw/master/install-jdk.sh
|
||||||
- source install-jdk.sh --feature 15
|
- source install-jdk.sh --feature 16
|
||||||
- jshell --version
|
- jshell --version
|
||||||
|
19
pom.xml
19
pom.xml
@ -41,7 +41,7 @@
|
|||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
<configuration>
|
<configuration>
|
||||||
<jvmTarget>1.8</jvmTarget>
|
<jvmTarget>16</jvmTarget>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
@ -73,9 +73,8 @@
|
|||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>15</source>
|
<source>16</source>
|
||||||
<target>15</target>
|
<target>16</target>
|
||||||
<compilerArgs>--enable-preview</compilerArgs>
|
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
@ -195,9 +194,9 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<exec.mainClass>de.bixilon.minosoft.Minosoft</exec.mainClass>
|
<exec.mainClass>de.bixilon.minosoft.Minosoft</exec.mainClass>
|
||||||
<maven.compiler.source>15</maven.compiler.source>
|
<maven.compiler.source>16</maven.compiler.source>
|
||||||
<maven.compiler.target>15</maven.compiler.target>
|
<maven.compiler.target>16</maven.compiler.target>
|
||||||
<javafx.version>17-ea+5</javafx.version>
|
<javafx.version>17-ea+9</javafx.version>
|
||||||
<kotlin.version>1.4.32</kotlin.version>
|
<kotlin.version>1.4.32</kotlin.version>
|
||||||
<lwjgl.version>3.2.3</lwjgl.version>
|
<lwjgl.version>3.2.3</lwjgl.version>
|
||||||
</properties>
|
</properties>
|
||||||
@ -268,7 +267,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jline</groupId>
|
<groupId>org.jline</groupId>
|
||||||
<artifactId>jline</artifactId>
|
<artifactId>jline</artifactId>
|
||||||
<version>3.19.0</version>
|
<version>3.20.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
@ -339,12 +338,12 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.oshi</groupId>
|
<groupId>com.github.oshi</groupId>
|
||||||
<artifactId>oshi-core</artifactId>
|
<artifactId>oshi-core</artifactId>
|
||||||
<version>5.6.1</version>
|
<version>5.7.2</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.squareup.moshi</groupId>
|
<groupId>com.squareup.moshi</groupId>
|
||||||
<artifactId>moshi-kotlin</artifactId>
|
<artifactId>moshi-kotlin</artifactId>
|
||||||
<version>1.11.0</version>
|
<version>1.12.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user