Skip to content

Commit 2b8a5b5

Browse files
authored
fix: Java 8 source compatibility (#741)
1 parent 0b4d587 commit 2b8a5b5

File tree

4 files changed

+25
-9
lines changed

4 files changed

+25
-9
lines changed

.github/workflows/generate-artifacts.yml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,38 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
platform: [Bukkit, Paper, Minestom]
12+
platform: [Bukkit, Paper, Minestom, Folia]
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
15+
16+
- name: Checkout Application Repository
17+
uses: actions/checkout@v4
1618
with:
1719
fetch-depth: 0
18-
- uses: gradle/actions/wrapper-validation@v4
19-
- uses: actions/setup-java@v2
20+
21+
- name: Set up JDK 21
22+
uses: actions/setup-java@v4
2023
with:
2124
java-version: '21'
22-
distribution: 'adopt'
25+
distribution: 'temurin'
2326
server-id: github
24-
cache: 'gradle'
27+
settings-path: ${{ github.workspace }}
28+
29+
- name: Set up Gradle
30+
uses: gradle/actions/setup-gradle@v4
31+
2532
- id: vars
2633
name: Downcase Platform Name
2734
uses: ASzc/change-string-case-action@v2
2835
with:
2936
string: ${{ matrix.platform }}
37+
3038
- name: Generate artifacts
3139
uses: burrunan/gradle-cache-action@v1
3240
with:
3341
arguments: inventory-framework-platform-${{ steps.vars.outputs.lowercase }}:shadowJar
3442
gradle-version: wrapper
43+
3544
- name: Upload artifacts
3645
uses: actions/upload-artifact@v4
3746
with:

.github/workflows/publish-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
with:
1616
fetch-depth: 0
1717

18-
- name: Set up JDK 8
18+
- name: Set up JDK 21
1919
uses: actions/setup-java@v4
2020
with:
21-
java-version: '8'
21+
java-version: '21'
2222
distribution: 'temurin'
2323
server-id: github
2424
settings-path: ${{ github.workspace }}

build-logic/conventions/src/main/kotlin/LibraryConventionPlugin.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import com.diffplug.gradle.spotless.SpotlessExtension
2+
import org.gradle.api.JavaVersion
23
import org.gradle.api.Plugin
34
import org.gradle.api.Project
45
import org.gradle.api.artifacts.VersionCatalogsExtension
6+
import org.gradle.api.plugins.JavaPluginExtension
57
import org.gradle.api.tasks.compile.JavaCompile
68
import org.gradle.api.tasks.javadoc.Javadoc
79
import org.gradle.api.tasks.testing.Test
@@ -35,6 +37,10 @@ internal class LibraryConventionPlugin : Plugin<Project> {
3537
private fun Project.configureJava() {
3638
pluginManager.apply("java-library")
3739

40+
extensions.configure<JavaPluginExtension> {
41+
sourceCompatibility = JavaVersion.VERSION_1_8
42+
}
43+
3844
with(tasks) {
3945
withType<Javadoc> {
4046
options.memberLevel = JavadocMemberLevel.PACKAGE

inventory-framework-platform-minestom/src/main/kotlin/me/devnatan/inventoryframework/pipeline/GlobalClickInterceptor.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ class GlobalClickInterceptor : PipelineInterceptor<VirtualView> {
2020

2121
// inherit cancellation so we can un-cancel it
2222
subject.isCancelled =
23-
event.isCancelled || subject.config.isOptionSet(ViewConfig.CANCEL_ON_CLICK, true)
23+
event.isCancelled ||
24+
subject.config.isOptionSet(ViewConfig.CANCEL_ON_CLICK, true)
2425
subject.root.onClick(subject)
2526
}
2627
}

0 commit comments

Comments
 (0)