Prechádzať zdrojové kódy

Address minor build warnings

arkon 1 rok pred
rodič
commit
431f8772f8

+ 2 - 2
app/build.gradle.kts

@@ -279,8 +279,6 @@ tasks {
     withType<KotlinCompile> {
         kotlinOptions.freeCompilerArgs += listOf(
             "-Xcontext-receivers",
-            "-opt-in=coil.annotation.ExperimentalCoilApi",
-            "-opt-in=com.google.accompanist.permissions.ExperimentalPermissionsApi",
             "-opt-in=androidx.compose.foundation.layout.ExperimentalLayoutApi",
             "-opt-in=androidx.compose.material.ExperimentalMaterialApi",
             "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
@@ -289,6 +287,8 @@ tasks {
             "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",
             "-opt-in=androidx.compose.animation.ExperimentalAnimationApi",
             "-opt-in=androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi",
+            "-opt-in=coil.annotation.ExperimentalCoilApi",
+            "-opt-in=com.google.accompanist.permissions.ExperimentalPermissionsApi",
             "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
             "-opt-in=kotlinx.coroutines.FlowPreview",
             "-opt-in=kotlinx.coroutines.InternalCoroutinesApi",

+ 2 - 2
app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt

@@ -125,9 +125,9 @@ class BackupRestorer(
             } else {
                 // Manga in database
                 // Copy information from manga already in database
-                val manga = backupManager.restoreExistingManga(manga, dbManga)
+                val updatedManga = backupManager.restoreExistingManga(manga, dbManga)
                 // Fetch rest of manga information
-                restoreNewManga(manga, chapters, categories, history, tracks, backupCategories)
+                restoreNewManga(updatedManga, chapters, categories, history, tracks, backupCategories)
             }
         } catch (e: Exception) {
             val sourceName = sourceMapping[manga.source] ?: manga.source.toString()

+ 1 - 1
app/src/main/java/eu/kanade/tachiyomi/data/coil/MangaCoverFetcher.kt

@@ -34,7 +34,7 @@ import java.io.File
 /**
  * A [Fetcher] that fetches cover image for [Manga] object.
  *
- * It uses [Manga.thumbnail_url] if custom cover is not set by the user.
+ * It uses [Manga.thumbnailUrl] if custom cover is not set by the user.
  * Disk caching for library items is handled by [CoverCache], otherwise
  * handled by Coil's [DiskCache].
  *

+ 4 - 12
app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdatesApi.kt

@@ -48,11 +48,7 @@ class MangaUpdatesApi(
 
     suspend fun getSeriesListItem(track: Track): Pair<ListItem, Rating?> {
         val listItem = with(json) {
-            authClient.newCall(
-                GET(
-                    url = "$baseUrl/v1/lists/series/${track.media_id}",
-                ),
-            )
+            authClient.newCall(GET("$baseUrl/v1/lists/series/${track.media_id}"))
                 .awaitSuccess()
                 .parseAs<ListItem>()
         }
@@ -110,14 +106,10 @@ class MangaUpdatesApi(
         updateSeriesRating(track)
     }
 
-    suspend fun getSeriesRating(track: Track): Rating? {
+    private suspend fun getSeriesRating(track: Track): Rating? {
         return try {
             with(json) {
-                authClient.newCall(
-                    GET(
-                        url = "$baseUrl/v1/series/${track.media_id}/rating",
-                    ),
-                )
+                authClient.newCall(GET("$baseUrl/v1/series/${track.media_id}/rating"))
                     .awaitSuccess()
                     .parseAs<Rating>()
             }
@@ -126,7 +118,7 @@ class MangaUpdatesApi(
         }
     }
 
-    suspend fun updateSeriesRating(track: Track) {
+    private suspend fun updateSeriesRating(track: Track) {
         if (track.score != 0f) {
             val body = buildJsonObject {
                 put("rating", track.score)

+ 1 - 0
core/build.gradle.kts

@@ -10,6 +10,7 @@ android {
     kotlinOptions {
         freeCompilerArgs += listOf(
             "-Xcontext-receivers",
+            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
             "-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
         )
     }

+ 2 - 1
presentation-core/build.gradle.kts

@@ -38,7 +38,6 @@ tasks {
     // See https://kotlinlang.org/docs/reference/experimental.html#experimental-status-of-experimental-api(-markers)
     withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
         kotlinOptions.freeCompilerArgs += listOf(
-            "-opt-in=coil.annotation.ExperimentalCoilApi",
             "-opt-in=androidx.compose.foundation.layout.ExperimentalLayoutApi",
             "-opt-in=androidx.compose.material.ExperimentalMaterialApi",
             "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
@@ -47,6 +46,8 @@ tasks {
             "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",
             "-opt-in=androidx.compose.animation.ExperimentalAnimationApi",
             "-opt-in=androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi",
+            "-opt-in=coil.annotation.ExperimentalCoilApi",
+            "-opt-in=kotlinx.coroutines.FlowPreview",
         )
     }
 }

+ 8 - 0
source-local/build.gradle.kts

@@ -35,3 +35,11 @@ android {
         consumerProguardFiles("consumer-rules.pro")
     }
 }
+
+tasks {
+    withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+        kotlinOptions.freeCompilerArgs += listOf(
+            "-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
+        )
+    }
+}