From e113daa089e21079de06e12b05a140c1af57a527 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Sat, 17 Aug 2024 00:53:13 +0200 Subject: [PATCH] build: Bump dependencies to correctly serialize patches as JSON --- gradle/libs.versions.toml | 4 ++-- .../revanced/api/configuration/services/PatchesService.kt | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6730386..2816c9e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,8 +10,8 @@ ktor = "2.3.7" ktoml = "0.5.2" picocli = "4.7.6" datetime = "0.6.0" -revanced-patcher = "19.3.1" -revanced-library = "2.3.0" +revanced-patcher = "20.0.0" +revanced-library = "3.0.1-dev.1" caffeine = "3.1.8" bouncy-castle = "1.78.1" diff --git a/src/main/kotlin/app/revanced/api/configuration/services/PatchesService.kt b/src/main/kotlin/app/revanced/api/configuration/services/PatchesService.kt index a1e7608..6a70041 100644 --- a/src/main/kotlin/app/revanced/api/configuration/services/PatchesService.kt +++ b/src/main/kotlin/app/revanced/api/configuration/services/PatchesService.kt @@ -4,8 +4,8 @@ import app.revanced.api.configuration.repository.BackendRepository import app.revanced.api.configuration.repository.BackendRepository.BackendOrganization.BackendRepository.BackendRelease.Companion.first import app.revanced.api.configuration.repository.ConfigurationRepository import app.revanced.api.configuration.schema.* -import app.revanced.library.PatchUtils -import app.revanced.patcher.PatchBundleLoader +import app.revanced.library.serializeTo +import app.revanced.patcher.patch.loadPatchesFromJar import com.github.benmanes.caffeine.cache.Caffeine import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext @@ -94,7 +94,7 @@ internal class PatchesService( configurationRepository.patches.publicKeyId, ) ) { - PatchBundleLoader.Jar(patchesFile) + loadPatchesFromJar(setOf(patchesFile)) } else { // Use an empty set of patches if the signature is invalid. emptySet() @@ -103,7 +103,7 @@ internal class PatchesService( patchesFile.delete() ByteArrayOutputStream().use { stream -> - PatchUtils.Json.serialize(patches, outputStream = stream) + patches.serializeTo(outputStream = stream) stream.toByteArray() }