Remove unused strings file

androidApp/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
     kotlin("android")
     kotlin("kapt")
     id("com.mikepenz.aboutlibraries.plugin")
-    id("org.jetbrains.kotlinx.kover")
+    id("org.jetbrains.kotlinx.kover") version "0.6.1"
 }
 
 fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String {
@@ -16,7 +16,7 @@ fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String {
         project.exec {
             commandLine = cmd.split(" ")
             standardOutput = outputStream
-            isIgnoreExitValue = ignore
+            isIgnoreExitValue = ignore ?: false
         }
         outputStream.toString()
     }
@@ -24,8 +24,9 @@ fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String {
 }
 
 fun gitVersion(): String {
+    var process = ""
     val maybeTagOfCurrentCommit = execWithOutput("git -C ../ describe --contains HEAD", true)
-    var process = if (maybeTagOfCurrentCommit.isEmpty()) {
+    process = if (maybeTagOfCurrentCommit.isEmpty()) {
         println("No tag on current commit. Will take the latest one.")
         execWithOutput("git -C ../ for-each-ref refs/tags --sort=-refname --format='%(refname:short)' --count=1")
     } else {
@@ -170,7 +171,7 @@ dependencies {
     //PhotoView
     implementation("com.github.chrisbanes:PhotoView:2.3.0")
 
-    implementation("androidx.core:core-ktx:1.10.1")
+    implementation("androidx.core:core-ktx:1.8.0")
 
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
 

androidApp/proguard-rules.pro

@@ -55,7 +55,6 @@
 # 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.

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().forEachIndexed { _, source ->
+        repository.getSourcesDetailsOrStats().forEach { source ->
             val c = Chip(context)
             c.ellipsize = TextUtils.TruncateAt.END
 
@@ -144,7 +144,7 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
 
         val tags = repository.getTags()
 
-        tags.forEachIndexed { _, tag ->
+        tags.forEach { tag ->
             val c = Chip(context)
             c.ellipsize = TextUtils.TruncateAt.END
             c.text = tag.tag

androidApp/src/main/res/values-night/strings.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
-    <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page. Keep in mind that crash reports are essential for the app development.]]></string>
-    <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
-    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
-    <string name="menu_home_filter">Filters</string>
-    <string name="application_selfoss_only">This app only works with a Selfoss instance, and no other RSS feed.</string>
-    <string name="menu_home_sources">Sources</string>
-    <string name="update_source">Update source</string>
-</resources>

build.gradle.kts

@@ -7,12 +7,12 @@ buildscript {
 
 plugins {
     //trick: for the same plugin versions in all sub-modules
-    id("com.android.application").version("8.1.0").apply(false)
-    id("com.android.library").version("8.1.0").apply(false)
-    id("org.jetbrains.kotlin.android").version("1.9.10").apply(false)
-    kotlin("multiplatform").version("1.9.10").apply(false)
+    id("com.android.application").version("7.4.0").apply(false)
+    id("com.android.library").version("7.4.0").apply(false)
+    kotlin("android").version("1.7.20").apply(false)
+    kotlin("multiplatform").version("1.7.20").apply(false)
     id("com.mikepenz.aboutlibraries.plugin").version("10.5.1").apply(false)
-    id("org.jetbrains.kotlinx.kover").version("0.6.1").apply(true)
+    id("org.jetbrains.kotlinx.kover") version "0.6.1"
 }
 
 allprojects {

gradle.properties

@@ -13,15 +13,22 @@
 #Tue Mar 22 16:50:00 CET 2022
 #Gradle
 org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+
 #Kotlin
 kotlin.code.style=official
+
 #Android
 android.useAndroidX=true
+kotlin.native.enableDependencyPropagation=false
 #android.nonTransitiveRClass=true
 android.enableJetifier=true
-android.nonTransitiveRClass=false
+
+
 #MPP
 kotlin.mpp.enableCInteropCommonization=true
+kotlin.mpp.enableGranularSourceSetsMetadata=true
+
+
 org.gradle.parallel=true
 org.gradle.caching=true
 ignoreGitVersion=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Jul 13 11:41:19 CEST 2023
+#Mon Jan 23 20:47:46 CET 2023
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

shared/build.gradle.kts

@@ -1,5 +1,3 @@
-val ktorVersion = "2.3.2"
-
 object SqlDelight {
     const val runtime = "com.squareup.sqldelight:runtime:1.5.4"
     const val android = "com.squareup.sqldelight:android-driver:1.5.4"
@@ -11,13 +9,12 @@ plugins {
     kotlin("multiplatform")
     id("com.android.library")
     id("com.squareup.sqldelight")
-    kotlin("plugin.serialization") version "1.9.0"
-    id("org.jetbrains.kotlinx.kover")
+    kotlin("plugin.serialization") version "1.4.10"
+    id("org.jetbrains.kotlinx.kover") version "0.6.1"
 }
 
 kotlin {
-    androidTarget()
-    jvmToolchain(11)
+    android()
 
     listOf(
         iosX64(),
@@ -32,6 +29,8 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
+                val ktorVersion = "2.3.2"
+
                 implementation("io.ktor:ktor-client-core:$ktorVersion")
                 implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
                 implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
@@ -63,14 +62,15 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                implementation("com.squareup.okhttp3:okhttp:4.11.0")
+                implementation("com.squareup.okhttp3:okhttp:4.10.0")
+                implementation("io.ktor:ktor-client-okhttp:2.2.4")
                 implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
 
                 // Sql
                 implementation(SqlDelight.android)
             }
         }
-        val androidUnitTest by getting {
+        val androidTest by getting {
             dependencies {
                 implementation(kotlin("test-junit"))
                 implementation("junit:junit:4.13.2")
@@ -103,14 +103,15 @@ kotlin {
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 32
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
         minSdk = 21
+        targetSdk = 32
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
     namespace = "bou.amine.apps.readerforselfossv2"
 }