From e117edeac25bf11bc058b15e8c396c2817a1d195 Mon Sep 17 00:00:00 2001
From: Jolanda Verhoef <JolandaVerhoef@users.noreply.github.com>
Date: Fri, 4 Nov 2022 12:13:47 +0100
Subject: [PATCH] Revert version upgrade of objenesis and protobuf-plugin

---
 .github/renovate.json     | 10 ++++++++++
 app/build.gradle.kts      |  2 +-
 gradle/libs.versions.toml |  5 ++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index 1de97b96d..f19341761 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -2,5 +2,15 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:base", "group:all", ":dependencyDashboard", "schedule:daily"
+  ],
+  "packageRules": [
+    {
+      "matchPackageNames": ["org.objenesis:objenesis"],
+      "allowedVersions": "<=2.6"
+    },
+    {
+      "matchPackageNames": ["com.google.protobuf"],
+      "allowedVersions": "<=0.8.19"
+    }
   ]
 }
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0e5afb49f..6d3a8e6b5 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -123,6 +123,6 @@ configurations.configureEach {
     resolutionStrategy {
         force(libs.junit4)
         // Temporary workaround for https://issuetracker.google.com/174733673
-        force("org.objenesis:objenesis:3.3")
+        force("org.objenesis:objenesis:2.6")
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fc37da220..dafd53947 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 accompanist = "0.27.0"
-androidDesugarJdkLibs = "2.0.0"
+androidDesugarJdkLibs = "1.2.0"
 androidGradlePlugin = "7.3.1"
 androidxActivity = "1.6.1"
 androidxAppCompat = "1.5.1"
@@ -12,7 +12,6 @@ androidxCoreSplashscreen = "1.0.0"
 androidxDataStore = "1.0.0"
 androidxEspresso = "3.4.0"
 androidxHiltNavigationCompose = "1.0.0"
-# Skipping version 2.6.0-alpha02 due to https://issuetracker.google.com/249686765
 androidxLifecycle = "2.6.0-alpha03"
 androidxMacroBenchmark = "1.1.0"
 androidxNavigation = "2.5.3"
@@ -40,7 +39,7 @@ ksp = "1.7.20-1.0.8"
 lint = "30.3.1"
 okhttp = "4.10.0"
 protobuf = "3.21.9"
-protobufPlugin = "0.9.1"
+protobufPlugin = "0.8.19"
 retrofit = "2.9.0"
 retrofitKotlinxSerializationJson = "0.8.0"
 room = "2.5.0-beta01"