File tree Expand file tree Collapse file tree 3 files changed +15
-11
lines changed
src/main/groovy/io/izzel/taboolib/gradle Expand file tree Collapse file tree 3 files changed +15
-11
lines changed Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ plugins {
8
8
}
9
9
10
10
group = " io.izzel.taboolib"
11
- version = " 2.0.6 "
11
+ version = " 2.0.7 "
12
12
13
13
configurations {
14
14
create(" embed" ) {
Original file line number Diff line number Diff line change @@ -80,7 +80,6 @@ class TabooLibPlugin implements Plugin<Project> {
80
80
}
81
81
82
82
def kotlinVersion = KotlinPluginWrapperKt . getKotlinPluginVersion(project). replaceAll(" [._-]" , " " )
83
- def coroutinesVersion = tabooExt. version. coroutines. replaceAll(" [._-]" , " " )
84
83
85
84
def jarTask = project. tasks. jar as Jar
86
85
tabooTask. configure { TabooLibMainTask task ->
@@ -98,7 +97,10 @@ class TabooLibPlugin implements Plugin<Project> {
98
97
}
99
98
if (! tabooExt. version. isSkipKotlinRelocate()) {
100
99
task. relocations[' kotlin.' ] = ' kotlin' + kotlinVersion + ' .'
101
- task. relocations[' kotlinx.coroutines.' ] = ' kotlinx.coroutines' + coroutinesVersion + ' .'
100
+ if (tabooExt. version. coroutines != null ) {
101
+ def coroutinesVersion = tabooExt. version. coroutines. replaceAll(" [._-]" , " " )
102
+ task. relocations[' kotlinx.coroutines.' ] = ' kotlinx.coroutines' + coroutinesVersion + ' .'
103
+ }
102
104
}
103
105
}
104
106
}
Original file line number Diff line number Diff line change @@ -24,14 +24,16 @@ class BuilderVelocity extends Builder {
24
24
def con = description. con. contributors. collect { it. name }
25
25
writeList(info, con, ' authors' )
26
26
// dependencies
27
- def dependencies = new JsonArray ()
28
- description. dep. dependencies. forEach(dep -> {
29
- def dependency = new JsonObject ()
30
- dependency. addProperty(' id' , dep. name)
31
- dependency. addProperty(' optional' , dep. optional)
32
- dependencies. add(dependency)
33
- })
34
- info. add(' dependencies' , dependencies)
27
+ if (description. dep. dependencies. size() > 0 ) {
28
+ def dependencies = new JsonArray ()
29
+ description. dep. dependencies. findAll { it. with == null || it. with. equalsIgnoreCase(' velocity' ) }. each { dep ->
30
+ def dependency = new JsonObject ()
31
+ dependency. addProperty(' id' , dep. name)
32
+ dependency. addProperty(' optional' , dep. optional)
33
+ dependencies. add(dependency)
34
+ }
35
+ info. add(' dependencies' , dependencies)
36
+ }
35
37
return bytes(info)
36
38
}
37
39
}
You can’t perform that action at this time.
0 commit comments