rebase

Author: JVerwolf

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/GenerateTransportVersionDefinitionTask.java

@@ -196,7 +196,7 @@ private <T> T readExistingFile(String name, Function<String, String> pathFunctio
 
     // TODO duplicated
     private String latestRelativePath(String branch) {
-        return relativePath(latestFilePath(resourcesDirPath(), branch));
+        return relativePath(latestFilePath(getResourcesDirectory().get(), branch));
     }
 
     // TODO duplicated

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionUtils.java

@@ -15,15 +15,12 @@
 import org.gradle.api.attributes.Attribute;
 import org.gradle.api.attributes.AttributeContainer;
 import org.gradle.api.file.Directory;
-import org.gradle.process.ExecResult;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -161,12 +158,12 @@ public int base() {
         }
     }
 
-    static Path definitionFilePath(Path resourcesDir, String name) {
-        return getDefinitionsDirectory(resourcesDir).resolve(name + CSV_SUFFIX);
+    static Path definitionFilePath(Directory resourcesDirectory, String name) {
+        return getDefinitionsDirectory(resourcesDirectory).getAsFile().toPath().resolve(name + CSV_SUFFIX);
     }
 
-    static Path latestFilePath(Path resourcesDir, String name) {
-        return getLatestDirectory(resourcesDir).resolve(name + CSV_SUFFIX);
+    static Path latestFilePath(Directory resourcesDir, String name) {
+        return getLatestDirectory(resourcesDir).getAsFile().toPath().resolve(name + CSV_SUFFIX);
     }
 
     static TransportVersionDefinition readDefinitionFile(Path file) throws IOException {
@@ -222,12 +219,12 @@ static List<TransportVersionReference> readReferencesFile(Path file) throws IOEx
         return results;
     }
 
-    static Path getDefinitionsDirectory(Path resourcesDir) {
-        return resourcesDir.resolve("defined");
+    static Directory getDefinitionsDirectory(Directory resourcesDirectory) {
+        return resourcesDirectory.dir(DEFINED_DIR);
     }
 
     static Directory getLatestDirectory(Directory resourcesDirectory) {
-        return resourcesDirectory.dir("latest");
+        return resourcesDirectory.dir(LATEST_DIR);
     }
 
     static Directory getResourcesDirectory(Project project) {