chore: Merge branch dev to main (#9)

This commit is contained in:
oSumAtrIX
2023-10-04 04:23:15 +02:00
committed by GitHub
4 changed files with 16 additions and 7 deletions

View File

@@ -1,3 +1,10 @@
## [1.1.1-dev.1](https://github.com/ReVanced/revanced-library/compare/v1.1.0...v1.1.1-dev.1) (2023-10-04)
### Performance Improvements
* Use maps to set options ([13823b7](https://github.com/ReVanced/revanced-library/commit/13823b74db1de3a104b5022b6bf0db0ef945f47b))
# [1.1.0](https://github.com/ReVanced/revanced-library/compare/v1.0.1...v1.1.0) (2023-10-01) # [1.1.0](https://github.com/ReVanced/revanced-library/compare/v1.0.1...v1.1.0) (2023-10-01)

View File

@@ -1,4 +1,4 @@
org.gradle.parallel = true org.gradle.parallel = true
org.gradle.caching = true org.gradle.caching = true
kotlin.code.style = official kotlin.code.style = official
version = 1.1.0 version = 1.1.1-dev.1

View File

@@ -5,7 +5,7 @@ jackson-module-kotlin = "2.14.3"
jadb = "2531a28109" jadb = "2531a28109"
kotlin-reflect = "1.9.0" kotlin-reflect = "1.9.0"
kotlin-test = "1.8.20-RC" kotlin-test = "1.8.20-RC"
revanced-patcher = "15.0.1" revanced-patcher = "16.0.0"
binary-compatibility-validator = "0.13.2" binary-compatibility-validator = "0.13.2"
[libraries] [libraries]

View File

@@ -61,13 +61,15 @@ object Options {
filter { it.options.any() }.let { patches -> filter { it.options.any() }.let { patches ->
if (patches.isEmpty()) return if (patches.isEmpty()) return
val patchOptions = deserialize(json) val jsonPatches = deserialize(json).associate {
it.patchName to it.options.associate { option -> option.key to option.value }
}
patches.forEach patch@{ patch -> patches.forEach { patch ->
patchOptions.find { option -> option.patchName == patch.name!! }?.let { jsonPatches[patch.name]?.let { jsonPatchOptions ->
it.options.forEach { option -> jsonPatchOptions.forEach { (option, value) ->
try { try {
patch.options[option.key] = option.value patch.options[option] = value
} catch (e: PatchOptionException) { } catch (e: PatchOptionException) {
logger.severe(e.toString()) logger.severe(e.toString())
} }