Merge branch 'altro3-minor-script-fixes'

aot-plugin/build.gradle

@@ -10,9 +10,10 @@ micronautPlugins {
 }
 
 dependencies {
-    api project(":micronaut-minimal-plugin")
-    api project(":micronaut-docker-plugin")
-    api project(":micronaut-graalvm-plugin")
+    api projects.micronautMinimalPlugin
+    api projects.micronautDockerPlugin
+    api projects.micronautGraalvmPlugin
+
     implementation libs.micronaut.aot.api
     implementation libs.micronaut.aot.core
     implementation libs.micronaut.aot.std
@@ -21,5 +22,5 @@ dependencies {
     compileOnly libs.bundles.optionalPlugins
     compileOnly libs.shadowPlugin
 
-    testImplementation testFixtures(project(":micronaut-minimal-plugin"))
+    testImplementation testFixtures(projects.micronautMinimalPlugin)
 }

crac-plugin/build.gradle

@@ -9,10 +9,9 @@ micronautPlugins {
 }
 
 dependencies {
-    api project(":micronaut-minimal-plugin")
-
-    api project(":micronaut-docker-plugin")
+    api projects.micronautMinimalPlugin
+    api projects.micronautDockerPlugin
 
     testCompileOnly(libs.jetbrains.annotations)
-    testImplementation testFixtures(project(":micronaut-minimal-plugin"))
+    testImplementation testFixtures(projects.micronautMinimalPlugin)
 }

docker-plugin/build.gradle

@@ -9,11 +9,11 @@ micronautPlugins {
 }
 
 dependencies {
-    api project(":micronaut-minimal-plugin")
+    api projects.micronautMinimalPlugin
     api libs.dockerPlug
 
     compileOnly libs.graalvmPlugin
 
-    testImplementation testFixtures(project(":micronaut-minimal-plugin"))
+    testImplementation testFixtures(projects.micronautMinimalPlugin)
     testImplementation libs.mockserver.netty
 }

functional-tests/build.gradle

@@ -24,5 +24,5 @@ functionalTesting {
 
 dependencies {
     testImplementation gradleTestKit()
-    testImplementation testFixtures(project(":micronaut-minimal-plugin"))
+    testImplementation testFixtures(projects.micronautMinimalPlugin)
 }

graalvm-plugin/build.gradle

@@ -9,7 +9,7 @@ micronautPlugins {
 }
 
 dependencies {
-    api project(":micronaut-minimal-plugin")
+    api projects.micronautMinimalPlugin
     api libs.graalvmPlugin
-    testImplementation testFixtures(project(":micronaut-minimal-plugin"))
+    testImplementation testFixtures(projects.micronautMinimalPlugin)
 }

gradle-plugin/build.gradle

@@ -15,15 +15,15 @@ dependencies {
             because("Log4j2 <2.15 is vulnerable to RCE (CVE-2021-44228)")
         }
     }
-    api project(":micronaut-minimal-plugin")
-    api project(":micronaut-docker-plugin")
-    api project(":micronaut-graalvm-plugin")
-    api project(":micronaut-aot-plugin")
-    api project(":micronaut-test-resources-plugin")
+    api projects.micronautMinimalPlugin
+    api projects.micronautDockerPlugin
+    api projects.micronautGraalvmPlugin
+    api projects.micronautAotPlugin
+    api projects.micronautTestResourcesPlugin
 
     implementation libs.diffplugPlugin
 
     compileOnly libs.bundles.optionalPlugins
 
-    testImplementation testFixtures(project(":micronaut-minimal-plugin"))
+    testImplementation testFixtures(projects.micronautMinimalPlugin)
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

openapi-plugin/build.gradle

@@ -10,6 +10,6 @@ micronautPlugins {
 
 dependencies {
     compileOnly libs.micronaut.openapi.generator
-    implementation project(":micronaut-minimal-plugin")
-    testImplementation testFixtures(project(":micronaut-minimal-plugin"))
+    implementation projects.micronautMinimalPlugin
+    testImplementation testFixtures(projects.micronautMinimalPlugin)
 }

platform-catalog-plugin/build.gradle

@@ -14,5 +14,5 @@ micronautPlugins {
 
 dependencies {
     implementation(libs.tomlj)
-    testImplementation testFixtures(project(":micronaut-minimal-plugin"))
+    testImplementation testFixtures(projects.micronautMinimalPlugin)
 }

settings.gradle

@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'io.micronaut.build.shared.settings' version '7.1.4'
+    id 'io.micronaut.build.shared.settings' version '7.2.2'
 }
 
 rootProject.name = 'micronaut-gradle-plugin-parent'
@@ -22,6 +22,8 @@ include("openapi-plugin")
 include("test-resources-plugin")
 include("functional-tests")
 
+enableFeaturePreview 'TYPESAFE_PROJECT_ACCESSORS'
+
 micronautBuild {
     useStandardizedProjectNames = true
     nonStandardProjectNamePrefixes.add("functional-tests")

test-resources-plugin/build.gradle

@@ -10,9 +10,11 @@ micronautPlugins {
 }
 
 dependencies {
-    implementation libs.micronaut.testresources
-    implementation project(":micronaut-minimal-plugin")
     compileOnly libs.graalvmPlugin
-    compileOnly project(":micronaut-aot-plugin")
-    testImplementation testFixtures(project(":micronaut-minimal-plugin"))
+    compileOnly projects.micronautAotPlugin
+
+    implementation libs.micronaut.testresources
+    implementation projects.micronautMinimalPlugin
+
+    testImplementation testFixtures(projects.micronautMinimalPlugin)
 }