Skip to content

Commit 899ae9a

Browse files
authored
Post-Release 2.12.0: Java and Version (#3241)
* Switch the Java version to 17 (in preparation of Java 21) * Set KeY's version to 2.14.0 To be merged after #3242
2 parents 0f0802e + f246d9d commit 899ae9a

10 files changed

Lines changed: 30 additions & 30 deletions

File tree

.github/workflows/artiweb.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,6 @@ jobs:
8383
body: |
8484
Thank you for your contribution.
8585
86-
The test artifacts are available on [Artiweb](https://keyproject.github.io/artiweb/${{steps.rpn.outputs.pr-number}}/).
87-
The newest artifact is [here](https://keyproject.github.io/artiweb/${{steps.rpn.outputs.pr-number}}/${{steps.da.outputs.test-artifact-id}}/).
86+
The test artifacts are available on [Artiweb](e8e3f762-a110-4e21-bc41-cacb5f3a3a50.ka.bw-cloud-instance.org/${{steps.rpn.outputs.pr-number}}/).
87+
The newest artifact is [here](e8e3f762-a110-4e21-bc41-cacb5f3a3a50.ka.bw-cloud-instance.org/${{steps.rpn.outputs.pr-number}}/${{steps.da.outputs.test-artifact-id}}/).
8888
edit-mode: replace

.github/workflows/code_quality.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- uses: actions/setup-java@v3
3131
with:
3232
distribution: 'temurin'
33-
java-version: '11'
33+
java-version: '17'
3434
- name: Build with Gradle
3535
uses: gradle/gradle-build-action@v2.4.2
3636
with:
@@ -61,7 +61,7 @@ jobs:
6161
- uses: actions/setup-java@v3
6262
with:
6363
distribution: 'temurin'
64-
java-version: '11'
64+
java-version: '17'
6565
- name: Build with Gradle
6666
uses: gradle/gradle-build-action@v2.4.2
6767
with:
@@ -87,7 +87,7 @@ jobs:
8787
- uses: actions/setup-java@v3
8888
with:
8989
distribution: 'temurin'
90-
java-version: '11'
90+
java-version: '17'
9191
- name: Build with Gradle
9292
uses: gradle/gradle-build-action@v2.4.2
9393
with:

.github/workflows/gradle-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v3
16-
- name: Set up JDK 11
16+
- name: Set up JDK 17
1717
uses: actions/setup-java@v3
1818
with:
19-
java-version: '11'
19+
java-version: '17'
2020
distribution: 'temurin'
2121
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
2222

.github/workflows/javadoc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
- run: ls -ld
1313
- run: ls -lh 'gradle'
1414

15-
- name: Set up JDK 11
15+
- name: Set up JDK 17
1616
uses: actions/setup-java@v3
1717
with:
18-
java-version: '11'
18+
java-version: '17'
1919
distribution: 'temurin'
2020

2121
- name: Build with Gradle

.github/workflows/opttest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
os: [ubuntu-latest, windows-latest]
15-
java: [11, 17]
15+
java: [17]
1616
tests: [":key.core.proof_references:test", ":key.core.symbolic_execution:test"]
1717
runs-on: ${{matrix.os}}
1818
steps:

.github/workflows/tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
os: [ubuntu-latest, windows-latest]
26-
java: [11, 17]
26+
java: [17]
2727
continue-on-error: true
2828
runs-on: ${{ matrix.os }}
2929
env:
@@ -46,7 +46,7 @@ jobs:
4646
name: pr-number
4747
path: pr/
4848
- uses: actions/checkout@v3
49-
- name: Set up JDK 11
49+
- name: Set up JDK 17
5050
uses: actions/setup-java@v3
5151
with:
5252
java-version: ${{ matrix.java }}
@@ -80,11 +80,11 @@ jobs:
8080
matrix:
8181
test: [testProveRules, testRunAllFunProofs, testRunAllInfProofs]
8282
os: [ubuntu-latest]
83-
java: [11]
83+
java: [17]
8484
runs-on: ${{ matrix.os }}
8585
steps:
8686
- uses: actions/checkout@v3
87-
- name: Set up JDK 11
87+
- name: Set up JDK 17
8888
uses: actions/setup-java@v3
8989
with:
9090
java-version: ${{ matrix.java }}

.github/workflows/tests_winmac.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
os: [macos-latest, ubuntu-latest, windows-latest]
17-
java: [11, 17]
17+
java: [17]
1818
continue-on-error: true
1919
runs-on: ${{ matrix.os }}
2020
env:
2121
GH_TOKEN: ${{ github.token }}
2222
steps:
2323
- uses: actions/checkout@v3
24-
- name: Set up JDK 11
24+
- name: Set up JDK 17
2525
uses: actions/setup-java@v3
2626
with:
2727
java-version: ${{ matrix.java }}
@@ -52,11 +52,11 @@ jobs:
5252
matrix:
5353
test: [testProveRules, testRunAllFunProofs, testRunAllInfProofs]
5454
os: [ macos-latest, ubuntu-latest, windows-latest ]
55-
java: [11,17]
55+
java: [17]
5656
runs-on: ${{ matrix.os }}
5757
steps:
5858
- uses: actions/checkout@v3
59-
- name: Set up JDK 11
59+
- name: Set up JDK 17
6060
uses: actions/setup-java@v3
6161
with:
6262
java-version: ${{ matrix.java }}

.github/workflows/update_symbex_oracles.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
continue-on-error: true
1818
steps:
1919
- uses: actions/checkout@v3
20-
- name: Set up JDK 11
20+
- name: Set up JDK 17
2121
uses: actions/setup-java@v3
2222
with:
23-
java-version: '11'
23+
java-version: '17'
2424
distribution: 'temurin'
2525

2626
- name: Build with Gradle

.gitlab-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Jenkins runs are triggered from somewhere else.
66
#
77

8-
image: wadoon/key-test-docker:jdk11
8+
image: wadoon/key-test-docker:jdk17
99

1010
cache:
1111
policy: pull-push
@@ -47,7 +47,7 @@ compile:classes:
4747
compile:testClasses:
4848
dependencies: ["compile:classes"]
4949
stage: secondary
50-
image: wadoon/key-test-docker:jdk11
50+
image: wadoon/key-test-docker:jdk17
5151
script:
5252
- javac -version
5353
- gradle --build-cache --parallel testClasses
@@ -61,7 +61,7 @@ compile:testClasses:
6161
sonarqube:
6262
dependencies: ["compile:testClasses"]
6363
stage: ternary
64-
image: wadoon/key-test-docker:jdk11
64+
image: wadoon/key-test-docker:jdk17
6565
allow_failure: true
6666
script:
6767
- ./scripts/tools/sonarqube_hint.py
@@ -82,7 +82,7 @@ sonarqube:
8282

8383
format:
8484
stage: primary
85-
image: wadoon/key-test-docker:jdk11
85+
image: wadoon/key-test-docker:jdk17
8686
allow_failure: true
8787
script:
8888
- gradle spotlessCheck

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static def getDate() {
5050
def build = System.env.BUILD_NUMBER == null ? "" : "-${System.env.BUILD_NUMBER}"
5151

5252
group = "org.key-project"
53-
version = "2.12.0$build"
53+
version = "2.13.0$build"
5454

5555
subprojects {
5656
apply plugin: "java"
@@ -67,8 +67,8 @@ subprojects {
6767
group = rootProject.group
6868
version = rootProject.version
6969

70-
sourceCompatibility = 11
71-
targetCompatibility = 11
70+
sourceCompatibility = 17
71+
targetCompatibility = 17
7272

7373
repositories {
7474
mavenCentral()
@@ -98,8 +98,8 @@ subprojects {
9898
tasks.withType(JavaCompile) {
9999
// Setting UTF-8 as the java source encoding.
100100
options.encoding = "UTF-8"
101-
// Setting the release to Java 11
102-
options.release = 11
101+
// Setting the release to Java 17
102+
options.release = 17
103103
}
104104

105105
tasks.withType(Javadoc) {
@@ -485,7 +485,7 @@ task alldoc(type: Javadoc) {
485485
docTitle = "KeY JavaDoc ($project.version) -- ${getDate()}"
486486
bottom = "Copyright &copy; 2003-2023 <a href=\"http://key-project.org\">The KeY-Project</a>."
487487
use = true
488-
links += "https://docs.oracle.com/en/java/javase/11/docs/api/"
488+
links += "https://docs.oracle.com/en/java/javase/17/docs/api/"
489489
links += "http://www.antlr2.org/javadoc/"
490490
links += "http://www.antlr3.org/api/Java/"
491491
links += "https://www.antlr.org/api/Java/"

0 commit comments

Comments
 (0)