From 2ff186eaecd5d4ae8c14b521c2884cf795b8ebec Mon Sep 17 00:00:00 2001 From: arkon Date: Fri, 12 Feb 2021 11:06:54 -0500 Subject: [PATCH] Remove ExperimentalSerializationApi opt-in annotations (cherry picked from commit 41d7cee020682bf75fb1620b9792ff6793c50f9c) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt # app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt --- .../eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt | 2 -- .../eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt | 2 -- .../tachiyomi/data/backup/full/FullBackupRestoreValidator.kt | 2 -- 3 files changed, 6 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt index b8edd3897..f2b419441 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt @@ -40,7 +40,6 @@ import exh.savedsearches.JsonSavedSearch import exh.source.MERGED_SOURCE_ID import exh.source.getMainSource import exh.util.executeOnIO -import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.decodeFromString import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json @@ -51,7 +50,6 @@ import okio.sink import timber.log.Timber import kotlin.math.max -@OptIn(ExperimentalSerializationApi::class) class FullBackupManager(context: Context) : AbstractBackupManager(context) { val parser = ProtoBuf diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt index c56745f5b..b4f65877f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt @@ -20,13 +20,11 @@ import eu.kanade.tachiyomi.source.online.all.MergedSource import eu.kanade.tachiyomi.util.lang.launchIO import exh.EXHMigrations import exh.source.MERGED_SOURCE_ID -import kotlinx.serialization.ExperimentalSerializationApi import okio.buffer import okio.gzip import okio.source import java.util.Date -@OptIn(ExperimentalSerializationApi::class) class FullBackupRestore(context: Context, notifier: BackupNotifier, private val online: Boolean) : AbstractBackupRestore(context, notifier) { override fun performRestore(uri: Uri): Boolean { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestoreValidator.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestoreValidator.kt index 4cb30234c..90e6be5c1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestoreValidator.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestoreValidator.kt @@ -5,12 +5,10 @@ import android.net.Uri import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.backup.AbstractBackupRestoreValidator import eu.kanade.tachiyomi.data.backup.full.models.BackupSerializer -import kotlinx.serialization.ExperimentalSerializationApi import okio.buffer import okio.gzip import okio.source -@OptIn(ExperimentalSerializationApi::class) class FullBackupRestoreValidator : AbstractBackupRestoreValidator() { /** * Checks for critical backup file data.