Merge branch 'main' into renovate/google-5.x

ashdavies · Oct 28, 2023 · 0ba6505 · 0ba6505
2 parents a7437f9 + a495bef
commit 0ba6505
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 22 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -4,8 +4,10 @@
     {
       "datasourceTemplate": "github-releases",
       "depNameTemplate": "hashicorp/terraform",
+      "extractVersionTemplate": "v(?<version>.*)",
       "fileMatch": "^\\.github/workflows/.*\\.yaml",
-      "matchStrings": ["terraform_version: (?<currentValue>.*)"]
+      "matchStrings": ["terraform_version: (?<currentValue>.*)"],
+      "versioningTemplate": "hashicorp"
     }
   ],
   "extends": [

diff --git 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/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
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -46,12 +46,12 @@ 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" }
 
 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" }
@@ -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" }

diff --git 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"]

diff --git a/terraform/versions.tf b/terraform/versions.tf
@@ -16,5 +16,5 @@ terraform {
     }
   }
 
-  required_version = "1.6.1"
+  required_version = "1.6.2"
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,5 +16,5 @@ terraform { @@
         }
       }
-      required_version = "1.6.1"
+      required_version = "1.6.2"
     }