Merge branch 'master' into 3770-runtimeexception

open-learning-exchange · Jul 10, 2024 · 8b6c6e8 · 8b6c6e8
2 parents c4f7f72 + a6f85c0
commit 8b6c6e8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -92,7 +92,9 @@ repositories {
 
 dependencies {
     testImplementation 'junit:junit:4.13.2'
-    implementation project(':library')
+    implementation(project(':library'))  {
+        exclude group: 'commons-logging', module: 'commons-logging'
+    }
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
@@ -125,7 +127,9 @@ dependencies {
     implementation 'com.nex3z:toggle-button-group:1.2.3'
     implementation 'com.sa90.materialarcmenu:library:2.0.0'
     implementation 'com.caverock:androidsvg-aar:1.4'
-    implementation 'com.opencsv:opencsv:5.9'
+    implementation('com.opencsv:opencsv:5.9') {
+        exclude group: 'commons-logging', module: 'commons-logging'
+    }
 
     implementation 'de.hdodenhof:circleimageview:3.1.0'
     implementation 'de.rtner:PBKDF2:1.1.4'

diff --git a/app/src/main/java/org/ole/planet/myplanet/base/BaseRecyclerFragment.kt b/app/src/main/java/org/ole/planet/myplanet/base/BaseRecyclerFragment.kt
@@ -66,7 +66,12 @@ abstract class BaseRecyclerFragment<LI> : BaseRecyclerParentFragment<Any?>(), On
         arguments?.let {
             isMyCourseLib = it.getBoolean("isMyCourseLib")
             courseLib = it.getString("courseLib")
-            resources = it.getSerializable("resources", ArrayList::class.java) as? List<RealmMyLibrary>
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                resources = it.getSerializable("resources", ArrayList::class.java) as? List<RealmMyLibrary>
+            } else {
+                @Suppress("DEPRECATION")
+                resources = it.getSerializable("resources") as? List<RealmMyLibrary>
+            }
         }
     }