Update dependencies

Fix issues with asset file access.

Remove ios unarchiver lib (would no longer compile with latest kmp).
Use okio ZipFile support to unzip files for ios

fix issue with app crashing on detail screen on android

.gitignore

@@ -32,3 +32,4 @@ src/main/res/menu-night/
 /iosApp/iosApp.xcworkspace/xcuserdata
 /desktopApp/.appdata
 /desktopApp/.tmp
+/.kotlin/

app/build.gradle

@@ -9,6 +9,7 @@ plugins {
     alias libs.plugins.google.services
     alias libs.plugins.firebase.crashlytics
     alias libs.plugins.hilt
+    alias libs.plugins.jetbrains.compose.compiler
 }
 
 def keystorePropertiesFile = rootProject.file("keystore.properties")
@@ -33,7 +34,7 @@ android {
             storePassword keystoreProperties['storePassword']
         }
     }
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.techbeloved.hymnbook"
         minSdkVersion 21

build.gradle

@@ -15,6 +15,7 @@ plugins {
     alias libs.plugins.firebase.crashlytics apply false
     alias libs.plugins.google.services apply false
     alias libs.plugins.jetbrains.compose apply false
+    alias libs.plugins.jetbrains.compose.compiler apply false
     alias libs.plugins.native.cocoapods apply false
 }
 

desktopApp/build.gradle.kts

