Skip to content

chore: get ./gradlew format to pass for the whole repo #29766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "base"
id "com.github.node-gradle.node" version "2.2.4"
id "com.github.node-gradle.node" version "3.5.1"
}

def nodeVersion = System.getenv('NODE_VERSION') ?: '16.13.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ data:
name: Appfollow
releaseDate: 2023-08-10
releaseStage: alpha
supportLevel: community
documentationUrl: https://docs.airbyte.com/integrations/sources/appfollow
tags:
- language:lowcode
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,13 @@ definitions:
timeZone: "UTC"
granularity: "{{ parameters.granularity }}"
selector: '{
"orderBy": [
{
"field": "countryOrRegion",
"sortOrder": "ASCENDING"
}
]
}'
"orderBy": [
{
"field": "countryOrRegion",
"sortOrder": "ASCENDING"
}
]
}'
groupBy: "[ 'countryOrRegion' ]"

campaigns_report_daily_stream:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@ data:
ab_internal:
sl: 200
ql: 300
supportLevel: community
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This key is duplicated and the other entry's value is certified. Which one is correct? I did this change assuming that certified overrides community.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that in the connector report the Confluence source shows up as community.

metadataSpecVersion: "1.0"
1 change: 0 additions & 1 deletion airbyte-integrations/connectors/source-drift/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@ data:
ab_internal:
sl: 100
ql: 100
supportLevel: community
metadataSpecVersion: "1.0"
Original file line number Diff line number Diff line change
Expand Up @@ -47,26 +47,26 @@ definitions:
http_method: "POST"
request_body_json:
query: "{
'operator': 'OR',
'value': [
{
'field': 'updated_at',
'operator': '>',
'value': {{ stream_slice.get('prior_state', stream_state.get('prior_state', {})).get('updated_at') or format_datetime(config['start_date'], '%s') }}
},
{
'field': 'updated_at',
'operator': '=',
'value': {{ stream_slice.get('prior_state', stream_state.get('prior_state', {})).get('updated_at') or format_datetime(config['start_date'], '%s') }}
},
],
}"
'operator': 'OR',
'value': [
{
'field': 'updated_at',
'operator': '>',
'value': {{ stream_slice.get('prior_state', stream_state.get('prior_state', {})).get('updated_at') or format_datetime(config['start_date'], '%s') }}
},
{
'field': 'updated_at',
'operator': '=',
'value': {{ stream_slice.get('prior_state', stream_state.get('prior_state', {})).get('updated_at') or format_datetime(config['start_date'], '%s') }}
},
],
}"
sort: "{'field': 'updated_at', 'order': 'ascending'}"
pagination: "{
'per_page': {{ parameters.get('page_size') }},
'page': {{ next_page_token.get('next_page_token').get('page') }},
'starting_after': '{{ next_page_token.get('next_page_token').get('starting_after') }}'
}"
'per_page': {{ parameters.get('page_size') }},
'page': {{ next_page_token.get('next_page_token').get('page') }},
'starting_after': '{{ next_page_token.get('next_page_token').get('starting_after') }}'
}"

## streams
# full-refresh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ data:
name: Mailgun
releaseDate: 2023-08-10
releaseStage: alpha
supportLevel: community
documentationUrl: https://docs.airbyte.com/integrations/sources/mailgun
tags:
- language:low-code
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,25 @@
"assigner_id" : 50
},
"projects" : {
"id": {"number" : "2203306141"},
"id": {
"number": "2203306141"
},
"name": 50,
"comment_count": false,
"order": "1",
"color": 100,
"is_shared": [false],
"is_shared": [
false
],
"is_favorite": "world",
"parent_id": 100,
"is_inbox_project": [true],
"is_inbox_project": [
true
],
"is_team_inbox": "false",
"view_style": ["list"],
"url": ["https://todoist.com/showProject?id=2203306141"
}
"view_style": [
"list"
],
"url": ["https://todoist.com/showProject?id=2203306141"],
}
}
18 changes: 18 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ plugins {
id 'base'
id 'pmd'
id 'com.diffplug.spotless' version '6.20.0'
id 'com.github.node-gradle.node' version '3.5.1'
id 'com.github.hierynomus.license' version '0.16.1'
id 'com.github.spotbugs' version '5.0.13'
// The distribution plugin has been added to address the an issue with the copyGeneratedTar
Expand Down Expand Up @@ -132,6 +133,7 @@ def createSpotlessTarget = { pattern ->
'airbyte-webapp', // The webapp module uses its own auto-formatter, so spotless is not necessary here
'airbyte-webapp-e2e-tests', // This module also uses its own auto-formatter
'airbyte-connector-builder-server/connector_builder/generated', // autogenerated code doesn't need to be formatted
'airbyte-ci/connectors/metadata_service/lib/tests/fixtures/**/invalid', // These are deliberately invalid and unformattable.
]

if (System.getenv().containsKey("SUB_BUILD")) {
Expand All @@ -141,6 +143,15 @@ def createSpotlessTarget = { pattern ->
return fileTree(dir: rootDir, include: pattern, exclude: excludes.collect { "**/${it}" })
}

node {
download = true
version = '18.16.1'
npmVersion = '9.5.1'
// when setting both these directories, npm and node will be in separate directories
workDir = file("${buildDir}/nodejs")
npmWorkDir = file("${buildDir}/npm")
}

spotless {
java {
target createSpotlessTarget('**/*.java')
Expand All @@ -165,8 +176,15 @@ spotless {
target createSpotlessTarget(['**/*.yaml', '**/*.json'])

prettier()
.npmExecutable("${tasks.named('npmSetup').get().npmDir.get()}/bin/npm") // get the npm executable path from gradle-node-plugin
.nodeExecutable("${tasks.named('nodeSetup').get().nodeDir.get()}/bin/node") // get the node executable path from gradle-node-plugin
}
}

tasks.named('spotlessStyling').configure {
it.dependsOn('nodeSetup', 'npmSetup')
}

check.dependsOn 'spotlessApply'

@SuppressWarnings('GroovyAssignabilityCheck')
Expand Down