From ce8fe9c4bf2fa6fa2748244126511a0f0ccf30fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9D=8F=E9=BB=91?= Date: Wed, 25 Aug 2021 16:19:20 +0800 Subject: [PATCH] 1.26 --- build.gradle | 2 +- .../kotlin/io/izzel/taboolib/gradle/OptimizeFileReader.kt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 9905cec..b03f0b2 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ plugins { apply plugin: 'kotlin' group 'io.izzel.taboolib' -version '1.25' +version '1.26' configurations { embed diff --git a/src/main/kotlin/io/izzel/taboolib/gradle/OptimizeFileReader.kt b/src/main/kotlin/io/izzel/taboolib/gradle/OptimizeFileReader.kt index 5931203..71a6041 100644 --- a/src/main/kotlin/io/izzel/taboolib/gradle/OptimizeFileReader.kt +++ b/src/main/kotlin/io/izzel/taboolib/gradle/OptimizeFileReader.kt @@ -106,7 +106,7 @@ class OptimizeFileReader(project: Project, input: InputStream) { if (member.any { name.startsWith(it) }) { if (depend != null) { val fail = depend.name.any { n -> - val set = use[n]!!.toMutableList() + val set = use[n]?.toMutableList() ?: ArrayList() set.remove(n) set.removeAll(depend.exclude) set.isNotEmpty() @@ -116,12 +116,13 @@ class OptimizeFileReader(project: Project, input: InputStream) { } } for (s in check) { - val set = use[s]!!.toMutableList() + val set = use[s]?.toMutableList() ?: ArrayList() set.remove(s) set.removeAll(check) set.removeAll(member) set.removeAll(exclude) if (set.isNotEmpty()) { + println("$s -> $set") return false } }