From f5789ed721c1609899d9197a34d73b223289fc96 Mon Sep 17 00:00:00 2001 From: Goooler Date: Thu, 30 Mar 2023 20:55:38 +0800 Subject: [PATCH] Use Java 17 for setup-java in GitHub Actions (#2938) --- .github/workflows/check.yml | 2 +- .github/workflows/dokka-examples.yml | 10 +++++----- .github/workflows/gh-actions-artifacts-snapshots.yml | 6 +++--- .github/workflows/gh-pages-examples.yml | 4 ++-- .github/workflows/gh-pages.yml | 2 +- .github/workflows/gradle-test.pr.yml | 4 ++-- .github/workflows/s3-snapshots.yml | 6 +++--- .../org/jetbrains/conventions/base-java.gradle.kts | 3 --- .../org/jetbrains/conventions/kotlin-jvm.gradle.kts | 1 - 9 files changed, 17 insertions(+), 21 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index de47bf2454..f3ae5ded50 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 11 + java-version: 17 cache: 'maven' - uses: gradle/gradle-build-action@v2 with: diff --git a/.github/workflows/dokka-examples.yml b/.github/workflows/dokka-examples.yml index 797cf5bc88..4d3a9f8d20 100644 --- a/.github/workflows/dokka-examples.yml +++ b/.github/workflows/dokka-examples.yml @@ -30,7 +30,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 11 + java-version: 17 cache: 'maven' - uses: gradle/gradle-build-action@v2 with: @@ -61,7 +61,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 11 + java-version: 17 cache: 'maven' - uses: gradle/gradle-build-action@v2 with: @@ -86,7 +86,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 11 + java-version: 17 cache: 'maven' - uses: gradle/gradle-build-action@v2 with: @@ -113,7 +113,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 11 + java-version: 17 cache: 'maven' - uses: gradle/gradle-build-action@v2 with: @@ -136,7 +136,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 11 + java-version: 17 cache: 'maven' - run: mvn compile dokka:dokka working-directory: examples/maven diff --git a/.github/workflows/gh-actions-artifacts-snapshots.yml b/.github/workflows/gh-actions-artifacts-snapshots.yml index 9f0a340241..d027b00921 100644 --- a/.github/workflows/gh-actions-artifacts-snapshots.yml +++ b/.github/workflows/gh-actions-artifacts-snapshots.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 11 + java-version: 17 cache: 'maven' - name: Document coroutines uses: gradle/gradle-build-action@v2 @@ -45,7 +45,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 11 + java-version: 17 cache: 'maven' - name: Document serialization uses: gradle/gradle-build-action@v2 @@ -72,7 +72,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 11 + java-version: 17 cache: 'maven' - name: Document biojava-core uses: gradle/gradle-build-action@v2 diff --git a/.github/workflows/gh-pages-examples.yml b/.github/workflows/gh-pages-examples.yml index fd8ddd0f84..81c9f195eb 100644 --- a/.github/workflows/gh-pages-examples.yml +++ b/.github/workflows/gh-pages-examples.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 11 + java-version: 17 cache: 'maven' - uses: gradle/gradle-build-action@v2 with: @@ -65,7 +65,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 11 + java-version: 17 cache: 'maven' - uses: gradle/gradle-build-action@v2 with: diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index c62dc258c5..ab8e9aeb4f 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -25,7 +25,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 11 + java-version: 17 cache: 'maven' - uses: gradle/gradle-build-action@v2 with: diff --git a/.github/workflows/gradle-test.pr.yml b/.github/workflows/gradle-test.pr.yml index 97390b6cf5..74017edc8a 100644 --- a/.github/workflows/gradle-test.pr.yml +++ b/.github/workflows/gradle-test.pr.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: ${{ matrix.javaVersion }} + java-version: 17 cache: 'maven' - uses: gradle/gradle-build-action@v2 env: @@ -37,7 +37,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: ${{ matrix.javaVersion }} + java-version: 17 cache: 'maven' - uses: gradle/gradle-build-action@v2 env: diff --git a/.github/workflows/s3-snapshots.yml b/.github/workflows/s3-snapshots.yml index 1576c60dca..af69e494f0 100644 --- a/.github/workflows/s3-snapshots.yml +++ b/.github/workflows/s3-snapshots.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 11 + java-version: 17 cache: 'maven' - name: Document coroutines uses: gradle/gradle-build-action@v2 @@ -49,7 +49,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 11 + java-version: 17 cache: 'maven' - name: Document serialization uses: gradle/gradle-build-action@v2 @@ -80,7 +80,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 11 + java-version: 17 cache: 'maven' - name: Document biojava-core uses: gradle/gradle-build-action@v2 diff --git a/build-logic/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts b/build-logic/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts index 0dbac364c6..cff7eb3ebe 100644 --- a/build-logic/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts +++ b/build-logic/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts @@ -16,9 +16,6 @@ java { toolchain { languageVersion.set(dokkaBuild.mainJavaVersion) } -} - -java { withSourcesJar() } diff --git a/build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts b/build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts index 28a8d76d25..a96a004b24 100644 --- a/build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts +++ b/build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts @@ -4,7 +4,6 @@ import org.jetbrains.configureDokkaVersion import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id("org.jetbrains.conventions.base") id("org.jetbrains.conventions.base-java") kotlin("jvm") }