Skip to content

Commit

Permalink
fix: return correct language tag when using Kotlin build script (#49835)
Browse files Browse the repository at this point in the history
  • Loading branch information
jdpgrailsdev authored Dec 17, 2024
1 parent dfcdea8 commit 6d8a3a2
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ def get_expected_language_tag(self, connector: Connector) -> str:
connector.code_directory / consts.PYPROJECT_FILE_NAME
).exists():
return self.PYTHON_LANGUAGE_TAG
elif (connector.code_directory / consts.GRADLE_FILE_NAME).exists():
elif (connector.code_directory / consts.GRADLE_FILE_NAME).exists() or (
connector.code_directory / consts.GRADLE_KOTLIN_FILE_NAME
).exists():
return self.JAVA_LANGUAGE_TAG
else:
raise ValueError("Could not infer the language tag from the connector directory")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
DOCKERFILE_NAME = "Dockerfile"
DOCUMENTATION_STANDARDS_URL = "https://hackmd.io/Bz75cgATSbm7DjrAqgl4rw"
GRADLE_FILE_NAME = "build.gradle"
GRADLE_KOTLIN_FILE_NAME = "build.gradle.kts"
LICENSE_FAQ_URL = "https://docs.airbyte.com/developer-guides/licenses/license-faq"
LOW_CODE_MANIFEST_FILE_NAME = "manifest.yaml"
METADATA_DOCUMENTATION_URL = "https://docs.airbyte.com/connector-development/connector-metadata-file"
Expand Down
1 change: 1 addition & 0 deletions airbyte-ci/connectors/pipelines/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -854,6 +854,7 @@ airbyte-ci connectors --language=low-code migrate-to-manifest-only

| Version | PR | Description |
|---------|------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------|
| 4.46.5 | [#49835](https://github.com/airbytehq/airbyte/pull/49835) | Fix connector language discovery for projects with Kotlin Gradle build scripts. |
| 4.46.4 | [#49462](https://github.com/airbytehq/airbyte/pull/49462) | Support Kotlin Gradle build scripts in connectors. |
| 4.46.3 | [#49465](https://github.com/airbytehq/airbyte/pull/49465) | Fix `--use-local-cdk` on rootless connectors. |
| 4.46.2 | [#49136](https://github.com/airbytehq/airbyte/pull/49136) | Fix failed install of python components due to non-root permissions. |
Expand Down
2 changes: 1 addition & 1 deletion airbyte-ci/connectors/pipelines/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "pipelines"
version = "4.46.4"
version = "4.46.5"
description = "Packaged maintained by the connector operations team to perform CI for connectors' pipelines"
authors = ["Airbyte <[email protected]>"]

Expand Down

0 comments on commit 6d8a3a2

Please sign in to comment.