Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stick with Java 17 on CI #2938

Merged
merged 6 commits into from Mar 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/dokka-examples.yml
Expand Up @@ -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
- run: ./gradlew build --no-daemon --stacktrace
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 11
java-version: 17
cache: 'maven'
- uses: gradle/gradle-build-action@v2
- run: ./gradlew dokkaHtml --no-daemon --stacktrace
Expand All @@ -82,7 +82,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 11
java-version: 17
cache: 'maven'
- uses: gradle/gradle-build-action@v2
- run: ./gradlew ${{ matrix.tasks }} --no-daemon --stacktrace
Expand All @@ -107,7 +107,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 11
java-version: 17
cache: 'maven'
- uses: gradle/gradle-build-action@v2
- run: ./gradlew ${{ matrix.task }} --no-daemon --stacktrace
Expand All @@ -128,7 +128,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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/gh-actions-artifacts-snapshots.yml
Expand Up @@ -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
Expand All @@ -44,7 +44,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
Expand All @@ -70,7 +70,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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gh-pages-examples.yml
Expand Up @@ -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
- name: Build html
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 11
java-version: 17
cache: 'maven'
- uses: gradle/gradle-build-action@v2
- name: Build html
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yml
Expand Up @@ -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
- name: Get current dokka version
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gradle-test.pr.yml
Expand Up @@ -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:
Expand All @@ -36,7 +36,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:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/s3-snapshots.yml
Expand Up @@ -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
Expand Down Expand Up @@ -48,7 +48,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
Expand Down Expand Up @@ -78,7 +78,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
Expand Down
Expand Up @@ -16,9 +16,6 @@ java {
toolchain {
languageVersion.set(dokkaBuild.mainJavaVersion)
}
}

java {
withSourcesJar()
}

Expand Down
Expand Up @@ -14,7 +14,6 @@ plugins {

val dokkaBuildProperties: DokkaBuildProperties = extensions.create(DokkaBuildProperties.EXTENSION_NAME)


if (project != rootProject) {
project.group = rootProject.group
project.version = rootProject.version
Expand Down
Expand Up @@ -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")
}
Expand Down