Build updates

Author: jpenilla

build-logic/src/main/kotlin/carbon.platform-conventions.gradle.kts

@@ -66,6 +66,9 @@ tasks {
   build {
     dependsOn(copyJar)
   }
+  javadoc {
+    enabled = false
+  }
 }
 
 val projectVersion = project.version as String
@@ -97,10 +100,3 @@ gremlin {
   defaultJarRelocatorDependencies = false
   defaultGremlinRuntimeDependency = false
 }
-
-//val projectVersion = version as String
-//if (projectVersion.endsWith("-SNAPSHOT")) {
-//  // Add git commit hash to version for platforms
-//  val gitHash = latestGitHash() ?: error("Failed to retrieve git commit hash")
-//  version = "$projectVersion+$gitHash"
-//}

build-logic/src/main/kotlin/extensions.kt

@@ -32,7 +32,7 @@ val Project.releaseNotes: Provider<String>
  * Relocate a package into the `carbonchat.libs.` namespace.
  */
 fun Task.relocateDependency(pkg: String) {
-  ShadowGremlin.relocate(this, pkg, "carbonchat.libs.$pkg")
+  ShadowGremlin.relocateWithPrefix(this, "carbonchat.libs", pkg)
 }
 
 fun Task.standardRuntimeRelocations() {

common/src/main/java/net/draycia/carbon/common/util/CarbonDependencies.java

@@ -28,6 +28,7 @@
 import xyz.jpenilla.gremlin.runtime.DependencyCache;
 import xyz.jpenilla.gremlin.runtime.DependencyResolver;
 import xyz.jpenilla.gremlin.runtime.DependencySet;
+import xyz.jpenilla.gremlin.runtime.logging.Slf4jGremlinLogger;
 
 @DefaultQualifier(NonNull.class)
 public final class CarbonDependencies {
@@ -41,7 +42,7 @@ public static Set<Path> resolve(final Path cacheDir) {
         final DependencyCache cache = new DependencyCache(cacheDir);
         final Logger logger = LoggerFactory.getLogger(CarbonDependencies.class.getSimpleName());
         final Set<Path> files;
-        try (final DependencyResolver downloader = new DependencyResolver(logger)) {
+        try (final DependencyResolver downloader = new DependencyResolver(new Slf4jGremlinLogger(logger))) {
             files = downloader.resolve(deps, cache).jarFiles();
         }
         cache.cleanup();

gradle/libs.versions.toml

@@ -10,13 +10,12 @@ resource-factory-velocity-convention = { id = "xyz.jpenilla.resource-factory-vel
 resource-factory-fabric-convention = { id = "xyz.jpenilla.resource-factory-fabric-convention", version.ref = "resource-factory" }
 
 [versions]
-indra = "3.1.3"
+indra = "3.2.0"
 cloud-build-logic = "0.0.17"
-shadow = "8.3.8"
-pluginYml = "0.5.3"
+shadow = "9.0.1"
 mod-publish-plugin = "0.8.4"
-gremlin = "0.0.8"
-runTask = "2.3.1"
+gremlin = "0.0.9"
+runTask = "3.0.0-beta.1"
 resource-factory = "1.3.0"
 
 adventure = "4.18.0"

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

gradlew

@@ -77,7 +77,7 @@ pluginManagement {
 }
 
 plugins {
-  id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"
+  id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
   id("quiet-fabric-loom") version "1.11-SNAPSHOT"
 }