mirror of
https://github.com/octoleo/plantuml.git
synced 2024-12-28 04:55:58 +00:00
Merge pull request #899 from soloturn/master
use javac --release, java8 minimum version
This commit is contained in:
commit
065e2b34d9
4
.github/workflows/ci-gradle.yml
vendored
4
.github/workflows/ci-gradle.yml
vendored
@ -71,12 +71,12 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
java_version: [ 8, 11, 17 ]
|
java_version: [ 11, 17 ]
|
||||||
os: [ macos-10.15, macos-11, ubuntu-18.04, ubuntu-20.04, windows-2019, windows-2022 ]
|
os: [ macos-10.15, macos-11, ubuntu-18.04, ubuntu-20.04, windows-2019, windows-2022 ]
|
||||||
include:
|
include:
|
||||||
- release_from_this_build: true
|
- release_from_this_build: true
|
||||||
os: ubuntu-20.04
|
os: ubuntu-20.04
|
||||||
java_version: 8
|
java_version: 11
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
env:
|
env:
|
||||||
SIGN_ARTIFACTS: ${{ secrets.ARTIFACT_SIGNING_KEY != '' }}
|
SIGN_ARTIFACTS: ${{ secrets.ARTIFACT_SIGNING_KEY != '' }}
|
||||||
|
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
@ -71,12 +71,12 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
java_version: [ 8, 11, 17 ]
|
java_version: [ 11, 17 ]
|
||||||
os: [ macos-10.15, macos-11, ubuntu-18.04, ubuntu-20.04, windows-2019, windows-2022 ]
|
os: [ macos-10.15, macos-11, ubuntu-18.04, ubuntu-20.04, windows-2019, windows-2022 ]
|
||||||
include:
|
include:
|
||||||
- release_from_this_build: true
|
- release_from_this_build: true
|
||||||
os: ubuntu-20.04
|
os: ubuntu-20.04
|
||||||
java_version: 8
|
java_version: 11
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
env:
|
env:
|
||||||
SIGN_ARTIFACTS: ${{ secrets.ARTIFACT_SIGNING_KEY != '' }}
|
SIGN_ARTIFACTS: ${{ secrets.ARTIFACT_SIGNING_KEY != '' }}
|
||||||
|
@ -18,8 +18,6 @@ dependencies {
|
|||||||
|
|
||||||
group = "net.sourceforge.plantuml"
|
group = "net.sourceforge.plantuml"
|
||||||
description = "PlantUML"
|
description = "PlantUML"
|
||||||
java.sourceCompatibility = JavaVersion.VERSION_1_8
|
|
||||||
java.targetCompatibility = JavaVersion.VERSION_1_8
|
|
||||||
|
|
||||||
java {
|
java {
|
||||||
withSourcesJar()
|
withSourcesJar()
|
||||||
@ -51,6 +49,10 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tasks.compileJava {
|
||||||
|
options.release.set(8)
|
||||||
|
}
|
||||||
|
|
||||||
tasks.withType<Jar> {
|
tasks.withType<Jar> {
|
||||||
manifest {
|
manifest {
|
||||||
attributes["Main-Class"] = "net.sourceforge.plantuml.Run"
|
attributes["Main-Class"] = "net.sourceforge.plantuml.Run"
|
||||||
|
3
pom.xml
3
pom.xml
@ -56,8 +56,7 @@
|
|||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<finalName>${project.artifactId}-${project.version}</finalName>
|
<finalName>${project.artifactId}-${project.version}</finalName>
|
||||||
<maven.compiler.source>1.8</maven.compiler.source>
|
<maven.compiler.release>8</maven.compiler.release>
|
||||||
<maven.compiler.target>1.8</maven.compiler.target>
|
|
||||||
<main.class>net.sourceforge.plantuml.Run</main.class>
|
<main.class>net.sourceforge.plantuml.Run</main.class>
|
||||||
</properties>
|
</properties>
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
|
Loading…
Reference in New Issue
Block a user