chore: bump project version to 0.6.10

Updates: - Bump AGP from 8.5.0 to 8 .5.2 - Fix duplicated files in META-INF and module-info Signed-off-by: androidacy-user <[email protected]>
Androidacy · Aug 14, 2024 · f59c809 · f59c809
1 parent 8443f45
commit f59c809
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 
 allprojects {
     group = "com.github.Androidacy.LSParanoid"
-    version = "0.6.9"
+    version = "0.6.10"
 
     plugins.withType(JavaPlugin::class.java) {
         extensions.configure(JavaPluginExtension::class.java) {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.5.0"
+agp = "8.5.2"
 kotlin = "2.0.0"
 
 [plugins]

diff --git a/processor/src/main/kotlin/org/lsposed/lsparanoid/processor/commons/JarUtils.kt b/processor/src/main/kotlin/org/lsposed/lsparanoid/processor/commons/JarUtils.kt
@@ -16,20 +16,27 @@
 
 package org.lsposed.lsparanoid.processor.commons
 
+import org.lsposed.lsparanoid.processor.logging.getLogger
 import java.io.File
 import java.util.jar.JarEntry
 import java.util.jar.JarOutputStream
 import java.util.zip.ZipException
 
+
 internal fun JarOutputStream.createFile(name: String, data: ByteArray) {
+    val logger = getLogger()
     try {
         putNextEntry(JarEntry(name.replace(File.separatorChar, '/')))
         write(data)
     } catch (e: ZipException) {
         // it's normal to have duplicated files in META-INF
-        if (!name.startsWith("META-INF")) throw e
+        if (!name.startsWith("META-INF") || !name.startsWith("module-info")) {
+            throw e
+        } else {
+            logger.info("Duplicated file: {}", name)
+        }
     } finally {
-        closeEntry()
+        closeQuietly()
     }
 }
 
@@ -39,6 +46,6 @@ internal fun JarOutputStream.createDirectory(name: String) {
     } catch (ignored: ZipException) {
         // it's normal that the directory already exists
     } finally {
-        closeEntry()
+        closeQuietly()
     }
 }