Skip to content

Commit

Permalink
fixed #77 by updating to java-21 and javafx-21
Browse files Browse the repository at this point in the history
  • Loading branch information
barclay-reg committed Aug 21, 2024
1 parent 14a7f7a commit 7de4cba
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 17
java-version: 21
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
- name: Execute Gradle build
Expand Down
18 changes: 9 additions & 9 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import org.gradle.internal.os.OperatingSystem


plugins {
val kotlinVersion = "1.7.10"
val kotlinVersion = "1.9.24"
application

jacoco
Expand All @@ -17,7 +17,7 @@ plugins {
id("org.sonarqube") version "5.1.0.4882"
id("com.github.ben-manes.versions") version "0.36.0"

id("org.openjfx.javafxplugin") version "0.0.13"
id("org.openjfx.javafxplugin") version "0.1.0"

id("org.javamodularity.moduleplugin") version "1.8.12"
id("org.beryx.jlink") version "2.25.0"
Expand Down Expand Up @@ -48,7 +48,7 @@ application {
}

java {
sourceCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_21
}

kapt {
Expand All @@ -64,7 +64,7 @@ configurations {
val spek_version = "2.0.4"

dependencies {
val daggerVersion = "2.43.1"
val daggerVersion = "2.50" // with dagger 2.52 they introduced an incomplete usage ofjakarta.inject
antlr(group = "org.antlr", name = "antlr4", version = "4.9.1")
implementation(group = "org.antlr", name = "antlr4-runtime", version = "4.9.1")

Expand All @@ -81,14 +81,14 @@ dependencies {
implementation(kotlin("stdlib-jdk8"))

testImplementation("commons-io:commons-io:2.8.0")
testImplementation("org.mockito:mockito-core:4.5.1")
testImplementation("org.mockito.kotlin:mockito-kotlin:4.1.0")
testImplementation("org.assertj:assertj-core:3.18.1")
testImplementation("org.mockito:mockito-core:5.12.0")
testImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
testImplementation("org.assertj:assertj-core:3.26.3")
testImplementation("junit:junit-dep:4.11")
}

javafx {
version = "17.0.1"
version = "21.0.4"
modules("javafx.base", "javafx.controls", "javafx.fxml", "javafx.graphics")
}

Expand Down Expand Up @@ -168,7 +168,7 @@ tasks.withType<AntlrTask> {
}

tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "17"
kotlinOptions.jvmTarget = "21"
}

//tasks.named("dependencyUpdates", com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask::class.java).configure {
Expand Down

0 comments on commit 7de4cba

Please sign in to comment.