1
0
mirror of https://github.com/octoleo/plantuml.git synced 2024-12-27 12:42:47 +00:00

Merge pull request #899 from soloturn/master

use javac --release, java8 minimum version
This commit is contained in:
PlantUML 2022-02-07 09:31:12 +01:00 committed by GitHub
commit 065e2b34d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 9 deletions

View File

@ -71,12 +71,12 @@ jobs:
strategy:
fail-fast: false
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 ]
include:
- release_from_this_build: true
os: ubuntu-20.04
java_version: 8
java_version: 11
runs-on: ${{ matrix.os }}
env:
SIGN_ARTIFACTS: ${{ secrets.ARTIFACT_SIGNING_KEY != '' }}

View File

@ -71,12 +71,12 @@ jobs:
strategy:
fail-fast: false
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 ]
include:
- release_from_this_build: true
os: ubuntu-20.04
java_version: 8
java_version: 11
runs-on: ${{ matrix.os }}
env:
SIGN_ARTIFACTS: ${{ secrets.ARTIFACT_SIGNING_KEY != '' }}
@ -144,7 +144,7 @@ jobs:
if: matrix.release_from_this_build
uses: actions/upload-artifact@v2
with:
# Using github.run_number here to reduce confusion when downloading & comparing artifacts from several builds
# Using github.run_number here to reduce confusion when downloading & comparing artifacts from several builds
name: ${{ github.run_number }}-artifacts
path: |
target/*.asc

View File

@ -18,8 +18,6 @@ dependencies {
group = "net.sourceforge.plantuml"
description = "PlantUML"
java.sourceCompatibility = JavaVersion.VERSION_1_8
java.targetCompatibility = JavaVersion.VERSION_1_8
java {
withSourcesJar()
@ -51,6 +49,10 @@ sourceSets {
}
}
tasks.compileJava {
options.release.set(8)
}
tasks.withType<Jar> {
manifest {
attributes["Main-Class"] = "net.sourceforge.plantuml.Run"

View File

@ -56,8 +56,7 @@
</parent>
<properties>
<finalName>${project.artifactId}-${project.version}</finalName>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.release>8</maven.compiler.release>
<main.class>net.sourceforge.plantuml.Run</main.class>
</properties>
<dependencyManagement>