Skip to content

Commit

Permalink
Moved build to JDK 8 and test to JDK 11 (fix target)
Browse files Browse the repository at this point in the history
  • Loading branch information
m-raab committed May 30, 2021
1 parent a2aa34d commit 2ba956d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
= JAXB Gradle Plugin
:latestRevision: 5.0.0
:latestRevision: 5.1.0
:toc:
:icons: font

Expand Down
15 changes: 8 additions & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -111,17 +111,18 @@ tasks {
this.javaLauncher.set( project.javaToolchains.launcherFor {
languageVersion.set(JavaLanguageVersion.of(11))
})
systemProperty("intershop.gradle.versions","6.8, 7.0.2")

if(project.hasProperty("repoURL")
&& project.hasProperty("repoUser")
&& project.hasProperty("repoPasswd")) {
systemProperty("intershop.gradle.versions","6.8, 7.0.2")

if(project.hasProperty("repoURL")
&& project.hasProperty("repoUser")
&& project.hasProperty("repoPasswd")) {
systemProperty("repo_url_config", project.property("repoURL").toString())
systemProperty("repo_user_config", project.property("repoUser").toString())
systemProperty("repo_passwd_config", project.property("repoPasswd").toString())
}
}

useJUnitPlatform()
useJUnitPlatform()
}

val copyAsciiDoc = register<Copy>("copyAsciiDoc") {
Expand Down Expand Up @@ -185,7 +186,7 @@ tasks {
getByName("jar")?.dependsOn("asciidoctor")

val compileKotlin by getting(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) {
kotlinOptions.jvmTarget = JavaVersion.VERSION_11.toString()
kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
}

dokkaJavadoc.configure {
Expand Down

0 comments on commit 2ba956d

Please sign in to comment.