From f945fd0642d7ceecfb83be713ef1a297da597d56 Mon Sep 17 00:00:00 2001
From: Patrick Honkonen <phonkonen@bitwarden.com>
Date: Tue, 2 Apr 2024 13:27:20 -0400
Subject: [PATCH] Revert renovate file back to json & consolidate kotlin group
 matchers

---
 .github/renovate.json  | 35 ++++++++++++++++++++++++++++
 .github/renovate.json5 | 52 ------------------------------------------
 2 files changed, 35 insertions(+), 52 deletions(-)
 create mode 100644 .github/renovate.json
 delete mode 100644 .github/renovate.json5

diff --git a/.github/renovate.json b/.github/renovate.json
new file mode 100644
index 000000000..a7f827ad8
--- /dev/null
+++ b/.github/renovate.json
@@ -0,0 +1,35 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "github>bitwarden/renovate-config"
+  ],
+  "enabledManagers": [
+    "github-actions",
+    "gradle"
+  ],
+  "commitMessagePrefix": "[deps]:",
+  "commitMessageTopic": "{{depName}}",
+  "packageRules": [
+    {
+      "groupName": "gh minor",
+      "matchManagers": [
+        "github-actions"
+      ],
+      "matchUpdateTypes": [
+        "minor",
+        "patch"
+      ]
+    },
+    {
+      "groupName": "kotlin",
+      "matchPackagePatterns": [
+        "androidx.compose:compose-bom",
+        "org.jetbrains.kotlin.*",
+        "com.google.devtools.ksp"
+      ],
+      "matchManagers": [
+        "gradle"
+      ]
+    }
+  ]
+}
diff --git a/.github/renovate.json5 b/.github/renovate.json5
deleted file mode 100644
index f9d0b6640..000000000
--- a/.github/renovate.json5
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base",
-    "github>bitwarden/renovate-config",
-    ":combinePatchMinorReleases",
-    ":dependencyDashboard",
-    ":maintainLockFilesWeekly",
-    ":pinAllExceptPeerDependencies",
-    ":prConcurrentLimit10",
-    ":rebaseStalePrs",
-    "schedule:weekends",
-    ":separateMajorReleases"
-  ],
-  "enabledManagers": [
-    "github-actions",
-    "gradle"
-  ],
-  "commitMessagePrefix": "[deps]:",
-  "commitMessageTopic": "{{depName}}",
-  "packageRules": [
-    {
-      "groupName": "gh minor",
-      "matchManagers": [
-        "github-actions"
-      ],
-      "matchUpdateTypes": [
-        "minor",
-        "patch"
-      ]
-    },
-    // Kotlin and Compose dependencies must be updated together to ensure compatibility.
-    {
-      "groupName": "kotlin",
-      "matchPackagePatterns": [
-        "androidx.compose:compose-bom"
-      ]
-    },
-    {
-      "groupName": "kotlin",
-      "matchPackagePatterns": [
-        "org.jetbrains.kotlin.*"
-      ]
-    },
-    {
-      "groupName": "kotlin",
-      "matchPackagePatterns": [
-        "com.google.devtools.ksp"
-      ]
-    }
-  ]
-}