chore(release): 14.0.0-dev.4 [skip ci]

# [14.0.0-dev.4](https://github.com/ReVanced/revanced-patcher/compare/v14.0.0-dev.3...v14.0.0-dev.4) (2023-08-22)

### Bug Fixes

* only emit closed patches that did not throw an exception with the `@Patch` annotation ([5938f6b](5938f6b7ea))

CHANGELOG.md

@@ -1,3 +1,22 @@
+# [14.0.0-dev.4](https://github.com/ReVanced/revanced-patcher/compare/v14.0.0-dev.3...v14.0.0-dev.4) (2023-08-22)
+
+
+### Bug Fixes
+
+* only emit closed patches that did not throw an exception with the `@Patch` annotation ([5938f6b](https://github.com/ReVanced/revanced-patcher/commit/5938f6b7ea25103a0a1b56ceebe49139bc80c6f5))
+
+# [14.0.0-dev.3](https://github.com/ReVanced/revanced-patcher/compare/v14.0.0-dev.2...v14.0.0-dev.3) (2023-08-20)
+
+
+### Bug Fixes
+
+* supply the parent classloader to `DexClassLoader` ([0f15077](https://github.com/ReVanced/revanced-patcher/commit/0f15077225600b65200022c1a318e504deb472b9))
+
+
+### Features
+
+* do not log instantiation of ReVanced Patcher ([273dd8d](https://github.com/ReVanced/revanced-patcher/commit/273dd8d388f8e9b7436c6d6145a94c12c1fabe55))
+
 # [14.0.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v14.0.0-dev.1...v14.0.0-dev.2) (2023-08-19)
 
 # [14.0.0-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v13.0.0...v14.0.0-dev.1) (2023-08-18)

build.gradle.kts

@@ -28,7 +28,7 @@ dependencies {
     implementation("xpp3:xpp3:1.1.4c")
     implementation("com.android.tools.smali:smali:3.0.3")
     implementation("app.revanced:multidexlib2:3.0.3.r2")
-    implementation("app.revanced:apktool-lib:2.8.2-4")
+    implementation("app.revanced:apktool-lib:2.8.2-5")
     implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.22")
 
     compileOnly("com.google.android:android:4.1.1.4")

gradle.properties

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

src/main/kotlin/app/revanced/patcher/PatchBundleLoader.kt

@@ -5,7 +5,7 @@ package app.revanced.patcher
 import app.revanced.patcher.extensions.AnnotationExtensions.findAnnotationRecursively
 import app.revanced.patcher.patch.Patch
 import app.revanced.patcher.patch.PatchClass
-import dalvik.system.PathClassLoader
+import dalvik.system.DexClassLoader
 import lanchon.multidexlib2.BasicDexFileNamer
 import lanchon.multidexlib2.MultiDexIO
 import java.io.File
@@ -36,43 +36,36 @@ sealed class PatchBundleLoader private constructor(
      *
      * @param patchBundles The path to patch bundles of JAR format.
      */
-    class Jar(private vararg val patchBundles: File) : PatchBundleLoader(
-        with(URLClassLoader(patchBundles.map { it.toURI().toURL() }.toTypedArray())) {
+    class Jar(vararg patchBundles: File) :
+        PatchBundleLoader(with(URLClassLoader(patchBundles.map { it.toURI().toURL() }.toTypedArray())) {
             patchBundles.flatMap { patchBundle ->
                 // Get the names of all classes in the DEX file.
 
                 JarFile(patchBundle).entries().asSequence()
                     .filter { it.name.endsWith(".class") }
-                    .map {
-                        loadClass(it.name.replace('/', '.').replace(".class", ""))
-                    }
+                    .map { it.name.replace('/', '.').replace(".class", "") }
+                    .map { loadClass(it) }
             }
-        }
-    )
+        })
 
     /**
      * A [PatchBundleLoader] for [Dex] files.
      *
-     * @param patchBundlesPath The path to or a path to a directory containing patch bundles of DEX format.
+     * @param patchBundles The path to patch bundles of DEX format.
      */
-    class Dex(private val patchBundlesPath: File) : PatchBundleLoader(
-        with(PathClassLoader(patchBundlesPath.absolutePath, null)) {
-            fun readDexFile(file: File) = MultiDexIO.readDexFile(
-                true,
-                file,
-                BasicDexFileNamer(),
-                null,
-                null
-            )
-
-            // Get the names of all classes in the DEX file.
-
-            val dexFiles = if (patchBundlesPath.isFile) listOf(readDexFile(patchBundlesPath))
-            else patchBundlesPath.listFiles { it -> it.isFile }?.map { readDexFile(it) } ?: emptyList()
-
-            dexFiles.flatMap { it.classes }.map { classDef ->
-                classDef.type.substring(1, classDef.length - 1).replace('/', '.')
-            }.map { loadClass(it) }
-        }
-    )
+    class Dex(vararg patchBundles: File) : PatchBundleLoader(with(
+        DexClassLoader(
+            patchBundles.joinToString(File.pathSeparator) { it.absolutePath },
+            null,
+            null,
+            PatchBundleLoader::class.java.classLoader
+        )
+    ) {
+        patchBundles
+            .flatMap {
+                MultiDexIO.readDexFile(true, it, BasicDexFileNamer(), null, null).classes
+            }
+            .map { classDef -> classDef.type.substring(1, classDef.length - 1) }
+            .map { loadClass(it) }
+    })
 }

src/main/kotlin/app/revanced/patcher/Patcher.kt

@@ -2,6 +2,7 @@ package app.revanced.patcher
 
 import app.revanced.patcher.data.Context
 import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.extensions.AnnotationExtensions.findAnnotationRecursively
 import app.revanced.patcher.extensions.PatchExtensions.dependencies
 import app.revanced.patcher.extensions.PatchExtensions.patchName
 import app.revanced.patcher.extensions.PatchExtensions.requiresIntegrations
@@ -30,8 +31,6 @@ class Patcher(
     val context = PatcherContext(options)
 
     init {
-        options.logger.info("Instantiating ReVanced Patcher")
-
         LogManager.getLogManager().let { manager ->
             // Disable root logger.
             manager.getLogger("").level = Level.OFF
@@ -204,7 +203,15 @@ class Patcher(
                     )
 
                     if (returnOnError) return@flow
-                } ?: emit(result)
+                } ?: run {
+                    executedPatch
+                        .patchInstance::class
+                        .java
+                        .findAnnotationRecursively(app.revanced.patcher.patch.annotations.Patch::class)
+                        ?: return@run
+
+                    emit(result)
+                }
             }
     }