1.10
This commit is contained in:
parent
aeff5b4ad4
commit
a3445b4482
|
|
@ -6,7 +6,7 @@ plugins {
|
||||||
}
|
}
|
||||||
|
|
||||||
group 'io.izzel.taboolib'
|
group 'io.izzel.taboolib'
|
||||||
version '1.9'
|
version '1.10'
|
||||||
|
|
||||||
configurations {
|
configurations {
|
||||||
embed
|
embed
|
||||||
|
|
|
||||||
|
|
@ -142,9 +142,19 @@ class RelocateJar extends DefaultTask {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static boolean isIsolated(Map<String, Set<String>> use, Set<String> refer, Map<String, List<String>> isolated, String nameWithOutExtension) {
|
static boolean isIsolated(
|
||||||
if (isolated.containsKey(nameWithOutExtension)) {
|
Map<String, Set<String>> use,
|
||||||
return refer.size() <= 1 || refer.stream().allMatch { nameWithOutExtension == it || isolated[nameWithOutExtension].contains(it) || isIsolated(use, use[it], isolated, it) }
|
Set<String> refer,
|
||||||
|
Map<String, List<String>> isolated,
|
||||||
|
String name,
|
||||||
|
String exclude = null
|
||||||
|
) {
|
||||||
|
if (isolated.containsKey(name)) {
|
||||||
|
return refer.size() <= 1 || refer.stream()
|
||||||
|
.filter { it != exclude }
|
||||||
|
.allMatch {
|
||||||
|
name == it || isolated[name].contains(it) || isIsolated(use, use[it], isolated, it, name)
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue