jprdonnelly/airbyte
1
0
Fork 0
mirror of synced 2025-12-25 02:09:19 -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
airbyte-cdk/java/airbyte-cdk/db-sources/build.gradle
View File

@@ -1,5 +1,5 @@
import org.jsonschema2pojo.SourceType
import org.jsoup.Jsoup;
import org.jsoup.Jsoup
buildscript {
dependencies {

9
airbyte-integrations/connectors/destination-gcs/build.gradle
View File

@@ -49,12 +49,3 @@ dependencies {
testImplementation 'org.apache.commons:commons-lang3:3.11'
testImplementation 'org.xerial.snappy:snappy-java:1.1.8.4'
}

1
airbyte-integrations/connectors/source-bigquery/build.gradle
View File

@@ -33,4 +33,3 @@ dependencies {
testImplementation 'org.apache.commons:commons-lang3:3.11'
// integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-bigquery')
}

1
airbyte-integrations/connectors/source-db2/build.gradle
View File

@@ -34,4 +34,3 @@ dependencies {
integrationTestJavaImplementation 'org.apache.commons:commons-lang3:3.11'
}

1
airbyte-integrations/connectors/source-mysql/build.gradle
View File

@@ -53,4 +53,3 @@ jsonSchema2Pojo {
includeConstructors = false
includeSetters = true
}

1
airbyte-integrations/connectors/source-redshift/build.gradle
View File

@@ -37,4 +37,3 @@ dependencies {
}

1
airbyte-integrations/connectors/source-snowflake/build.gradle
View File

@@ -39,4 +39,3 @@ dependencies {
integrationTestJavaImplementation 'org.apache.commons:commons-lang3:3.11'
}

50
build.gradle
View File

@@ -1,13 +1,5 @@
import com.github.spotbugs.snom.SpotBugsTask
// The buildscript block defines dependencies in order for .gradle file evaluation.
// This is separate from application dependencies.
// See https://stackoverflow.com/questions/17773817/purpose-of-buildscript-block-in-gradle.
buildscript {
dependencies {
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.20.0'
}
}
plugins {
id 'base'
@@ -107,48 +99,6 @@ rootProject.tasks.named('clean').configure {
dependsOn cleanPythonVenv
}
// format tasks per project
allprojects {
def createFormatTarget = { pattern ->
ArrayList<String> excludes = [
'**/build', // Ignore new build files as well as the ones ignored when running this through airbyte-ci
'.gradle' // Ignore the gradle version that is downloaded in the container
]
// Build the FileTree.
return fileTree(dir: projectDir, include: pattern, exclude: excludes)
}
// Apply spotless formatting.
apply plugin: 'com.diffplug.spotless'
spotless {
def javaTarget = createFormatTarget('**/*.java')
if (!javaTarget.isEmpty()) {
java {
// See also spotless-maven-pom.xml which is used by airbyte-ci, its config should stay in sync with this one.
target javaTarget
importOrder()
eclipse('4.21').configFile(rootProject.file('tools/gradle/codestyle/java-google-style.xml'))
removeUnusedImports()
trimTrailingWhitespace()
}
}
def groovyGradleTarget = createFormatTarget('**/*.gradle')
if (!groovyGradleTarget.isEmpty()) {
groovyGradle {
target groovyGradleTarget
}
}
}
if (rootProject.ext.skipSlowTests) {
// Format checks should be run via airbyte-ci.
tasks.matching { it.name =~ /spotless.*Check/ }.configureEach {
enabled = false
}
}
}
def getCDKTargetVersion() {
def props = new Properties()

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> {
}
}
}

2
spotless-maven-pom.xml
View File

@@ -39,12 +39,10 @@
<includes>
<include>**/*.gradle</include>
</includes>
<!-- TODO enable a better gradle formatting config
<importOrder />
<removeSemicolons />
<trimTrailingWhitespace />
<endWithNewline />
-->
</groovy>
</configuration>
</plugin>