Chore: Bump deps

api/build.gradle.kts

@@ -20,7 +20,7 @@ android {
 }
 
 kotlin {
-    android()
+    androidTarget()
     jvmToolchain(17)
 
     sourceSets {

app/build.gradle.kts

@@ -50,6 +50,12 @@ android {
         jvmTarget = "17"
         freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
         freeCompilerArgs += "-Xcontext-receivers"
+        freeCompilerArgs += "-Xexpect-actual-classes"
+//        TODO: Get this thing to work
+//        freeCompilerArgs += listOf(
+//            "-P",
+//            "plugin:androidx.compose.compiler.plugins.kotlin:stabilityConfigurationPath=${file("./stability.txt").absolutePath}"
+//        )
     }
 
     buildFeatures {

app/stability.txt

@@ -0,0 +1 @@
+com.materiiapps.gloom.gql.*

gradle/libs.versions.toml

@@ -1,14 +1,12 @@
 [versions]
 aboutlibraries = "10.9.0"
 accompanist = "0.30.1"
-agp = "8.3.0-alpha02"
+agp = "8.1.3"
 apollo = "3.6.2"
 buildkonfig = "0.13.3"
-coil = "2.4.0"
-compose = "1.6.0-alpha05"
-compose-compiler = "1.4.8"
-koin = "3.4.3"
-kotlin = "1.8.22"
+compose-compiler = "1.5.4"
+koin = "3.5.2-RC1"
+kotlin = "1.9.20"
 ktor = "2.3.3"
 moko-resources = "0.23.0"
 voyager = "1.0.0-rc07"
@@ -17,7 +15,7 @@ voyager = "1.0.0-rc07"
 aboutlibraries-core = { group = "com.mikepenz", name = "aboutlibraries", version.ref = "aboutlibraries" }
 accompanist-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "accompanist" }
 accompanist-webview = { group = "com.google.accompanist", name = "accompanist-webview", version.ref = "accompanist" }
-androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version = "1.7.2" }
+androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version = "1.8.0" }
 androidx-browser = { group = "androidx.browser", name = "browser", version = "1.6.0" }
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version = "1.12.0" }
 androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version = "1.0.1" }
@@ -26,21 +24,15 @@ androidx-paging-compose = { group = "androidx.paging", name = "paging-compose",
 apollo-adapters = { group = "com.apollographql.apollo3", name = "apollo-adapters", version.ref = "apollo" }
 apollo-normalized-cache = { group = "com.apollographql.apollo3", name = "apollo-normalized-cache", version.ref = "apollo" }
 apollo-runtime = { group = "com.apollographql.apollo3", name = "apollo-runtime", version.ref = "apollo" }
-coil = { group = "io.coil-kt", name = "coil", version.ref = "coil" }
-coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" }
 compose-imageloader = { group = "io.github.qdsfdhvh", name = "image-loader", version = "1.6.4" }
-compose-material3 = { group = "androidx.compose.material3", name = "material3", version = "1.2.0-alpha07" }
-compose-material = { group = "androidx.compose.material", name = "material", version.ref = "compose" }
-compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "compose" }
 compose-pdf = { group = "dev.zt64", name = "compose-pdf", version = "1.0.0" }
-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "compose" }
 highlights = { group = "dev.snipme", name = "highlights", version = "0.7.1" }
-koin-androidx-compose = { group = "io.insert-koin", name = "koin-androidx-compose", version = "3.4.0" }
+koin-compose = { group = "io.insert-koin", name = "koin-compose", version = "1.1.1-RC1" }
 koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koin" }
 koin-core = { group = "io.insert-koin", name = "koin-core", version.ref = "koin" }
 kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.7.3" }
-kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version = "0.4.0" }
-kotlinx-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.5.1" }
+kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version = "0.4.1" }
+kotlinx-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.6.0" }
 ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" }
 ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktor" }
 ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" }
@@ -61,19 +53,15 @@ android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
 apollo = { id = "com.apollographql.apollo3", version.ref = "apollo" }
 buildkonfig = { id = "com.codingfeline.buildkonfig", version.ref = "buildkonfig" }
-compose = { id = "org.jetbrains.compose", version = "1.5.0" }
+compose = { id = "org.jetbrains.compose", version = "1.5.10" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 moko-resources = { id = "dev.icerock.mobile.multiplatform-resources", version.ref = "moko-resources" }
 
 [bundles]
 accompanist = ["accompanist-systemuicontroller", "accompanist-webview"]
-androidx = ["androidx-paging-compose", "androidx-activity-compose", "androidx-lifecycle-runtime-ktx", "androidx-browser", "androidx-core-ktx", "androidx-core-splashscreen"]
 apollo = ["apollo-runtime", "apollo-normalized-cache", "apollo-adapters"]
-coil = ["coil", "coil-compose"]
-compose = ["compose-material-icons-extended", "compose-material", "compose-material3", "compose-ui"]
-koin = ["koin-android", "koin-androidx-compose", "koin-core"]
 kotlinx = ["kotlinx-coroutines-core", "kotlinx-datetime", "kotlinx-serialization"]
 ktor = ["ktor-serialization-kotlinx-json", "ktor-client-logging", "ktor-client-core", "ktor-client-content-negotiation", "ktor-client-cio"]
 voyager = ["voyager-tab-navigator", "voyager-koin", "voyager-navigator", "voyager-transitions"]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Aug 07 13:11:26 EDT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

shared/build.gradle.kts

@@ -21,7 +21,7 @@ android {
 }
 
 kotlin {
-    android()
+    androidTarget()
     jvmToolchain(17)
 
     sourceSets {

ui/build.gradle.kts

@@ -25,7 +25,7 @@ android {
 }
 
 kotlin {
-    android()
+    androidTarget()
     jvmToolchain(17)
 
     sourceSets {
@@ -47,13 +47,14 @@ kotlin {
                 api(libs.compose.pdf)
                 api(libs.highlights)
                 api(libs.koin.core)
-                api(libs.koin.androidx.compose)
+                api(libs.koin.compose)
                 api(libs.moko.resources.compose)
                 api(libs.multiplatform.paging)
                 api(libs.zoomable)
             }
         }
         val androidMain by getting {
+            dependsOn(commonMain.get()) // Necessary for MOKO Resources
             dependencies {
                 api(libs.bundles.accompanist)
                 api(libs.androidx.core.ktx)

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/components/DownloadButton.kt

@@ -12,7 +12,7 @@ import com.materiiapps.gloom.Res
 import com.materiiapps.gloom.domain.manager.DownloadManager
 import com.materiiapps.gloom.ui.widgets.alerts.LocalAlertController
 import dev.icerock.moko.resources.compose.stringResource
-import org.koin.androidx.compose.get
+import org.koin.compose.koinInject
 
 @Composable
 fun DownloadButton(
@@ -21,7 +21,7 @@ fun DownloadButton(
     fileName: String = downloadUrl.split("/").lastOrNull() ?: "${uuid4()}.blob",
     onDownloadFinished: (String) -> Unit = {}
 ) {
-    val downloadManager: DownloadManager = get()
+    val downloadManager: DownloadManager = koinInject()
     val alertController = LocalAlertController.current
     val downloadingText = stringResource(Res.strings.msg_downloading_file, fileName)
     val downloadedText = stringResource(Res.strings.msg_download_completed)

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/explorer/FileViewerScreen.kt

@@ -59,7 +59,7 @@ import com.materiiapps.gloom.ui.screens.explorer.viewers.TextFileViewer
 import com.materiiapps.gloom.ui.utils.thenIf
 import com.materiiapps.gloom.ui.viewmodels.explorer.FileViewerViewModel
 import dev.icerock.moko.resources.compose.stringResource
-import org.koin.androidx.compose.get
+import org.koin.compose.koinInject
 import org.koin.core.parameter.parametersOf
 
 class FileViewerScreen(
@@ -165,7 +165,7 @@ class FileViewerScreen(
         viewModel: FileViewerViewModel,
         file: RepoFile.File?
     ) {
-        val shareManager: ShareManager = get()
+        val shareManager: ShareManager = koinInject()
         val clipboardManager = LocalClipboardManager.current
         val fileType = file?.fileType?.__typename
 
@@ -219,7 +219,7 @@ class FileViewerScreen(
     }
 
     @Composable
-    @OptIn(ExperimentalMaterial3Api::class, ExperimentalAnimationApi::class)
+    @OptIn(ExperimentalMaterial3Api::class)
     private fun Toolbar(
         scrollBehavior: TopAppBarScrollBehavior,
         viewModel: FileViewerViewModel,

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/profile/ProfileScreen.kt

@@ -114,7 +114,7 @@ import com.materiiapps.gloom.utils.Constants
 import com.seiko.imageloader.rememberImagePainter
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
-import org.koin.androidx.compose.get
+import org.koin.compose.koinInject
 import org.koin.core.parameter.parametersOf
 import java.net.URI
 
@@ -192,7 +192,7 @@ open class ProfileScreen(
         scrollBehavior: TopAppBarScrollBehavior
     ) {
         val nav = LocalNavigator.current
-        val shareManager: ShareManager = get()
+        val shareManager: ShareManager = koinInject()
 
         TopAppBar(
             title = {

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/release/ReleaseScreen.kt

@@ -62,7 +62,7 @@ import com.materiiapps.gloom.ui.widgets.release.dialog.ReleaseAssetInstallDialog
 import com.materiiapps.gloom.utils.Feature
 import com.materiiapps.gloom.utils.Features
 import dev.icerock.moko.resources.compose.stringResource
-import org.koin.androidx.compose.get
+import org.koin.compose.koinInject
 import org.koin.core.parameter.parametersOf
 
 class ReleaseScreen(
@@ -78,7 +78,7 @@ class ReleaseScreen(
     override fun Content() {
         val viewModel: ReleaseViewModel = getScreenModel { parametersOf(Triple(owner, name, tag)) }
         val alertController = LocalAlertController.current
-        val dialogManager: DialogManager = get()
+        val dialogManager: DialogManager = koinInject()
         val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
         val items = viewModel.items.collectAsLazyPagingItems()
         val details = viewModel.details
@@ -238,7 +238,7 @@ class ReleaseScreen(
         scrollBehavior: TopAppBarScrollBehavior
     ) {
         val titleAlpha = scrollBehavior.state.overlappedFraction
-        val shareManager: ShareManager = get()
+        val shareManager: ShareManager = koinInject()
 
         TopAppBar(
             navigationIcon = { BackButton() },

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/repo/RepoScreen.kt

@@ -63,7 +63,7 @@ import com.materiiapps.gloom.ui.utils.navigate
 import com.materiiapps.gloom.ui.viewmodels.repo.RepoViewModel
 import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.coroutines.launch
-import org.koin.androidx.compose.get
+import org.koin.compose.koinInject
 import org.koin.core.parameter.parametersOf
 
 class RepoScreen(
@@ -186,7 +186,7 @@ class RepoScreen(
         scrollBehavior: TopAppBarScrollBehavior,
         viewModel: RepoViewModel
     ) {
-        val shareManager: ShareManager = get()
+        val shareManager: ShareManager = koinInject()
         val avSize = Dp(55 - scrollBehavior.state.collapsedFraction * 55)
         val nav = LocalNavigator.current
         val loading by remember {

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/root/RootScreen.kt

@@ -27,7 +27,7 @@ import com.materiiapps.gloom.ui.components.navbar.LongClickableNavBarItem
 import com.materiiapps.gloom.ui.utils.DimenUtils
 import com.materiiapps.gloom.ui.utils.RootTab
 import com.materiiapps.gloom.ui.widgets.accounts.AccountSwitcherSheet
-import org.koin.androidx.compose.get
+import org.koin.compose.koinInject
 
 class RootScreen : Screen {
 
@@ -67,11 +67,11 @@ class RootScreen : Screen {
     private fun TabBar(
         onProfileLongClick: () -> Unit
     ) {
-        val authManager: AuthManager = get()
+        val authManager: AuthManager = koinInject()
         val navigator = LocalTabNavigator.current
 
         NavigationBar {
-            RootTab.values().forEach {
+            RootTab.entries.forEach {
                 LongClickableNavBarItem(
                     selected = navigator.current == it.tab,
                     onClick = { navigator.current = it.tab },

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/screens/settings/about/LibrariesScreen.kt

@@ -17,14 +17,14 @@ import com.materiiapps.gloom.ui.components.toolbar.LargeToolbar
 import com.materiiapps.gloom.ui.components.ThinDivider
 import com.materiiapps.gloom.ui.widgets.about.LibraryItem
 import dev.icerock.moko.resources.compose.stringResource
-import org.koin.androidx.compose.get
+import org.koin.compose.koinInject
 
 class LibrariesScreen: Screen {
 
     @Composable
     @OptIn(ExperimentalMaterial3Api::class)
     override fun Content() {
-        val libraryManager: LibraryManager = get()
+        val libraryManager: LibraryManager = koinInject()
         val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
 
         Scaffold(

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/theme/CodeTheme.kt

@@ -12,7 +12,7 @@ import com.materiiapps.gloom.domain.manager.PreferenceManager
 import com.materiiapps.gloom.domain.manager.Theme
 import dev.snipme.highlights.model.SyntaxTheme
 import dev.snipme.highlights.model.SyntaxThemes
-import org.koin.androidx.compose.get
+import org.koin.compose.koinInject
 
 data class CodeTheme(
     val background: Color,
@@ -69,7 +69,7 @@ data class CodeTheme(
 
         @Composable
         fun getDefault(): CodeTheme {
-            val prefs: PreferenceManager = get()
+            val prefs: PreferenceManager = koinInject()
             val isSystemInDarkTheme = isSystemInDarkTheme()
             val darkMode = remember(prefs.theme, isSystemInDarkTheme) {
                 (prefs.theme == Theme.DARK && prefs.theme != Theme.LIGHT) || (prefs.theme == Theme.SYSTEM  && isSystemInDarkTheme)

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/widgets/accounts/AccountSwitcherSheet.kt

@@ -26,15 +26,15 @@ import com.materiiapps.gloom.ui.utils.navigate
 import com.materiiapps.gloom.ui.utils.toImmutableList
 import com.materiiapps.gloom.ui.viewmodels.settings.AccountSettingsViewModel
 import dev.icerock.moko.resources.compose.stringResource
-import org.koin.androidx.compose.get
+import org.koin.compose.koinInject
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
 fun AccountSwitcherSheet(
     onDismiss: () -> Unit,
 ) {
     val nav = LocalNavigator.currentOrThrow
-    val viewModel: AccountSettingsViewModel = get()
+    val viewModel: AccountSettingsViewModel = koinInject()
     val accounts by remember(viewModel.authManager.accounts) {
         derivedStateOf {
             viewModel.authManager.accounts.values

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/widgets/profile/ContributionGraph.kt

@@ -35,7 +35,6 @@ import com.materiiapps.gloom.ui.utils.format
 import com.materiiapps.gloom.ui.utils.getPluralString
 import com.materiiapps.gloom.ui.widgets.alerts.LocalAlertController
 import dev.icerock.moko.resources.compose.stringResource
-import org.koin.androidx.compose.get
 
 @Composable
 fun ContributionGraph(

ui/src/commonMain/kotlin/com/materiiapps/gloom/ui/widgets/release/ReleaseAsset.kt

@@ -36,15 +36,15 @@ import com.materiiapps.gloom.domain.manager.DialogState
 import com.materiiapps.gloom.ui.utils.getFileSizeString
 import com.materiiapps.gloom.ui.widgets.release.dialog.ReleaseAssetDownloadDialog
 import dev.icerock.moko.resources.compose.stringResource
-import org.koin.androidx.compose.get
+import org.koin.compose.koinInject
 
 @Composable
 fun ReleaseAsset(
     name: String,
     size: Int,
     onDownloadClick: () -> Unit
 ) {
-    val dialogManager: DialogManager = get()
+    val dialogManager: DialogManager = koinInject()
     var showConfirmDialog by remember {
         mutableStateOf(false)
     }