Merge pull request #17 from pedrolamarao/feature/gradle-8.4

Update Gradle to 8.4 and apply new "locked" configurations

README.adoc

@@ -13,10 +13,11 @@ Features:
 
 [WARNING]
 This project is under early development; compatibility *will be broken* without prior notice.
+In particular, we aim to stabilize our Gradle dependency on future version 9.
 
 Requirements:
 
-* Gradle 8.3 or newer
+* Gradle 8.4 or newer
 * JDK 17 or newer
 * LLVM 16 or newer (with clang, clang-scan-deps, lld, llvm-ar etc.)
 

build.gradle.kts

@@ -13,5 +13,5 @@ subprojects {
 }
 
 tasks.wrapper.configure {
-    gradleVersion = "8.3"
+    gradleVersion = "8.4-rc-2"
 }

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# 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
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

plugins/src/main/java/br/dev/pedrolamarao/gradle/metal/base/MetalBasePlugin.java

@@ -32,36 +32,23 @@ public void apply (Project project)
         final var configurations = project.getConfigurations();
         final var tasks = project.getTasks();
 
-        configurations.create(COMMANDS_ELEMENTS, configuration ->
-        {
-            configuration.setCanBeConsumed(true);
-            configuration.setCanBeResolved(false);
+        configurations.consumable(COMMANDS_ELEMENTS, configuration -> {
             configuration.attributes(it -> it.attribute(MetalCapability.ATTRIBUTE, MetalCapability.COMMANDS));
         });
 
-        final var nativeImplementation = configurations.create("nativeImplementation",configuration -> {
-            configuration.setCanBeConsumed(true);
-            configuration.setCanBeResolved(false);
-        });
+        final var nativeImplementation = configurations.dependencyScope("nativeImplementation");
 
-        configurations.create(EMPTY_ELEMENTS, configuration -> {
+        configurations.consumable(EMPTY_ELEMENTS, configuration -> {
             configuration.attributes(it -> it.attribute(MetalCapability.ATTRIBUTE, MetalCapability.NONE));
-            configuration.setCanBeConsumed(true);
-            configuration.setCanBeDeclared(false);
-            configuration.setCanBeResolved(false);
             configuration.setVisible(false);
         });
 
-        configurations.create(LINKABLE_DEPENDENCIES, configuration -> {
-            configuration.setCanBeConsumed(false);
-            configuration.setCanBeResolved(true);
+        configurations.resolvable(LINKABLE_DEPENDENCIES, configuration -> {
             configuration.attributes(it -> it.attribute(MetalCapability.ATTRIBUTE, MetalCapability.LINKABLE));
-            configuration.extendsFrom(nativeImplementation);
+            configuration.extendsFrom(nativeImplementation.get());
         });
 
-        configurations.create(LINKABLE_ELEMENTS, configuration -> {
-            configuration.setCanBeConsumed(true);
-            configuration.setCanBeResolved(false);
+        configurations.consumable(LINKABLE_ELEMENTS, configuration -> {
             configuration.attributes(it -> it.attribute(MetalCapability.ATTRIBUTE, MetalCapability.LINKABLE));
         });
 

samples/application-asm/build.gradle.kts

@@ -4,5 +4,5 @@ plugins {
 }
 
 tasks.wrapper.configure {
-    gradleVersion = "8.3"
+    gradleVersion = "8.4-rc-2"
 }

samples/application-c/build.gradle.kts

@@ -4,5 +4,5 @@ plugins {
 }
 
 tasks.wrapper.configure {
-    gradleVersion = "8.3"
+    gradleVersion = "8.4-rc-2"
 }

samples/application-cxx/build.gradle.kts

@@ -4,5 +4,5 @@ plugins {
 }
 
 tasks.wrapper.configure {
-    gradleVersion = "8.3"
+    gradleVersion = "8.4-rc-2"
 }

samples/application-mixed/build.gradle.kts

@@ -6,5 +6,5 @@ plugins {
 }
 
 tasks.wrapper.configure {
-    gradleVersion = "8.3"
+    gradleVersion = "8.4-rc-2"
 }

samples/archive-asm/build.gradle.kts

@@ -4,5 +4,5 @@ plugins {
 }
 
 tasks.wrapper.configure {
-    gradleVersion = "8.3"
+    gradleVersion = "8.4-rc-2"
 }

samples/archive-c/build.gradle.kts

@@ -4,5 +4,5 @@ plugins {
 }
 
 tasks.wrapper.configure {
-    gradleVersion = "8.3"
+    gradleVersion = "8.4-rc-2"
 }

samples/archive-cxx/build.gradle.kts

@@ -4,5 +4,5 @@ plugins {
 }
 
 tasks.wrapper.configure {
-    gradleVersion = "8.3"
+    gradleVersion = "8.4-rc-2"
 }

samples/archive-mixed/build.gradle.kts

@@ -6,5 +6,5 @@ plugins {
 }
 
 tasks.wrapper.configure {
-    gradleVersion = "8.3"
+    gradleVersion = "8.4-rc-2"
 }

samples/bare-metal-multiboot2/build.gradle.kts

@@ -34,5 +34,5 @@ tasks.assemble.configure {
 }
 
 tasks.wrapper.configure {
-    gradleVersion = "8.3"
+    gradleVersion = "8.4-rc-2"
 }

samples/dependency-on-external-cmake-ninja/build.gradle.kts

@@ -3,5 +3,5 @@ plugins {
 }
 
 tasks.wrapper.configure {
-    gradleVersion = "8.3"
+    gradleVersion = "8.4-rc-2"
 }

samples/dependency-on-external-prebuilt/build.gradle.kts

@@ -3,5 +3,5 @@ plugins {
 }
 
 tasks.wrapper.configure {
-    gradleVersion = "8.3"
+    gradleVersion = "8.4-rc-2"
 }

samples/dependency-on-subproject-headers/build.gradle.kts

@@ -3,5 +3,5 @@ plugins {
 }
 
 tasks.wrapper.configure {
-    gradleVersion = "8.3"
+    gradleVersion = "8.4-rc-2"
 }

samples/dependency-on-subproject-modules/build.gradle.kts

@@ -3,5 +3,5 @@ plugins {
 }
 
 tasks.wrapper.configure {
-    gradleVersion = "8.3"
+    gradleVersion = "8.4-rc-2"
 }

settings.gradle.kts

@@ -1,5 +1,11 @@
 // Copyright (c) Pedro Lamarão <pedro.lamarao@gmail.com>. All rights reserved.
 
+dependencyResolutionManagement {
+    repositories {
+        mavenCentral()
+    }
+}
+
 rootProject.name = "gradle-metal"
 
 include("plugins")