jprdonnelly/airbyte
1
0
Fork 0
mirror of synced 2025-12-19 18:14:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

enable groovy formatting in airbyte-ci format config, remove spotless from gradle build (#33013)

Browse Source 
Co-authored-by: postamar <postamar@users.noreply.github.com>
This commit is contained in:
Marius Posta
2023-12-01 09:27:16 -08:00
committed by GitHub
parent 300ce8533f
commit 30a5127168
19 changed files with 33 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/build.gradle
View File

@@ -22,4 +22,4 @@ dependencies {
tasks.withType(Jar).configureEach {
duplicatesStrategy DuplicatesStrategy.INCLUDE
}
}

8
buildSrc/src/main/groovy/airbyte-docker-legacy.gradle
View File

@@ -1,4 +1,7 @@
import java.nio.file.Paths
import java.security.MessageDigest
import java.util.concurrent.ConcurrentHashMap
import org.apache.commons.text.StringSubstitutor
import org.gradle.api.DefaultTask
import org.gradle.api.GradleException
import org.gradle.api.Plugin
@@ -14,11 +17,6 @@ import org.gradle.api.tasks.PathSensitive
import org.gradle.api.tasks.PathSensitivity
import org.gradle.api.tasks.TaskAction
import java.security.MessageDigest
import java.nio.file.Paths
import org.apache.commons.text.StringSubstitutor
/**
* AirbyteDockerLegacyTask is the task which builds a docker image based on a Dockerfile.
*

28
buildSrc/src/main/groovy/airbyte-java-cdk.gradle
View File

@@ -2,10 +2,10 @@
This class facilites detecting the Java CDK target version via readCdkTargetVersion().
*/
import java.util.Properties
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.tasks.testing.Test
import java.util.Properties
class AirbyteJavaCdkPlugin implements Plugin<Project> {
@@ -24,8 +24,8 @@ class AirbyteJavaCdkPlugin implements Plugin<Project> {
project.ext.getCdkTargetVersion = {
return readCdkTargetVersion(project)
}
project.getTasks().create("disableLocalCdkRefs", DisableLocalCdkRefsTask.class);
project.getTasks().create("assertNotUsingLocalCdk", AssertNotUsingLocalCdkTask.class);
project.getTasks().create("disableLocalCdkRefs", DisableLocalCdkRefsTask.class)
project.getTasks().create("assertNotUsingLocalCdk", AssertNotUsingLocalCdkTask.class)
}
public static class DisableLocalCdkRefsTask extends DefaultTask {
@@ -33,26 +33,26 @@ class AirbyteJavaCdkPlugin implements Plugin<Project> {
public void disableLocalCdkRefs() {
// Step through the project tree and set useLocalCdk to false on all connectors
getProject().fileTree(dir: '.', include: '**/build.gradle').forEach(file -> {
String content = file.getText();
String content = file.getText()
if (content.contains("useLocalCdk = true")) {
content = content.replace("useLocalCdk = true", "useLocalCdk = false");
file.setText(content);
System.out.println("Updated " + file.getPath());
content = content.replace("useLocalCdk = true", "useLocalCdk = false")
file.setText(content)
System.out.println("Updated " + file.getPath())
}
});
})
}
}
public static class AssertNotUsingLocalCdkTask extends DefaultTask {
@TaskAction
public void assertNotUsingLocalCdk() {
List<String> foundPaths = new ArrayList<>();
List<String> foundPaths = new ArrayList<>()
for (File file : getProject().fileTree(dir: '.', include: '**/build.gradle')) {
String content = file.getText();
String content = file.getText()
if (content.contains("useLocalCdk = true")) {
System.err.println("Found usage of 'useLocalCdk = true' in " + file.getPath());
foundPaths.add(file.getPath());
System.err.println("Found usage of 'useLocalCdk = true' in " + file.getPath())
foundPaths.add(file.getPath())
}
}
@@ -62,8 +62,8 @@ class AirbyteJavaCdkPlugin implements Plugin<Project> {
"This must be set to 'false' before merging to the main branch. \n" +
"NOTE: You can run './gradlew disableLocalCdkRefs' to automatically set it to 'false' on all projects.",
String.join("\n", foundPaths)
);
throw new RuntimeException(errorMessage);
)
throw new RuntimeException(errorMessage)
}
}
}

1
buildSrc/src/main/groovy/airbyte-python.gradle
View File

@@ -183,4 +183,3 @@ class AirbytePythonPlugin implements Plugin<Project> {
}
}
}