ReVanced/revanced-patcher
1
0
Fork 0
mirror of https://github.com/revanced/revanced-patcher.git synced 2025-04-30 21:34:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: Merge branch dev to main (#249)

Browse Source
This commit is contained in:
oSumAtrIX 2023-10-05 17:28:45 +02:00 committed by GitHub
commit d314466ce2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -1,3 +1,10 @@
## [16.0.1-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v16.0.0...v16.0.1-dev.1) (2023-10-05)
### Bug Fixes
* Merge integrations when required ([06c2b76](https://github.com/ReVanced/revanced-patcher/commit/06c2b76f11ac1bfe43d51d54d425e7577ecefdf6))
# [16.0.0](https://github.com/ReVanced/revanced-patcher/compare/v15.0.3...v16.0.0) (2023-10-04) # [16.0.0](https://github.com/ReVanced/revanced-patcher/compare/v15.0.3...v16.0.0) (2023-10-04)

2
gradle.properties
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 = 16.0.0 version = 16.0.1-dev.1

2
revanced-patcher/src/main/kotlin/app/revanced/patcher/Patcher.kt
View File

@ -104,7 +104,7 @@ class Patcher(
// Determine, if merging integrations is required. // Determine, if merging integrations is required.
for (patch in patches) for (patch in patches)
if (!patch.anyRecursively { it.requiresIntegrations }) { if (patch.anyRecursively { it.requiresIntegrations }) {
context.bytecodeContext.integrations.merge = true context.bytecodeContext.integrations.merge = true
break break
} }