mirror of
https://github.com/ReVanced/revanced-cli.git
synced 2026-01-17 16:33:58 +00:00
Compare commits
2 Commits
v3.0.2-dev
...
v3.0.2-dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f7fcbc55bb | ||
|
|
9fe5a0b6d9 |
@@ -1,3 +1,10 @@
|
|||||||
|
## [3.0.2-dev.2](https://github.com/ReVanced/revanced-cli/compare/v3.0.2-dev.1...v3.0.2-dev.2) (2023-08-28)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* check for package compatibility at first ([9fe5a0b](https://github.com/ReVanced/revanced-cli/commit/9fe5a0b6d93304f630436ed0e954723d9a27b0f6))
|
||||||
|
|
||||||
## [3.0.2-dev.1](https://github.com/ReVanced/revanced-cli/compare/v3.0.1...v3.0.2-dev.1) (2023-08-28)
|
## [3.0.2-dev.1](https://github.com/ReVanced/revanced-cli/compare/v3.0.1...v3.0.2-dev.1) (2023-08-28)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -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 = 3.0.2-dev.1
|
version = 3.0.2-dev.2
|
||||||
|
|||||||
@@ -241,15 +241,7 @@ internal object PatchCommand : Runnable {
|
|||||||
val explicitlyExcluded = excludedPatches.contains(formattedPatchName)
|
val explicitlyExcluded = excludedPatches.contains(formattedPatchName)
|
||||||
if (explicitlyExcluded) return@patch logger.info("Excluding ${patch.patchName}")
|
if (explicitlyExcluded) return@patch logger.info("Excluding ${patch.patchName}")
|
||||||
|
|
||||||
// If the patch is implicitly included, it will be only included if [exclusive] is false.
|
// Make sure the patch is compatible with the supplied APK files package name and version.
|
||||||
val implicitlyIncluded = !exclusive && patch.include
|
|
||||||
// If the patch is explicitly included, it will be included even if [exclusive] is false.
|
|
||||||
val explicitlyIncluded = includedPatches.contains(formattedPatchName)
|
|
||||||
|
|
||||||
val included = implicitlyIncluded || explicitlyIncluded
|
|
||||||
if (!included) return@patch logger.info("${patch.patchName} excluded by default") // Case 1.
|
|
||||||
|
|
||||||
// At last make sure the patch is compatible with the supplied APK files package name and version.
|
|
||||||
patch.compatiblePackages?.let { packages ->
|
patch.compatiblePackages?.let { packages ->
|
||||||
packages.singleOrNull { it.name == packageName }?.let { `package` ->
|
packages.singleOrNull { it.name == packageName }?.let { `package` ->
|
||||||
val matchesVersion = force || `package`.versions.let {
|
val matchesVersion = force || `package`.versions.let {
|
||||||
@@ -269,6 +261,14 @@ internal object PatchCommand : Runnable {
|
|||||||
return@let
|
return@let
|
||||||
} ?: logger.fine("$formattedPatchName: No constraint on packages.")
|
} ?: logger.fine("$formattedPatchName: No constraint on packages.")
|
||||||
|
|
||||||
|
// If the patch is implicitly included, it will be only included if [exclusive] is false.
|
||||||
|
val implicitlyIncluded = !exclusive && patch.include
|
||||||
|
// If the patch is explicitly included, it will be included even if [exclusive] is false.
|
||||||
|
val explicitlyIncluded = includedPatches.contains(formattedPatchName)
|
||||||
|
|
||||||
|
val included = implicitlyIncluded || explicitlyIncluded
|
||||||
|
if (!included) return@patch logger.info("${patch.patchName} excluded by default") // Case 1.
|
||||||
|
|
||||||
logger.fine("Adding $formattedPatchName")
|
logger.fine("Adding $formattedPatchName")
|
||||||
|
|
||||||
add(patch)
|
add(patch)
|
||||||
|
|||||||
Reference in New Issue
Block a user