Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignore duplicated module-info.class in JAR root #61

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Ignore duplicated module-info.class in JAR root #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
174eec3
Ignore duplicated module-info.class in JAR root
mirfatif Oct 17, 2024
a3f9861
Bump to 0.6.1
mirfatif Oct 17, 2024
413fd3a
Merge branch 'master' into dup-module-info
Howard20181 Oct 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {

allprojects {
group = "org.lsposed.lsparanoid"
version = "0.6.0"
version = "0.6.1"

plugins.withType(JavaPlugin::class.java) {
extensions.configure(JavaPluginExtension::class.java) {
Expand Down
4 changes: 2 additions & 2 deletions processor/src/main/kotlin/org/lsposed/lsparanoid/processor/commons/JarUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ internal fun JarOutputStream.createFile(name: String, data: ByteArray) {
write(data)
closeEntry()
} catch (e: ZipException) {
// it's normal to have duplicated files in META-INF
if (!name.startsWith("META-INF")) throw e
// it's normal to have duplicated files in META-INF and duplicated module-info.class in root
if (!name.startsWith("META-INF") && name != "module-info.class") throw e
}
}

Expand Down
2 changes: 1 addition & 1 deletion samples/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("com.android.application") version "8.7.1" apply false
id("com.android.library") version "8.7.1" apply false
id("org.lsposed.lsparanoid") version "0.6.0" apply false
id("org.lsposed.lsparanoid") version "0.6.1" apply false
}
Loading