diff --git a/build.gradle.kts b/build.gradle.kts index b2e84b7f0..3da402dad 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -68,8 +68,9 @@ tasks { dependsOn(build) doLast { - val d8 = File(System.getenv("ANDROID_HOME")).resolve("build-tools") - .listFilesOrdered().last().resolve("d8").absolutePath + val d8 = + File(System.getenv("ANDROID_HOME")).resolve("build-tools") + .listFilesOrdered().last().resolve("d8").absolutePath val patchesJar = configurations.archives.get().allArtifacts.files.files.first().absolutePath val workingDirectory = layout.buildDirectory.dir("libs").get().asFile diff --git a/src/main/kotlin/app/revanced/generator/JsonPatchesFileGenerator.kt b/src/main/kotlin/app/revanced/generator/JsonPatchesFileGenerator.kt index 28871d6d1..e2f810f6d 100644 --- a/src/main/kotlin/app/revanced/generator/JsonPatchesFileGenerator.kt +++ b/src/main/kotlin/app/revanced/generator/JsonPatchesFileGenerator.kt @@ -6,27 +6,28 @@ import com.google.gson.GsonBuilder import java.io.File internal class JsonPatchesFileGenerator : PatchesFileGenerator { - override fun generate(patches: PatchSet) = patches.map { - JsonPatch( - it.name!!, - it.description, - it.compatiblePackages, - it.use, - it.requiresIntegrations, - it.options.values.map { option -> - JsonPatch.Option( - option.key, - option.default, - option.values, - option.title, - option.description, - option.required, - ) - }, - ) - }.let { - File("patches.json").writeText(GsonBuilder().serializeNulls().create().toJson(it)) - } + override fun generate(patches: PatchSet) = + patches.map { + JsonPatch( + it.name!!, + it.description, + it.compatiblePackages, + it.use, + it.requiresIntegrations, + it.options.values.map { option -> + JsonPatch.Option( + option.key, + option.default, + option.values, + option.title, + option.description, + option.required + ) + } + ) + }.let { + File("patches.json").writeText(GsonBuilder().serializeNulls().create().toJson(it)) + } @Suppress("unused") private class JsonPatch( @@ -35,7 +36,7 @@ internal class JsonPatchesFileGenerator : PatchesFileGenerator { val compatiblePackages: Set? = null, val use: Boolean = true, val requiresIntegrations: Boolean = false, - val options: List