Skip to content

Commit

Permalink
ci: set gradle-plugins version in settings.gradle.kts (#14974)
Browse files Browse the repository at this point in the history
  • Loading branch information
abuchanan-airbyte committed Jan 9, 2025
1 parent 1b4fc7b commit 12f5caf
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 31 deletions.
28 changes: 2 additions & 26 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,6 @@ buildscript {
plugins {
id "base"
id "com.dorongold.task-tree" version "2.1.1"
id "io.airbyte.gradle.jvm" version "0.40.1" apply false
id "io.airbyte.gradle.jvm.app" version "0.40.1" apply false
id "io.airbyte.gradle.jvm.lib" version "0.40.1" apply false
id "io.airbyte.gradle.docker" version "0.40.1" apply false
id "io.airbyte.gradle.publish" version "0.40.1" apply false
id "io.airbyte.gradle.kube-reload" version "0.40.1" apply false
// uncomment for testing plugin locally
// id "io.airbyte.gradle.jvm" version "local-test" apply false
// id "io.airbyte.gradle.jvm.app" version "local-test" apply false
// id "io.airbyte.gradle.jvm.lib" version "local-test" apply false
// id "io.airbyte.gradle.docker" version "local-test" apply false
// id "io.airbyte.gradle.publish" version "local-test" apply false
}

repositories {
Expand Down Expand Up @@ -87,8 +75,8 @@ allprojects {
version = oss_version

project.pluginManager.withPlugin("io.airbyte.gradle.jvm"){
airbyte{
pmd{
airbyte {
pmd {
ruleFiles = project.rootProject.files("./oss/pmd-rules.xml")
}
}
Expand Down Expand Up @@ -155,18 +143,6 @@ tasks.register('archiveReports', Tar) {
}
}

tasks.register('generate-docker') {
dependsOn(':airbyte-bootloader:assemble')
dependsOn(':airbyte-workers:assemble')
dependsOn(':airbyte-webapp:assemble')
dependsOn(':airbyte-server:assemble')
dependsOn(':airbyte-db:db-lib:assemble')
dependsOn(':airbyte-config:init:assemble')
dependsOn(':airbyte-temporal:assemble')
dependsOn(':airbyte-keycloak:assemble')
dependsOn(':airbyte-keycloak-setup:assemble')
}

// todo (cgardens) - move this into the plugin.
// By default ./gradlew :oss:build doesn't do anything, so we need to manually set the dependencies.
def taskNames = ['assemble', 'build', 'check', 'clean', 'format', 'jar', 'publishToMavenLocal', 'test', 'integrationTest']
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ org.gradle.kotlin.dsl.skipMetadataVersionCheck=false

# Tune # of cores Gradle uses.
# org.gradle.workers.max=3

airbyteGradlePluginsVersion=0.40.1
23 changes: 18 additions & 5 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,25 @@
// NOTE: this settings is only discovered when running from oss/build.gradle
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
pluginManagement {

plugins {
val airbyteGradlePluginsVersion: String by settings
id("io.airbyte.gradle.jvm") version "${airbyteGradlePluginsVersion}" apply false
id("io.airbyte.gradle.jvm.app") version "${airbyteGradlePluginsVersion}" apply false
id("io.airbyte.gradle.jvm.lib") version "${airbyteGradlePluginsVersion}" apply false
id("io.airbyte.gradle.docker") version "${airbyteGradlePluginsVersion}" apply false
id("io.airbyte.gradle.publish") version "${airbyteGradlePluginsVersion}" apply false
id("io.airbyte.gradle.kube-reload") version "${airbyteGradlePluginsVersion}" apply false

id("com.github.eirnym.js2p") version "1.0" apply false
id("org.openapi.generator") version "7.10.0" apply false
}

repositories {
// uncomment for local dev
// maven {
// name = "localPluginRepo"
// url = uri("../.gradle-plugins-local")
// }
maven {
name = "localPluginRepo"
url = uri("../.gradle-plugins-local")
}
maven(url = "https://airbyte.mycloudrepo.io/public/repositories/airbyte-public-jars")
gradlePluginPortal()
maven(url = "https://oss.sonatype.org/content/repositories/snapshots")
Expand Down

0 comments on commit 12f5caf

Please sign in to comment.