Merge pull request #11 from YahiaAngelo/development

Development merge

.gitignore

@@ -7,4 +7,5 @@ captures
 .externalNativeBuild
 .cxx
 local.properties
-xcuserdata
+xcuserdata
+.kotlin

androidApp/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.kotlinAndroid)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -16,9 +17,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"

build.gradle.kts

@@ -5,4 +5,5 @@ plugins {
     alias(libs.plugins.kotlinAndroid).apply(false)
     alias(libs.plugins.kotlinMultiplatform).apply(false)
     alias(libs.plugins.kotlinCocoapods).apply(false)
+    alias(libs.plugins.compose.compiler).apply(false)
 }

gradle/libs.versions.toml

@@ -1,27 +1,26 @@
 [versions]
 agp = "8.2.2"
-imageLoader = "1.7.6"
-kotlin = "1.9.23"
-compose = "1.6.4"
-compose-compiler = "1.5.11"
-compose-material3 = "1.2.1"
-androidx-activityCompose = "1.8.2"
+filekitCore = "0.8.8"
+imageLoader = "1.9.0"
+kotlin = "2.0.21"
+compose = "1.7.5"
+compose-material3 = "1.3.1"
+androidx-activityCompose = "1.9.3"
 logging = "1.4.2"
 materialKolor = "1.4.0-rc03"
 multiplatformSettings = "1.1.1"
 nativeDriver = "2.0.1"
-runtime = "2.0.1"
+runtime = "2.0.2"
 statelyCommon = "2.0.5"
 voyager = "1.0.0"
-koin = "3.6.0-alpha1"
+koin = "4.0.0"
 peekaboo = "0.5.2"
-datastoreCore = "1.0.0"
+datastoreCore = "1.1.1"
 okio = "3.8.0"
-ktorVersion = "2.3.7"
+ktorVersion = "3.0.1"
 ffmpegKitMin = "6.0-2"
-compose-plugin = "1.5.12"
 kotlinxCoroutinesCore = "1.8.0"
-lifecycleViewmodelKtx = "2.7.0"
+lifecycleViewmodelKtx = "2.8.7"
 ui-tooling-preview = "1.6.0-rc01"
 
 
@@ -31,6 +30,8 @@ androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-ru
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycleViewmodelKtx" }
 androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleViewmodelKtx" }
 coroutines-extensions = { module = "app.cash.sqldelight:coroutines-extensions", version.ref = "nativeDriver" }
+filekit-compose = { module = "io.github.vinceglb:filekit-compose", version.ref = "filekitCore" }
+filekit-core = { module = "io.github.vinceglb:filekit-core", version.ref = "filekitCore" }
 image-loader = { module = "io.github.qdsfdhvh:image-loader", version.ref = "imageLoader" }
 image-loader-extension-blur = { module = "io.github.qdsfdhvh:image-loader-extension-blur", version.ref = "imageLoader" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
@@ -83,3 +84,4 @@ kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlinCocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
 jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Fri Feb 23 16:09:51 EET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

iosApp/Podfile.lock

@@ -16,7 +16,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   ffmpeg-kit-ios-min: 4e9a088f4ee9629435960b9d68e54848975f1931
-  shared: 1dc9166a317ad22197cf7761852e101ba289f3f3
+  shared: 6419e7c8fb21241ba0c49addcb31dda09030478e
 
 PODFILE CHECKSUM: 78d6cc1b71b232202c48a29d4e6c34972c534c73