Merge pull request 'bump' (#182) from bump into master

Reviewed-on: #182

.gitea/workflows/on_merge_on_release.yml

@@ -16,6 +16,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          ref: master
       - name: Config git
         run: |
           git config --global user.email aminecmi+giteadrone@pm.me
@@ -50,7 +51,7 @@ jobs:
           followtags: true
           ssh_key: ${{ secrets.PRIVATE_KEY }}
           tags: true
-          branch: release
+          branch: master
       - name: copy file via ssh password
         uses: appleboy/scp-action@v0.1.7
         with:
@@ -124,4 +125,4 @@ jobs:
           priority: high
           convert_markdown: true
           body: Nouveau fichier de mapping pour la version ${{ steps.version.outputs.VERSION }}
-          attachments: androidApp/build/outputs/mapping/githubConfigRelease/mapping.txt
+          attachments: androidApp/build/outputs/mapping/githubConfigRelease/mapping.txt

androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/HomeActivityTest.kt

@@ -56,7 +56,7 @@ class HomeActivityTest {
     fun testMenuActions() {
         onView(withId(R.id.action_search)).perform(click())
         onView(
-            withId(R.id.search_src_text),
+            withId(com.google.android.material.R.id.search_src_text),
         ).check(matches(isFocused()))
         onView(isRoot()).perform(ViewActions.pressBack())
 

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt

@@ -118,8 +118,8 @@ class ArticleFragment :
                 e.sendSilentlyWithAcra()
             }
 
-            colorOnSurface = getColorFromAttr(R.attr.colorOnSurface)
-            colorSurface = getColorFromAttr(R.attr.colorSurface)
+            colorOnSurface = getColorFromAttr(com.google.android.material.R.attr.colorOnSurface)
+            colorSurface = getColorFromAttr(com.google.android.material.R.attr.colorSurface)
 
             contentText = item.content
             contentTitle = item.title.getHtmlDecoded()

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt

@@ -83,7 +83,15 @@ class FilterSheetFragment :
         val sourceGroup = binding.sourcesGroup
 
         repository.getSourcesDetailsOrStats().forEachIndexed { _, source ->
-            val c = Chip(context)
+            val c: Chip? =
+                maybeIfContext {
+                    Chip(it)
+                } as Chip?
+
+            if (c == null) {
+                return
+            }
+
             c.ellipsize = TextUtils.TruncateAt.END
 
             maybeIfContext {
@@ -145,7 +153,11 @@ class FilterSheetFragment :
         val tags = repository.getTags()
 
         tags.forEachIndexed { _, tag ->
-            val c = Chip(context)
+            val c: Chip? = maybeIfContext { Chip(it) } as Chip?
+            if (c == null) {
+                return
+            }
+
             c.ellipsize = TextUtils.TruncateAt.END
             c.text = tag.tag
 

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
-    //trick: for the same plugin versions in all sub-modules
-    id("com.android.application").version("8.7.3").apply(false)
-    id("com.android.library").version("8.7.3").apply(false)
+    // trick: for the same plugin versions in all sub-modules
+    id("com.android.application").version("8.8.0").apply(false)
+    id("com.android.library").version("8.8.0").apply(false)
     id("org.jetbrains.kotlin.android").version("2.1.0").apply(false)
     kotlin("multiplatform").version("2.1.0").apply(false)
     id("com.mikepenz.aboutlibraries.plugin").version("10.5.1").apply(false)
@@ -16,7 +16,6 @@ allprojects {
     }
 }
 
-
 tasks.register("clean", Delete::class) {
     delete(layout.buildDirectory)
 }
@@ -24,4 +23,4 @@ tasks.register("clean", Delete::class) {
 dependencies {
     kover(project(":shared"))
     kover(project(":androidApp"))
-}
+}

gradle.properties

@@ -19,11 +19,11 @@ kotlin.code.style=official
 android.useAndroidX=true
 #android.nonTransitiveRClass=true
 android.enableJetifier=false
-android.nonTransitiveRClass=false
+android.nonTransitiveRClass=true
 #MPP
 kotlin.mpp.enableCInteropCommonization=true
 org.gradle.parallel=true
 org.gradle.caching=true
 ignoreGitVersion=false
 kotlin.native.cacheKind.iosX64=none
-org.gradle.configureondemand=true
+org.gradle.configureondemand=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Nov 25 22:48:24 CET 2024
+#Sun Feb 09 14:44:52 CET 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists