Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
- index 6c61d50..bf3a582 100644
- --- a/buildSrc/build.gradle.kts
- +++ b/buildSrc/build.gradle.kts
- @@ -14,8 +14,3 @@ dependencies {
- // see here for more: https://github.com/gradle/gradle/issues/15383
- implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
- }
- -
- -java {
- - sourceCompatibility = JavaVersion.VERSION_11
- - targetCompatibility = JavaVersion.VERSION_11
- -}
- diff --git a/buildSrc/src/main/kotlin/pklAllProjects.gradle.kts b/buildSrc/src/main/kotlin/pklAllProjects.gradle.kts
- index 4daf287..8c4768f 100644
- --- a/buildSrc/src/main/kotlin/pklAllProjects.gradle.kts
- +++ b/buildSrc/src/main/kotlin/pklAllProjects.gradle.kts
- @@ -22,15 +22,8 @@ configurations {
- }
- }
- -plugins.withType(JavaPlugin::class).configureEach {
- - val java = project.extensions.getByType<JavaPluginExtension>()
- - java.sourceCompatibility = JavaVersion.VERSION_11
- - java.targetCompatibility = JavaVersion.VERSION_11
- -}
- -
- tasks.withType<KotlinCompile>().configureEach {
- kotlinOptions {
- - jvmTarget = "11"
- freeCompilerArgs = freeCompilerArgs + listOf("-Xjsr305=strict", "-Xjvm-default=all")
- }
- }
- diff --git a/buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts b/buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts
- index 720eb74..bf36fb4 100644
- --- a/buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts
- +++ b/buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts
- @@ -17,6 +17,11 @@ val libs = the<LibrariesForLibs>()
- java {
- withSourcesJar() // creates `sourcesJar` task
- withJavadocJar()
- +
- + toolchain {
- + languageVersion.set(JavaLanguageVersion.of(11))
- + vendor.set(JvmVendorSpec.ADOPTIUM)
- + }
- }
- artifacts {
- diff --git a/buildSrc/src/main/kotlin/pklKotlinLibrary.gradle.kts b/buildSrc/src/main/kotlin/pklKotlinLibrary.gradle.kts
- index cbc7283..8208350 100644
- --- a/buildSrc/src/main/kotlin/pklKotlinLibrary.gradle.kts
- +++ b/buildSrc/src/main/kotlin/pklKotlinLibrary.gradle.kts
- @@ -24,6 +24,11 @@ tasks.compileKotlin {
- enabled = true // disabled by pklJavaLibrary
- }
- +kotlin.jvmToolchain {
- + languageVersion.set(JavaLanguageVersion.of(11))
- + vendor.set(JvmVendorSpec.ADOPTIUM)
- +}
- +
- spotless {
- kotlin {
- ktfmt(libs.versions.ktfmt.get()).googleStyle()
- diff --git a/settings.gradle.kts b/settings.gradle.kts
- index 6d1da1d..c8687be 100644
- --- a/settings.gradle.kts
- +++ b/settings.gradle.kts
- @@ -26,6 +26,10 @@ pluginManagement {
- }
- }
- +plugins {
- + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
- +}
- +
- @Suppress("UnstableApiUsage")
- dependencyResolutionManagement {
- repositories {
- @@ -33,11 +37,6 @@ dependencyResolutionManagement {
- }
- }
- -val javaVersion = JavaVersion.current()
- -require(javaVersion.isJava11Compatible) {
- - "Project requires Java 11 or higher, but found ${javaVersion.majorVersion}."
- -}
- -
- if (gradle.startParameter.taskNames.contains("updateDependencyLocks") ||
- gradle.startParameter.taskNames.contains("uDL")
- ) {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement