Merge branch 'develop' into feature/mobile

Author: aaa1115910

.github/workflows/alpha.yml

@@ -17,6 +17,12 @@ jobs:
           ref: develop
           fetch-depth: 0
 
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
       - name: Write google-services.json
         env:
           DATA: ${{ secrets.GOOGLE_SERVICES_JSON }}

.github/workflows/dependency-submission.yml

@@ -17,6 +17,12 @@ jobs:
         with:
           ref: develop
 
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
       - name: Gradle dependency submission
         uses: mikepenz/[email protected]
         with:

.github/workflows/release.yml

@@ -17,6 +17,12 @@ jobs:
           ref: master
           fetch-depth: 0
 
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
       - name: Write google-services.json
         env:
           DATA: ${{ secrets.GOOGLE_SERVICES_JSON }}

.idea/kotlinc.xml

@@ -97,7 +97,7 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion = androidx.compose.compiler.get().version
     }
-    packagingOptions {
+    packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }

app/build.gradle.kts

@@ -20,7 +20,6 @@ import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
@@ -41,7 +40,7 @@ import dev.aaa1115910.bv.component.Button
 import dev.aaa1115910.bv.ui.theme.BVTheme
 import dev.aaa1115910.bv.util.swapList
 
-@OptIn(ExperimentalComposeUiApi::class, ExperimentalTvMaterial3Api::class)
+@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun FavoriteButton(
     modifier: Modifier = Modifier,

app/src/main/kotlin/dev/aaa1115910/bv/component/buttons/FavoriteButton.kt

@@ -96,7 +96,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import mu.KotlinLogging
-import org.koin.androidx.compose.getKoin
+import org.koin.compose.getKoin
 import kotlin.math.ceil
 
 @Composable