mirror of
https://github.com/ProjectSWGCore/Holocore.git
synced 2026-01-15 23:05:45 -05:00
Updated Java version to 13
This commit is contained in:
4
.github/workflows/deploy.yml
vendored
4
.github/workflows/deploy.yml
vendored
@@ -13,10 +13,10 @@ jobs:
|
|||||||
- uses: actions/checkout@v1
|
- uses: actions/checkout@v1
|
||||||
with:
|
with:
|
||||||
submodules: true
|
submodules: true
|
||||||
- name: Set up JDK 12
|
- name: Set up JDK 13
|
||||||
uses: actions/setup-java@v1
|
uses: actions/setup-java@v1
|
||||||
with:
|
with:
|
||||||
java-version: 12
|
java-version: 13
|
||||||
- name: Build
|
- name: Build
|
||||||
run: ./gradlew --no-daemon clean test jlink
|
run: ./gradlew --no-daemon clean test jlink
|
||||||
- name: Docker Login
|
- name: Docker Login
|
||||||
|
|||||||
4
.github/workflows/verify.yml
vendored
4
.github/workflows/verify.yml
vendored
@@ -16,9 +16,9 @@ jobs:
|
|||||||
- uses: actions/checkout@v1
|
- uses: actions/checkout@v1
|
||||||
with:
|
with:
|
||||||
submodules: true
|
submodules: true
|
||||||
- name: Set up JDK 12
|
- name: Set up JDK 13
|
||||||
uses: actions/setup-java@v1
|
uses: actions/setup-java@v1
|
||||||
with:
|
with:
|
||||||
java-version: 12
|
java-version: 13
|
||||||
- name: Test with Gradle
|
- name: Test with Gradle
|
||||||
run: ./gradlew --no-daemon test
|
run: ./gradlew --no-daemon test
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ plugins {
|
|||||||
id("org.beryx.jlink") version "2.17.2"
|
id("org.beryx.jlink") version "2.17.2"
|
||||||
}
|
}
|
||||||
|
|
||||||
val javaMajorVersion = "12"
|
val javaMajorVersion = "13"
|
||||||
|
val kotlinTargetVersion = "12"
|
||||||
|
|
||||||
application {
|
application {
|
||||||
mainClassName = "holocore/com.projectswg.holocore.ProjectSWG"
|
mainClassName = "holocore/com.projectswg.holocore.ProjectSWG"
|
||||||
@@ -91,7 +92,7 @@ tasks.named<ShadowJar>("shadowJar") {
|
|||||||
|
|
||||||
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class).configureEach {
|
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class).configureEach {
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
jvmTarget = javaMajorVersion
|
jvmTarget = kotlinTargetVersion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user