Skip to content

Commit

Permalink
build: java 22 with latest Aya (CI should fail)
Browse files Browse the repository at this point in the history
  • Loading branch information
ice1000 committed Dec 18, 2024
1 parent 7e1a745 commit 3a87053
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ jobs:
- name: Fetch Sources
uses: actions/checkout@v4

# Setup Java 21 environment for the next steps
# Setup Java 22 environment for the next steps
- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: zulu
java-version: 21
java-version: 22
cache: gradle

# Set environment variables
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ jobs:
with:
ref: ${{ github.event.release.tag_name }}

# Setup Java 21 environment for the next steps
# Setup Java 22 environment for the next steps
- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: zulu
java-version: 21
java-version: 22
cache: gradle

# Set environment variables
Expand Down
9 changes: 8 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,15 @@ tasks {
}

withType<KotlinCompile>().configureEach {
compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
compilerOptions.jvmTarget.set(JvmTarget.JVM_22)
dependsOn(genAyaPsiParser)

doLast {
val tree = fileTree(destinationDirectory)
tree.include("**/*.class")
val root = project.layout.buildDirectory.asFile.get().toPath().resolve("classes/kotlin/main")
tree.forEach { BuildUtil.stripPreview(root, it.toPath()) }
}
}

withType<Test>().configureEach {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ platformType = IC
platformVersion = LATEST-EAP-SNAPSHOT

# Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3
javaVersion = 21
javaVersion = 22

# Opt-out flag for bundling Kotlin standard library.
# See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.
Expand Down
4 changes: 2 additions & 2 deletions gradle/deps.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version.project=0.0.1-SNAPSHOT
version.aya=0.36.0-SNAPSHOT
version.aya-upstream=0.0.29
version.aya=0.36.0
version.aya-upstream=0.0.31

0 comments on commit 3a87053

Please sign in to comment.