Skip to content

Commit

Permalink
feature: add targetJavaVersion and jdkBuildVersion properties
Browse files Browse the repository at this point in the history
  • Loading branch information
juherr committed Feb 6, 2024
1 parent fcfd1a7 commit e0bf624
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 6 deletions.
4 changes: 4 additions & 0 deletions build-logic/basics/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
plugins {
`kotlin-dsl`
}

tasks.withType<JavaCompile>().configureEach {
options.release.set((project.property("targetJavaVersion") as String).toInt())
}
12 changes: 11 additions & 1 deletion build-logic/code-quality/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,18 @@ dependencies {
implementation("com.github.autostyle:autostyle-plugin-gradle:4.0")
}

kotlin {
jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(project.property("jdkBuildVersion") as String))
}
}

tasks.withType<JavaCompile>().configureEach {
options.release.set((project.property("targetJavaVersion") as String).toInt())
}

tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = JavaVersion.current().majorVersion
jvmTarget = project.property("targetJavaVersion") as String
}
}
12 changes: 11 additions & 1 deletion build-logic/jvm/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,18 @@ dependencies {
implementation("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.6.21")
}

kotlin {
jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(project.property("jdkBuildVersion") as String))
}
}

tasks.withType<JavaCompile>().configureEach {
options.release.set((project.property("targetJavaVersion") as String).toInt())
}

tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = JavaVersion.current().majorVersion
jvmTarget = project.property("targetJavaVersion") as String
}
}
3 changes: 2 additions & 1 deletion build-logic/jvm/src/main/kotlin/testng.java.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ plugins {

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(JavaVersion.current().majorVersion))
languageVersion.set(JavaLanguageVersion.of(project.property("jdkBuildVersion") as String))
}
}

tasks.withType<JavaCompile>().configureEach {
options.release.set((project.property("targetJavaVersion") as String).toInt())
inputs.property("java.version", System.getProperty("java.version"))
inputs.property("java.vendor", System.getProperty("java.vendor"))
inputs.property("java.vm.version", System.getProperty("java.vm.version"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,12 @@ dependencies {
testImplementation("org.jetbrains.kotlin:kotlin-stdlib")
}

tasks.withType<JavaCompile>().configureEach {
options.release.set((project.property("targetJavaVersion") as String).toInt())
}

tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = JavaVersion.current().majorVersion
jvmTarget = project.property("targetJavaVersion") as String
}
}
12 changes: 11 additions & 1 deletion build-logic/publishing/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,18 @@ dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin")
}

kotlin {
jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(project.property("jdkBuildVersion") as String))
}
}

tasks.withType<JavaCompile>().configureEach {
options.release.set((project.property("targetJavaVersion") as String).toInt())
}

tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = JavaVersion.current().majorVersion
jvmTarget = project.property("targetJavaVersion") as String
}
}
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ kotlin.code.style=official
kotlin.stdlib.default.dependency=false

testng.version=7.10.0
systemProp.org.gradle.project.targetJavaVersion=11
systemProp.org.gradle.project.jdkBuildVersion=17

group=org.testng

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ rootProject.name = "testng-root"
plugins {
`gradle-enterprise`
id("de.fayard.refreshVersions") version "0.60.3"
id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
}

gradleEnterprise {
Expand Down

0 comments on commit e0bf624

Please sign in to comment.