Deprecations fixes and minor improvements in gradle scripts

micronaut-projects · Oct 27, 2023 · a0a28d6 · a0a28d6
1 parent 7be0f2e
commit a0a28d6
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 22 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ If you are interested in contributing to the Micronaut Framework and are looking
 
 ## JDK Setup
 
-The Micronaut Framework currently requires JDK 8
+The Micronaut Framework currently requires JDK 17
 
 ## IDE Setup
 

diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.convention-base.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.convention-base.gradle
@@ -14,7 +14,7 @@ repositories {
     mavenCentral()
 }
 
-configurations.all {
+configurations.configureEach {
     resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
     resolutionStrategy.cacheDynamicVersionsFor 0, 'seconds'
 }
@@ -62,7 +62,7 @@ tasks.withType(Jar).configureEach {
     preserveFileTimestamps = false
 }
 
-configurations.all {
+configurations.configureEach {
     resolutionStrategy.dependencySubstitution {
         rootProject.subprojects.each {
             if (!it.name.startsWith('test-')) {

diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.convention-library.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.convention-library.gradle
@@ -3,13 +3,11 @@ plugins {
     id "io.micronaut.build.internal.convention-base"
 }
 
-configurations {
-    all {
-        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-            String group = details.requested.group
-            if (group == 'org.ow2.asm') {
-                details.useVersion(libs.versions.asm.get())
-            }
+configurations.configureEach {
+    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+        String group = details.requested.group
+        if (group == 'org.ow2.asm') {
+            details.useVersion(libs.versions.asm.get())
         }
     }
 }

diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.convention-quality.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.convention-quality.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 tasks.named("htmlSanityCheck") {
-    sourceDir = new File("${rootProject.buildDir}/docs/guide/")
+    sourceDir = file("${rootProject.layout.buildDirectory.asFile.get()}/docs/guide/")
     sourceDocuments = fileTree(sourceDir) {
         include "index.html"
     }

diff --git a/core/build.gradle b/core/build.gradle
@@ -31,7 +31,7 @@ spotless {
 }
 
 def versionInfo = tasks.register("micronautVersionInfo", WriteProperties) {
-    outputFile = "${buildDir}/resources/version/micronaut-version.properties"
+    destinationFile = file("${layout.buildDirectory.asFile.get()}/resources/version/micronaut-version.properties")
     property 'micronaut.version', projectVersion
 }
 tasks.named("processResources") {

diff --git a/inject-kotlin/build.gradle b/inject-kotlin/build.gradle
@@ -16,9 +16,7 @@ dependencies {
     api project(":core-processor")
 
     implementation(libs.managed.ksp.api)
-    if (!JavaVersion.current().isJava9Compatible()) {
-        api files(org.gradle.internal.jvm.Jvm.current().toolsJar)
-    }
+
     kspTest(project)
     kspTest platform(libs.test.boms.micronaut.validation)
     kspTest (libs.micronaut.validation.processor) {
@@ -57,9 +55,12 @@ afterEvaluate {
     }
 }
 
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
-    kotlinOptions {
-        jvmTarget = "17"
+kotlin {
+    jvmToolchain(17)
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    compilerOptions {
         freeCompilerArgs = ['-Xjvm-default=all']
     }
 }

diff --git a/test-suite-http-server-tck-netty/build.gradle b/test-suite-http-server-tck-netty/build.gradle
@@ -27,7 +27,7 @@ dependencies {
 }
 
 configurations {
-    all {
+    configureEach {
         // Stop serde pulling in AOP
         exclude group: 'io.micronaut', module: 'micronaut-aop'
         // Stop pulling in inject-groovy from maven
@@ -48,7 +48,7 @@ graalvmNative {
         enabled = true
     }
     binaries {
-        all {
+        configureEach {
             resources.autodetect()
         }
     }

diff --git a/test-suite-logback-graalvm/build.gradle b/test-suite-logback-graalvm/build.gradle
@@ -23,7 +23,7 @@ graalvmNative {
         enabled = true
     }
     binaries {
-        all {
+        configureEach {
             resources.autodetect()
         }
     }

diff --git a/test-suite-netty-ssl-graalvm/build.gradle b/test-suite-netty-ssl-graalvm/build.gradle
@@ -31,7 +31,7 @@ graalvmNative {
         enabled = true
     }
     binaries {
-        all {
+        configureEach {
             resources.autodetect()
         }
     }