Advertisement
Guest User

gradle-toolchain.patch

a guest
Feb 21st, 2024
20
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.01 KB | None | 0 0
  1. diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
  2. index 6c61d50..bf3a582 100644
  3. --- a/buildSrc/build.gradle.kts
  4. +++ b/buildSrc/build.gradle.kts
  5. @@ -14,8 +14,3 @@ dependencies {
  6. // see here for more: https://github.com/gradle/gradle/issues/15383
  7. implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
  8. }
  9. -
  10. -java {
  11. - sourceCompatibility = JavaVersion.VERSION_11
  12. - targetCompatibility = JavaVersion.VERSION_11
  13. -}
  14. diff --git a/buildSrc/src/main/kotlin/pklAllProjects.gradle.kts b/buildSrc/src/main/kotlin/pklAllProjects.gradle.kts
  15. index 4daf287..8c4768f 100644
  16. --- a/buildSrc/src/main/kotlin/pklAllProjects.gradle.kts
  17. +++ b/buildSrc/src/main/kotlin/pklAllProjects.gradle.kts
  18. @@ -22,15 +22,8 @@ configurations {
  19. }
  20. }
  21.  
  22. -plugins.withType(JavaPlugin::class).configureEach {
  23. - val java = project.extensions.getByType<JavaPluginExtension>()
  24. - java.sourceCompatibility = JavaVersion.VERSION_11
  25. - java.targetCompatibility = JavaVersion.VERSION_11
  26. -}
  27. -
  28. tasks.withType<KotlinCompile>().configureEach {
  29. kotlinOptions {
  30. - jvmTarget = "11"
  31. freeCompilerArgs = freeCompilerArgs + listOf("-Xjsr305=strict", "-Xjvm-default=all")
  32. }
  33. }
  34. diff --git a/buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts b/buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts
  35. index 720eb74..bf36fb4 100644
  36. --- a/buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts
  37. +++ b/buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts
  38. @@ -17,6 +17,11 @@ val libs = the<LibrariesForLibs>()
  39. java {
  40. withSourcesJar() // creates `sourcesJar` task
  41. withJavadocJar()
  42. +
  43. + toolchain {
  44. + languageVersion.set(JavaLanguageVersion.of(11))
  45. + vendor.set(JvmVendorSpec.ADOPTIUM)
  46. + }
  47. }
  48.  
  49. artifacts {
  50. diff --git a/buildSrc/src/main/kotlin/pklKotlinLibrary.gradle.kts b/buildSrc/src/main/kotlin/pklKotlinLibrary.gradle.kts
  51. index cbc7283..8208350 100644
  52. --- a/buildSrc/src/main/kotlin/pklKotlinLibrary.gradle.kts
  53. +++ b/buildSrc/src/main/kotlin/pklKotlinLibrary.gradle.kts
  54. @@ -24,6 +24,11 @@ tasks.compileKotlin {
  55. enabled = true // disabled by pklJavaLibrary
  56. }
  57.  
  58. +kotlin.jvmToolchain {
  59. + languageVersion.set(JavaLanguageVersion.of(11))
  60. + vendor.set(JvmVendorSpec.ADOPTIUM)
  61. +}
  62. +
  63. spotless {
  64. kotlin {
  65. ktfmt(libs.versions.ktfmt.get()).googleStyle()
  66. diff --git a/settings.gradle.kts b/settings.gradle.kts
  67. index 6d1da1d..c8687be 100644
  68. --- a/settings.gradle.kts
  69. +++ b/settings.gradle.kts
  70. @@ -26,6 +26,10 @@ pluginManagement {
  71. }
  72. }
  73.  
  74. +plugins {
  75. + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
  76. +}
  77. +
  78. @Suppress("UnstableApiUsage")
  79. dependencyResolutionManagement {
  80. repositories {
  81. @@ -33,11 +37,6 @@ dependencyResolutionManagement {
  82. }
  83. }
  84.  
  85. -val javaVersion = JavaVersion.current()
  86. -require(javaVersion.isJava11Compatible) {
  87. - "Project requires Java 11 or higher, but found ${javaVersion.majorVersion}."
  88. -}
  89. -
  90. if (gradle.startParameter.taskNames.contains("updateDependencyLocks") ||
  91. gradle.startParameter.taskNames.contains("uDL")
  92. ) {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement