From 3646658cb1740060ad82c6a7610ea6da5df2c866 Mon Sep 17 00:00:00 2001
From: davidoskky <davidoskky@yahoo.it>
Date: Sat, 15 Jul 2023 12:51:59 +0200
Subject: [PATCH] Fix R8 compilation problem

---
 androidApp/proguard-rules.pro                               | 1 +
 .../android/fragments/FilterSheetFragment.kt                | 4 ++--
 build.gradle.kts                                            | 6 +++---
 shared/build.gradle.kts                                     | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/androidApp/proguard-rules.pro b/androidApp/proguard-rules.pro
index 0162f3e..9c9f8ce 100644
--- a/androidApp/proguard-rules.pro
+++ b/androidApp/proguard-rules.pro
@@ -55,6 +55,7 @@
 # maybe remove later ?
 -keep class * extends androidx.fragment.app.Fragment
 
+-dontwarn org.slf4j.impl.StaticLoggerBinder
 
 # Keep `Companion` object fields of serializable classes.
 # This avoids serializer lookup through `getDeclaredClasses` as done for named companion objects.
diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt
index 4c31c07..d065932 100644
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt
@@ -82,7 +82,7 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
     ) {
         val sourceGroup = binding.sourcesGroup
 
-        repository.getSourcesDetailsOrStats().forEach { source ->
+        repository.getSourcesDetailsOrStats().forEachIndexed { _, source ->
             val c = Chip(context)
             c.ellipsize = TextUtils.TruncateAt.END
 
@@ -144,7 +144,7 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
 
         val tags = repository.getTags()
 
-        tags.forEach { tag ->
+        tags.forEachIndexed { _, tag ->
             val c = Chip(context)
             c.ellipsize = TextUtils.TruncateAt.END
             c.text = tag.tag
diff --git a/build.gradle.kts b/build.gradle.kts
index 566f93e..5624ab5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,9 +7,9 @@ buildscript {
 
 plugins {
     //trick: for the same plugin versions in all sub-modules
-    id("com.android.application").version("8.0.0").apply(false)
-    id("com.android.library").version("8.0.0").apply(false)
-    kotlin("android").version("1.9.0").apply(false)
+    id("com.android.application").version("8.0.2").apply(false)
+    id("com.android.library").version("8.0.2").apply(false)
+    id("org.jetbrains.kotlin.android").version("1.9.0").apply(false)
     kotlin("multiplatform").version("1.9.0").apply(false)
     id("com.mikepenz.aboutlibraries.plugin").version("10.5.1").apply(false)
     id("org.jetbrains.kotlinx.kover").version("0.6.1").apply(true)
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
index 780615b..befcb5c 100644
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -61,7 +61,7 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                implementation("com.squareup.okhttp3:okhttp:4.10.0")
+                implementation("com.squareup.okhttp3:okhttp:4.11.0")
                 implementation("io.ktor:ktor-client-okhttp:2.2.4")
                 implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")