@@ -3,6 +3,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.jetbrains.compose)
+    alias(libs.plugins.jetbrains.compose.compiler)
 }
 
 kotlin {

gradle.properties

@@ -1,26 +1,21 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
+## For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
+#
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. For more details, visit
+# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
+# org.gradle.parallel=true
+#Tue Dec 24 17:56:33 CET 2024
 android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
 android.nonFinalResIds=false
 android.nonTransitiveRClass=false
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx1536m
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-
-# Compose targets '[uikit]' are experimental and may have bugs!
-org.jetbrains.compose.experimental.uikit.enabled=true
 compose.kotlin.native.manageCacheKind=false
+org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+org.jetbrains.compose.experimental.uikit.enabled=true

gradle/libs.versions.toml

@@ -1,81 +1,81 @@
 [versions]
 accompanist = "0.32.0"
-agp = "8.3.1"
+agp = "8.7.3"
 androidPdfViewer = "3.1.0-beta.1"
-androidx_activity = "1.8.2"
-androidx_appcompat = "1.6.1"
-androidx_core_ktx = "1.12.0"
-androidx_datastore = "1.1.0-beta02"
-androidx_fragment = "1.6.2"
+androidx_activity = "1.9.3"
+androidx_appcompat = "1.7.0"
+androidx_core_ktx = "1.15.0"
+androidx_datastore = "1.1.1"
+androidx_fragment = "1.8.5"
 androidx_hilt_compiler = "1.2.0"
 androidx_hilt_work = "1.2.0"
-androidx_lifecycle = "2.7.0"
+androidx_lifecycle = "2.8.7"
 androidx_savedstate = "1.2.1"
 androidx_splashscreen = "1.0.1"
-androidx_test_core = "1.5.0"
-androidx_test_junit = "1.1.5"
-androidx_work = "2.9.0"
-androidx_work_runtime = "2.9.0"
+androidx_test_core = "1.6.1"
+androidx_test_junit = "1.2.1"
+androidx_work = "2.10.0"
+androidx_work_runtime = "2.10.0"
 appUpdateKtx = "2.1.0"
 cardview = "1.0.0"
-circularProgressBar = "1.2.2"
+circularProgressBar = "1.2.3"
 coil = "2.4.0"
 compose_compiler = "1.5.11"
-compose_constraintlayout = "1.0.1"
-compose_material3 = "1.2.1"
-compose_ui = "1.6.4"
-composeBom = "2024.03.00"
-compose_jetbrains = "1.6.1"
-constraintlayout = "2.1.4"
+compose_constraintlayout = "1.1.0"
+compose_material3 = "1.3.1"
+compose_ui = "1.7.6"
+composeBom = "2024.12.01"
+compose_jetbrains = "1.7.3"
+constraintlayout = "2.2.0"
 xmlutil = "0.86.3"
-core_library_desugaring = "2.0.4"
+core_library_desugaring = "2.1.4"
 coreTestingVersion = "2.2.0"
-coroutines = "1.8.0"
-coroutinesTest = "1.8.0"
-dateTime = "0.5.0"
+coroutines = "1.9.0"
+coroutinesTest = "1.8.1"
+dateTime = "0.6.1"
 detekt = "1.23.0"
-espresso = "3.5.1"
-firebaseAnalytics = "21.6.1"
+espresso = "3.6.1"
+firebaseAnalytics = "22.1.2"
 firebaseCore = "21.1.1"
-firebaseCrashlytics = "18.6.3"
-firebaseCrashlyticsGradle = "2.9.9"
-firebaseDynamicLinks = "21.2.0"
-firebaseFirestore = "24.11.0"
-firebaseStorage = "20.3.0"
-googleServices = "4.4.1"
+firebaseCrashlytics = "19.3.0"
+firebaseCrashlyticsGradle = "3.0.2"
+firebaseDynamicLinks = "22.1.0"
+firebaseFirestore = "25.1.1"
+firebaseStorage = "21.0.1"
+googleServices = "4.4.2"
 hilt_android = "2.49"
 hilt_navigation = "1.2.0"
 hiltAndroidCompiler = "2.48"
 koin = "3.4.3"
-kotlin = "1.9.23"
-kotlinxCollectionsImmutable = "0.3.6"
-kotlinxIo = "0.3.0"
+kotlin = "2.0.0"
+kotlinxCollectionsImmutable = "0.3.7"
+kotlinxIo = "0.6.0"
 ktor = "2.3.3"
 legacyPreferenceV14 = "1.0.0"
 legacySupportV4 = "1.0.0"
 libphonenumber = "8.13.22"
 lottie_compose = "6.1.0"
-material = "1.11.0"
+material = "1.12.0"
 media = "1.7.0"
 mockitoKotlin = "2.1.0"
-navigation_compose = "2.7.7"
-navigationFragmentKtx = "2.7.7"
-navigationSafeArgsGradlePlugin = "2.7.7"
-okhttp = "4.11.0"
-okio = "3.6.0"
+navigation_compose = "2.8.5"
+navigationFragmentKtx = "2.8.5"
+navigationSafeArgsGradlePlugin = "2.8.5"
+okhttp = "4.12.0"
+okio = "3.9.0"
 paletteKtx = "1.0.0"
 preferenceKtx = "1.2.1"
 recyclerview = "1.3.2"
 roomRuntime = "2.6.1"
-runner = "1.5.2"
-rxandroid = "2.1.0"
+runner = "1.6.2"
+rxandroid = "2.1.1"
 rxbinding = "3.0.0-alpha2"
 rxbindingAppcompat = "3.0.0-alpha2"
 rxbindingCore = "3.0.0-alpha2"
 rxbindingMaterial = "3.0.0-alpha2"
 rxbindingRecyclerview = "3.0.0-alpha2"
 rxbindingViewpager = "3.0.0-alpha2"
-rxjava = "2.2.10"
+rxjava = "2.2.21"
 rxPreferences = "2.0.0"
 rxrelay = "2.1.0"
 serialization = "1.6.2"
@@ -88,7 +88,7 @@ triplet = "3.7.0"
 voyager = "1.0.0-rc10"
 
 [libraries]
-android-pdf-viewer = { module = "com.github.barteksc:android-pdf-viewer", version.ref = "androidPdfViewer" }
+android-pdf-viewer = { module = "com.github.DImuthuUpe:AndroidPdfViewer", version.ref = "androidPdfViewer" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx_appcompat" }
 androidx-cardview = { module = "androidx.cardview:cardview", version.ref = "cardview" }
 androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
@@ -125,7 +125,7 @@ androidx-datastore-android = { group = "androidx.datastore", name = "datastore-p
 androidx-work-rxjava2 = { module = "androidx.work:work-rxjava2", version.ref = "androidx_work" }
 androidx-work-testing = { module = "androidx.work:work-testing", version.ref = "androidx_work" }
 app-update-ktx = { module = "com.google.android.play:app-update-ktx", version.ref = "appUpdateKtx" }
-circular-progress-bar = { module = "com.budiyev.android:circular-progress-bar", version.ref = "circularProgressBar" }
+circular-progress-bar = { module = "com.github.yuriy-budiyev:circular-progress-bar", version.ref = "circularProgressBar" }
 compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
 compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
 compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
@@ -228,6 +228,7 @@ test-hilt = { group = "com.google.dagger", name = "hilt-android-testing", versio
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
 jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "compose_jetbrains" }
+jetbrains-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

iosApp/Podfile

@@ -1,5 +1,5 @@
 target 'iosApp' do
   use_frameworks!
-  platform :ios, '15.5'
+  platform :ios, '16.0'
   pod 'shared', :path => '../shared'
 end

iosApp/Podfile.lock

@@ -1,23 +1,16 @@
 PODS:
-  - shared (1.0):
-    - SSZipArchive (= 2.5.5)
-  - SSZipArchive (2.5.5)
+  - shared (1.0)
 
 DEPENDENCIES:
   - shared (from `../shared`)
 
-SPEC REPOS:
-  trunk:
-    - SSZipArchive
-
 EXTERNAL SOURCES:
   shared:
     :path: "../shared"
 
 SPEC CHECKSUMS:
-  shared: ac60337d38b69e25b3c1d4ff3512c957c4028e25
-  SSZipArchive: c69881e8ac5521f0e622291387add5f60f30f3c4
+  shared: 07d47f4d462ff6d066fe0c0e305ad445f9ca2443
 
-PODFILE CHECKSUM: 0de23437ec6a7147a439436458b3effecf546eb0
+PODFILE CHECKSUM: 78d6cc1b71b232202c48a29d4e6c34972c534c73
 
 COCOAPODS: 1.14.3