Skip to content

Commit

Permalink
Update Java, Gradle, Quarkus & Spotless
Browse files Browse the repository at this point in the history
  • Loading branch information
Brutus5000 committed Jul 1, 2024
1 parent 8af51f8 commit d0bd627
Show file tree
Hide file tree
Showing 24 changed files with 403 additions and 299 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'
- name: Get tag or branch
id: get_tag_or_branch
run: |
Expand Down
15 changes: 6 additions & 9 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
val kotlinVersion = "2.0.0"

Expand Down Expand Up @@ -47,8 +49,6 @@ group = "com.faforever.icebreaker"
version = "1.0.0-SNAPSHOT"

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

tasks.withType<Test> {
Expand All @@ -61,12 +61,9 @@ allOpen {
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
javaParameters = true

// For creation of default methods in interfaces
freeCompilerArgs = listOf("-Xjvm-default=all")
compilerOptions {
jvmTarget.set(JvmTarget.JVM_21)
javaParameters.set(true)
}
}

Expand Down Expand Up @@ -96,7 +93,7 @@ noArg {
}

spotless {
val ktlintVersion = "0.49.1"
val ktlintVersion = "1.3.0"
kotlin {
ktlint(ktlintVersion)
}
Expand Down
10 changes: 4 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#Gradle properties
#Sun Nov 19 14:11:53 CET 2023
quarkusPlatformArtifactId=quarkus-bom
quarkusPlatformGroupId=io.quarkus.platform
quarkusPlatformVersion=3.5.0
quarkusPluginId=io.quarkus
quarkusPluginVersion=3.5.0
quarkusPluginVersion=3.12.0
quarkusPlatformGroupId=io.quarkus.platform
quarkusPlatformArtifactId=quarkus-bom
quarkusPlatformVersion=3.12.0
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit d0bd627

Please sign in to comment.