tony_all
/
Maxlib-GradlePlugin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1.26

This commit is contained in:
坏黑 2021-08-25 16:19:20 +08:00
parent 8596bcae2c
commit ce8fe9c4bf
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -9,7 +9,7 @@ plugins {
apply plugin: 'kotlin' apply plugin: 'kotlin'
group 'io.izzel.taboolib' group 'io.izzel.taboolib'
version '1.25' version '1.26'
configurations { configurations {
embed embed

5
src/main/kotlin/io/izzel/taboolib/gradle/OptimizeFileReader.kt
View File

@ -106,7 +106,7 @@ class OptimizeFileReader(project: Project, input: InputStream) {
if (member.any { name.startsWith(it) }) { if (member.any { name.startsWith(it) }) {
if (depend != null) { if (depend != null) {
val fail = depend.name.any { n -> val fail = depend.name.any { n ->
val set = use[n]!!.toMutableList() val set = use[n]?.toMutableList() ?: ArrayList()
set.remove(n) set.remove(n)
set.removeAll(depend.exclude) set.removeAll(depend.exclude)
set.isNotEmpty() set.isNotEmpty()
@ -116,12 +116,13 @@ class OptimizeFileReader(project: Project, input: InputStream) {
} }
} }
for (s in check) { for (s in check) {
val set = use[s]!!.toMutableList() val set = use[s]?.toMutableList() ?: ArrayList()
set.remove(s) set.remove(s)
set.removeAll(check) set.removeAll(check)
set.removeAll(member) set.removeAll(member)
set.removeAll(exclude) set.removeAll(exclude)
if (set.isNotEmpty()) { if (set.isNotEmpty()) {
println("$s -> $set")
return false return false
} }
} }