Skip to content

Commit

Permalink
fix build (#326)
Browse files Browse the repository at this point in the history
* fix build
  • Loading branch information
jaredsburrows committed Jul 8, 2023
1 parent 4ca1b18 commit 01569a0
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
17 changes: 10 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile

import java.time.ZonedDateTime
import java.time.format.DateTimeFormatter

Expand Down Expand Up @@ -52,15 +55,15 @@ subprojects {
}
}

tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
tasks.withType(KotlinJvmCompile).configureEach {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_11)
}
}

tasks.withType(JavaCompile).configureEach {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11

configure(options) {
compilerArgs << '-Xlint:all'
Expand All @@ -71,8 +74,8 @@ subprojects {
}

tasks.withType(GroovyCompile).configureEach {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11

configure(options) {
compilerArgs << '-Xlint:all'
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ commons = { module = "org.apache.commons:commons-csv", version = "1.10.0" }
moshi = { module = "com.squareup.moshi:moshi", version = "1.15.0" }
kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
kotlinx-html = { module = "org.jetbrains.kotlinx:kotlinx-html-jvm", version = "0.8.1" }
kotlinx-html = { module = "org.jetbrains.kotlinx:kotlinx-html-jvm", version = "0.9.0" }
maven-model = { module = "org.apache.maven:maven-model", version = "3.9.3" }
spock = { module = "org.spockframework:spock-junit4", version = "2.1-M2-groovy-3.0" }
xmlunit = { module = "org.xmlunit:xmlunit-matchers", version = "2.9.1" }

0 comments on commit 01569a0

Please sign in to comment.