chore: update airbyte-gradle to 0.65 (#16598)

Author: abuchanan-airbyte

airbyte-connector-builder-server/build.gradle.kts

@@ -1,4 +1,4 @@
-import com.bmuschko.gradle.docker.tasks.image.DockerBuildImage
+import io.airbyte.gradle.tasks.DockerBuildxTask
 import org.openapitools.generator.gradle.plugin.tasks.GenerateTask
 
 plugins {
@@ -185,7 +185,7 @@ val copyPythonDeps =
     into("${project.layout.buildDirectory.get()}/airbyte/docker/")
   }
 //
-tasks.named<DockerBuildImage>("dockerBuildImage") {
+tasks.named<DockerBuildxTask>("dockerBuildImage") {
   // Set build args
   // Current CDK version(used by the Connector Builder and workers running Connector Builder connectors
   val cdkVersion: String = File((ext["ossRootProject"] as Project).projectDir, "airbyte-connector-builder-resources/CDK_VERSION").readText().trim()

airbyte-webapp/build.gradle.kts

@@ -30,20 +30,20 @@ fun parseIgnoreFile(f: File): List<String> {
     return ignores
 }
 
-
 // Use the node version that's defined in the .nvmrc file
-val nodeVersion = file("${projectDir}/.nvmrc").readText().trim()
+val nodeVersion = file("$projectDir/.nvmrc").readText().trim()
 
 // Read pnpm version to use from package.json engines.pnpm entry
-val parsedJson = JsonSlurper().parse(FileReader("${projectDir}/package.json")) as Map<*, *>  // Cast to Map
-val engines = parsedJson["engines"] as? Map<*, *>  // Safely cast to Map if 'engines' exists
-val pnpmVer = engines?.get("pnpm")?.toString()?.trim()  // Extract 'pnpm' as String and trim
+val parsedJson = JsonSlurper().parse(FileReader("$projectDir/package.json")) as Map<*, *> // Cast to Map
+val engines = parsedJson["engines"] as? Map<*, *> // Safely cast to Map if 'engines' exists
+val pnpmVer = engines?.get("pnpm")?.toString()?.trim() // Extract 'pnpm' as String and trim
 
 /**
  * A list of all files outside the webapp folder, that the webapp build depends on, i.e.
  * if those change we can't reuse a cached build.
  */
-val outsideWebappDependencies = listOf(
+val outsideWebappDependencies =
+listOf(
     project(":oss:airbyte-api:server-api").file("src/main/openapi/config.yaml").path,
     project(":oss:airbyte-api:problems-api").file("src/main/openapi/api-problems.yaml").path,
     project(":oss:airbyte-connector-builder-server").file("src/main/openapi/openapi.yaml").path,
@@ -68,19 +68,21 @@ tasks.named("pnpmInstall") {
     /*
     Add patches folder to inputs of pnpmInstall task, since it has pnpm-lock.yml as an output
     thus wouldn't rerun in case a patch get changed
-    */
+     */
     inputs.dir("patches")
 }
 
 // fileTree to watch node_modules, but exclude the .cache dir since that might have changes on every build
-val nodeModules = fileTree("node_modules") {
+val nodeModules =
+fileTree("node_modules") {
     exclude(".cache")
 }
 
 /**
  * All files inside the webapp folder that aren't gitignored
  */
-val allFiles = fileTree(".") {
+val allFiles =
+fileTree(".") {
     exclude(parseIgnoreFile(file("../.gitignore")))
     exclude(parseIgnoreFile(file(".gitignore")))
     exclude(parseIgnoreFile(file("./src/core/api/generated/.gitignore")))
@@ -115,14 +117,14 @@ tasks.register<PnpmTask>("pnpmBuild") {
 
 tasks.register<PnpmTask>("test") {
     dependsOn("pnpmInstall")
-    
+
     args = listOf("run", "test:ci")
     inputs.files(allFiles, outsideWebappDependencies)
 
     /*
     The test has no outputs, thus we always treat the outputs up to date
     as long as the inputs have not changed
-    */
+     */
     outputs.upToDateWhen { true }
 }
 
@@ -132,9 +134,10 @@ tasks.register<PnpmTask>("cypress") {
     /*
     If the cypressWebappKey property has been set from the outside via the workflow file
     we'll record the cypress session, otherwise we're not recording
-    */
+     */
     val hasRecordingKey = !System.getenv("CYPRESS_RECORD_KEY").isNullOrEmpty()
-    args = if (hasRecordingKey && System.getProperty("cypressRecord", "false") == "true") {
+    args =
+    if (hasRecordingKey && System.getProperty("cypressRecord", "false") == "true") {
         val group = System.getenv("CYPRESS_GROUP") ?: "default-group"
         listOf("run", "cypress:run", "--record", "--group", group)
     } else {
@@ -144,7 +147,7 @@ tasks.register<PnpmTask>("cypress") {
     /*
     Mark the outputs as never up to date, to ensure we always run the tests.
     We want this because they are e2e tests and can depend on other factors e.g., external dependencies.
-    */
+     */
     outputs.upToDateWhen { false }
 }
 
@@ -211,8 +214,9 @@ tasks.register<PnpmTask>("buildStorybook") {
 
     outputs.dir("build/storybook")
 
-    environment = mapOf(
-        "NODE_OPTIONS" to "--max_old_space_size=8192"
+    environment =
+    mapOf(
+        "NODE_OPTIONS" to "--max_old_space_size=8192",
     )
 }
 
@@ -240,6 +244,7 @@ tasks.named("build") {
 tasks.register<DockerBuildxTask>(TASK_DOCKER_BUILD) {
     dependsOn("copyNginx", "copyBuildOutput")
     imageName = "webapp"
+    dockerfile = project.layout.projectDirectory.file("Dockerfile")
 
     if (cloudEnv.isNotEmpty()) {
         buildArgs.put("NGINX_CONFIG", "bin/nginx/cloud.conf.template")

build.gradle

@@ -26,12 +26,12 @@ plugins {
     id "base"
     id "com.dorongold.task-tree" version "2.1.1"
 
-    id "io.airbyte.gradle.jvm" version "0.64.0" apply false
-    id "io.airbyte.gradle.jvm.app" version "0.64.0" apply false
-    id "io.airbyte.gradle.jvm.lib" version "0.64.0" apply false
-    id "io.airbyte.gradle.docker" version "0.64.0" apply false
-    id "io.airbyte.gradle.publish" version "0.64.0" apply false
-    id "io.airbyte.gradle.kube-reload" version "0.64.0" apply false
+    id "io.airbyte.gradle.jvm" version "0.65.0" apply false
+    id "io.airbyte.gradle.jvm.app" version "0.65.0" apply false
+    id "io.airbyte.gradle.jvm.lib" version "0.65.0" apply false
+    id "io.airbyte.gradle.docker" version "0.65.0" apply false
+    id "io.airbyte.gradle.publish" version "0.65.0" apply false
+    id "io.airbyte.gradle.kube-reload" version "0.65.0" 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