Merge branch 'dev' into dev-1

ReVanced · Aug 18, 2023 · f174b91 · f174b91
2 parents b103001 + 58bb879
commit f174b91
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,30 @@
+# [13.0.0](https:/ReVanced/revanced-patcher/compare/v12.1.1...v13.0.0) (2023-08-14)
+
+
+### Bug Fixes
+
+* decode in correct order ([8fb2f2d](https:/ReVanced/revanced-patcher/commit/8fb2f2dc1d3b9b1e9fd13b39485985d2886d52ae))
+* disable correct loggers ([c2d89c6](https:/ReVanced/revanced-patcher/commit/c2d89c622e06e58e5042e1a00ef67cee8a246e53))
+* get framework ids to compile resources ([f2cb7ee](https:/ReVanced/revanced-patcher/commit/f2cb7ee7dffa573c31df497cf235a3f5d120f91f))
+* only enable logging for ReVanced ([783ccf8](https:/ReVanced/revanced-patcher/commit/783ccf8529f5d16aa463982da6977328306232bb))
+* set package metadata correctly ([02d6ff1](https:/ReVanced/revanced-patcher/commit/02d6ff15fe87c2352de29749610e9d72db8ba418))
+
+
+* build(Needs bump)!: Bump dependencies ([d5f89a9](https:/ReVanced/revanced-patcher/commit/d5f89a903f019c199bdb27a50287124fc4b4978e))
+
+
+### BREAKING CHANGES
+
+* This bump updates smali, a crucial dependency
+
+# [13.0.0-dev.3](https:/ReVanced/revanced-patcher/compare/v13.0.0-dev.2...v13.0.0-dev.3) (2023-08-14)
+
+
+### Bug Fixes
+
+* decode in correct order ([8fb2f2d](https:/ReVanced/revanced-patcher/commit/8fb2f2dc1d3b9b1e9fd13b39485985d2886d52ae))
+* only enable logging for ReVanced ([783ccf8](https:/ReVanced/revanced-patcher/commit/783ccf8529f5d16aa463982da6977328306232bb))
+
 # [13.0.0-dev.2](https:/ReVanced/revanced-patcher/compare/v13.0.0-dev.1...v13.0.0-dev.2) (2023-08-12)
 
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 13.0.0-dev.2
+version = 13.0.0
diff --git a/src/main/kotlin/app/revanced/patcher/Patcher.kt b/src/main/kotlin/app/revanced/patcher/Patcher.kt
@@ -28,6 +28,7 @@ import java.io.Closeable
 import java.io.File
 import java.io.OutputStream
 import java.nio.file.Files
+import java.util.logging.Level
 import java.util.logging.LogManager
 
 internal val NAMER = BasicDexFileNamer()
@@ -55,10 +56,14 @@ class Patcher(private val options: PatcherOptions) {
 
  init {
  // Disable unwanted logging.
- LogManager.getLogManager().let {
- listOf("app.revanced.apktool-lib", "app.revanced.brut.*").forEach { loggerName ->
- it.getLogger(loggerName)?.useParentHandlers = false
- }
+ LogManager.getLogManager().let { manager ->
+ manager.getLogger("").level = Level.OFF // Disable root logger.
+ // Enable only ReVanced logging.
+ manager.loggerNames
+ .toList()
+ .filter { it.startsWith("app.revanced") }
+ .map { manager.getLogger(it) }
+ .forEach { it.level = Level.INFO }
  }
 
  logger.info("Reading dex files")
@@ -208,8 +213,8 @@ class Patcher(private val options: PatcherOptions) {
 
  val outDir = options.recreateResourceCacheDirectory()
 
- resourcesDecoder.decodeManifest(outDir)
  resourcesDecoder.decodeResources(outDir)
+ resourcesDecoder.decodeManifest(outDir)
 
  apkDecoder.recordUncompressedFiles(resourcesDecoder.resFileMapping)