Use Java 17 for setup-java in GitHub Actions (#2938)

Kotlin · Mar 30, 2023 · f5789ed · f5789ed
1 parent 26dae2f
commit f5789ed
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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")
 }