From 8b7f6303c84317196eee96b8d986a55ed632bc1c Mon Sep 17 00:00:00 2001
From: Simon Marquis <contact@simon-marquis.fr>
Date: Sun, 9 Jul 2023 10:06:25 +0100
Subject: [PATCH 1/4] Align `targetSdk` to 34 in
 `AndroidTestConventionPlugin.kt`

Initial update was applied in https://github.com/android/nowinandroid/pull/814
---
 .../convention/src/main/kotlin/AndroidTestConventionPlugin.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt
index 286871010..e48d75757 100644
--- a/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt
@@ -31,10 +31,10 @@ class AndroidTestConventionPlugin : Plugin<Project> {
 
             extensions.configure<TestExtension> {
                 configureKotlinAndroid(this)
-                defaultConfig.targetSdk = 31
+                defaultConfig.targetSdk = 34
                 configureGradleManagedDevices(this)
             }
         }
     }
 
-}
\ No newline at end of file
+}

From fb2bd63d68fe5a05c29ce606927f39e0c3dd61a3 Mon Sep 17 00:00:00 2001
From: Simon Marquis <contact@simon-marquis.fr>
Date: Tue, 25 Jul 2023 20:40:54 +0100
Subject: [PATCH 2/4] Update desugar_jdk_libs to version 2.0.3

Changelog: https://github.com/google/desugar_jdk_libs/blob/master/CHANGELOG.md
---
 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 99248c8bf..9de0af514 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 accompanist = "0.28.0"
-androidDesugarJdkLibs = "1.2.2"
+androidDesugarJdkLibs = "2.0.3"
 androidGradlePlugin = "8.0.2"
 androidxActivity = "1.7.0"
 androidxAppCompat = "1.5.1"

From 97414a667ad499da4669ff7ff656303e6556b0e4 Mon Sep 17 00:00:00 2001
From: Simon Marquis <contact@simon-marquis.fr>
Date: Tue, 25 Jul 2023 20:43:38 +0100
Subject: [PATCH 3/4] Update room to version 2.5.2

Changelog: https://developer.android.com/jetpack/androidx/releases/room#2.5.2
---
 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 99248c8bf..5ba728063 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -49,7 +49,7 @@ protobuf = "3.23.4"
 protobufPlugin = "0.9.3"
 retrofit = "2.9.0"
 retrofitKotlinxSerializationJson = "1.0.0"
-room = "2.5.0"
+room = "2.5.2"
 secrets = "2.0.1"
 turbine = "0.12.1"
 

From 654944430d1670084ace031ba779f06833b58ba9 Mon Sep 17 00:00:00 2001
From: Don Turner <donturner@google.com>
Date: Thu, 27 Jul 2023 17:57:55 +0100
Subject: [PATCH 4/4] Fix for Retrofit R8 issue, bump version to 0.1.2

Change-Id: Ia90d693731c95248211b12b1ce2e9dfab0ecf34c
---
 app/build.gradle.kts   |  4 ++--
 app/proguard-rules.pro | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c3c0aca4f..38cb7efe2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -29,8 +29,8 @@ plugins {
 android {
     defaultConfig {
         applicationId = "com.google.samples.apps.nowinandroid"
-        versionCode = 7
-        versionName = "0.1.1" // X.Y.Z; X = Major, Y = minor, Z = Patch level
+        versionCode = 8
+        versionName = "0.1.2" // X.Y.Z; X = Major, Y = minor, Z = Patch level
 
         // Custom test runner to set up Hilt dependency graph
         testInstrumentationRunner = "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner"
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index dcaf39ce7..9c7f3b935 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -7,3 +7,13 @@
 -dontwarn org.openjsse.javax.net.ssl.SSLParameters
 -dontwarn org.openjsse.javax.net.ssl.SSLSocket
 -dontwarn org.openjsse.net.ssl.OpenJSSE
+
+# Fix for Retrofit issue https://github.com/square/retrofit/issues/3751
+# Keep generic signature of Call, Response (R8 full mode strips signatures from non-kept items).
+-keep,allowobfuscation,allowshrinking interface retrofit2.Call
+-keep,allowobfuscation,allowshrinking class retrofit2.Response
+
+# With R8 full mode generic signatures are stripped for classes that are not
+# kept. Suspend functions are wrapped in continuations where the type argument
+# is used.
+-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
\ No newline at end of file