From ece377a2f34c9f3ca4d5e285b55bfe9b20f59d35 Mon Sep 17 00:00:00 2001 From: "playground-manager[bot]" <126197455+playground-manager[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 16:45:26 +0200 Subject: [PATCH 1/5] chore(deps): update terraform hashicorp/terraform to v1.6.2 (#589) * chore(deps): update terraform hashicorp/terraform to v1.6.2 * Bump terraform version --------- Co-authored-by: playground-manager[bot] <126197455+playground-manager[bot]@users.noreply.github.com> Co-authored-by: Ash Davies <1892070+ashdavies@users.noreply.github.com> --- .github/workflows/terraform.yml | 2 +- terraform/versions.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index cfda90af0..65fd80455 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -85,7 +85,7 @@ jobs: - uses: hashicorp/setup-terraform@v2 with: - terraform_version: 1.6.1 + terraform_version: 1.6.2 - id: init run: terraform -chdir=terraform init diff --git a/terraform/versions.tf b/terraform/versions.tf index 8605cbf88..202875496 100644 --- a/terraform/versions.tf +++ b/terraform/versions.tf @@ -16,5 +16,5 @@ terraform { } } - required_version = "1.6.1" + required_version = "1.6.2" } From 338858447b959a456cb92a4835fb8f6c1bd659a4 Mon Sep 17 00:00:00 2001 From: Ash Davies <1892070+ashdavies@users.noreply.github.com> Date: Thu, 26 Oct 2023 17:15:57 +0200 Subject: [PATCH 2/5] Update dependencies in renovate.json and libs.versions.toml (#605) * Update dependencies in renovate.json and libs.versions.toml The commit includes modifications to the `renovate.json` and `libs.versions.toml` files. In `renovate.json`, a new field `versioningTemplate` with the value "hashicorp" has been added. Additionally, a new version extraction pattern has been introduced in `matchStrings`. In `libs.versions.toml`, the dependency `jetbrains-terraform` has been removed. * Remove unused Jetbrains Terraform plugin and refactor build.gradle.kts for build-plugins Subject: Refactor build-plugins build.gradle.kts Remove unused Jetbrains Terraform plugin and refactor build.gradle.kts for build-plugins. * Remove redundant Terraform configuration in `build-plugins` module --- .github/renovate.json | 4 +++- build-plugins/build.gradle.kts | 1 - .../main/kotlin/io.ashdavies.terraform.gradle.kts | 14 -------------- gradle/libs.versions.toml | 1 - 4 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 build-plugins/src/main/kotlin/io.ashdavies.terraform.gradle.kts diff --git a/.github/renovate.json b/.github/renovate.json index dadfa8e22..5c2f67081 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -4,8 +4,10 @@ { "datasourceTemplate": "github-releases", "depNameTemplate": "hashicorp/terraform", + "extractVersionTemplate": "v(?.*)", "fileMatch": "^\\.github/workflows/.*\\.yaml", - "matchStrings": ["terraform_version: (?.*)"] + "matchStrings": ["terraform_version: (?.*)"], + "versioningTemplate": "hashicorp" } ], "extends": [ diff --git a/build-plugins/build.gradle.kts b/build-plugins/build.gradle.kts index f7f78dcb9..9e01dd3c4 100644 --- a/build-plugins/build.gradle.kts +++ b/build-plugins/build.gradle.kts @@ -14,7 +14,6 @@ dependencies { implementation(plugin(apollo.graphql)) implementation(plugin(cash.sqldelight)) implementation(plugin(diffplug.spotless)) - implementation(plugin(jetbrains.terraform)) implementation(plugin(kotlin.compose)) implementation(plugin(kotlin.multiplatform)) implementation(plugin(kotlin.serialization)) diff --git a/build-plugins/src/main/kotlin/io.ashdavies.terraform.gradle.kts b/build-plugins/src/main/kotlin/io.ashdavies.terraform.gradle.kts deleted file mode 100644 index 76cf9f858..000000000 --- a/build-plugins/src/main/kotlin/io.ashdavies.terraform.gradle.kts +++ /dev/null @@ -1,14 +0,0 @@ -plugins { - id("org.jetbrains.gradle.terraform") -} - -terraform { - sourceSets.main { - executeDestroyOnlyIf { project.hasProperty("tf.destroy") } - executeApplyOnlyIf { project.hasProperty("tf.apply") } - } - - showInitOutputInConsole = true - showPlanOutputInConsole = true - version = "1.3.1" -} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 03b03f1ff..f25d899df 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -137,7 +137,6 @@ google-cloud-jib = "com.google.cloud.tools.jib:3.4.0" google-services = { id = "com.google.gms.google-services", version.ref = "google-services" } gradle-doctor = "com.osacky.doctor:0.8.1" jetbrains-dokka = "org.jetbrains.dokka:1.9.10" -jetbrains-terraform = "org.jetbrains.gradle.terraform:1.5.2" kotlin-compose = { id = "org.jetbrains.compose", version.ref = "jetbrains-compose" } kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "jetbrains-kotlin" } kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "jetbrains-kotlin" } From d2b4ddbbe36bfe5a846f07fb0d91fc37bafd7331 Mon Sep 17 00:00:00 2001 From: "playground-manager[bot]" <126197455+playground-manager[bot]@users.noreply.github.com> Date: Fri, 27 Oct 2023 11:54:43 +0200 Subject: [PATCH 3/5] fix(deps): update dependency com.google.cloud:libraries-bom to v26.26.0 (#607) Co-authored-by: playground-manager[bot] <126197455+playground-manager[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f25d899df..1fa61426f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -46,7 +46,7 @@ google-accompanist-placeholderMaterial = { module = "com.google.accompanist:acco google-android-maps = "com.google.android.gms:play-services-maps:18.2.0" google-android-material = "com.google.android.material:material:1.10.0" -google-cloud-bom = "com.google.cloud:libraries-bom:26.25.0" +google-cloud-bom = "com.google.cloud:libraries-bom:26.26.0" google-cloud-firestore = { module = "com.google.cloud:google-cloud-firestore" } google-cloud-storage = { module = "com.google.cloud:google-cloud-storage" } From 223c72ade6040c12390836570a525b68dde68db7 Mon Sep 17 00:00:00 2001 From: "playground-manager[bot]" <126197455+playground-manager[bot]@users.noreply.github.com> Date: Fri, 27 Oct 2023 14:48:56 +0200 Subject: [PATCH 4/5] fix(deps): update dependency com.google.firebase:firebase-bom to v32.4.1 (#606) Co-authored-by: playground-manager[bot] <126197455+playground-manager[bot]@users.noreply.github.com> Co-authored-by: Ash Davies <1892070+ashdavies@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1fa61426f..09ff176f3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -51,7 +51,7 @@ google-cloud-firestore = { module = "com.google.cloud:google-cloud-firestore" } google-cloud-storage = { module = "com.google.cloud:google-cloud-storage" } google-firebase-admin = "com.google.firebase:firebase-admin:9.2.0" -google-firebase-bom = "com.google.firebase:firebase-bom:32.4.0" +google-firebase-bom = "com.google.firebase:firebase-bom:32.4.1" google-firebase-analytics = { module = "com.google.firebase:firebase-analytics-ktx" } google-firebase-appcheck = { module = "com.google.firebase:firebase-appcheck" } google-firebase-appcheck-debug = { module = "com.google.firebase:firebase-appcheck-debug" } From a495beffb896a739c0e86695f0bb725231eeda2f Mon Sep 17 00:00:00 2001 From: "playground-manager[bot]" <126197455+playground-manager[bot]@users.noreply.github.com> Date: Sat, 28 Oct 2023 09:40:48 +0200 Subject: [PATCH 5/5] chore(deps): update terraform terraform-google-modules/service-accounts/google to v4.2.2 (#608) Co-authored-by: playground-manager[bot] <126197455+playground-manager[bot]@users.noreply.github.com> --- terraform/modules.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/modules.tf b/terraform/modules.tf index 45e1aaf12..c53a7ccae 100644 --- a/terraform/modules.tf +++ b/terraform/modules.tf @@ -86,7 +86,7 @@ module "github-repository" { module "github-service-account" { source = "terraform-google-modules/service-accounts/google" - version = "4.2.1" + version = "4.2.2" providers = { google = google.impersonated } display_name = "GitHub Service Account" names = ["oidc"]