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

1.18

This commit is contained in:
坏黑 2021-08-16 22:37:07 +08:00
parent ec7038c311
commit b53a0d68d2
3 changed files with 5 additions and 5 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.17' version '1.18'
configurations { configurations {
embed embed

2
src/main/groovy/io/izzel/taboolib/gradle/KotlinAnnotationVisitor.groovy
View File

@ -50,6 +50,6 @@ class KotlinAnnotationVisitor extends AnnotationVisitor {
} }
String getKotlinVersionEscape() { String getKotlinVersionEscape() {
return getKotlinVersion().replaceAll("[.-]", "_") return getKotlinVersion().replaceAll("[._-]", "")
} }
} }

6
src/main/groovy/io/izzel/taboolib/gradle/TabooLibPlugin.groovy
View File

@ -22,7 +22,7 @@ class TabooLibPlugin implements Plugin<Project> {
project.tasks.jar.configure { Jar task -> project.tasks.jar.configure { Jar task ->
task.from(taboo.collect { it.isDirectory() ? it : project.zipTree(it) }) task.from(taboo.collect { it.isDirectory() ? it : project.zipTree(it) })
} }
def kv = project.plugins.findPlugin("org.jetbrains.kotlin.jvm").kotlinPluginVersion.replaceAll("[.-]", "_") def kv = project.plugins.findPlugin("org.jetbrains.kotlin.jvm").kotlinPluginVersion.replaceAll("[._-]", "")
def jarTask = project.tasks.jar as Jar def jarTask = project.tasks.jar as Jar
tabooTask.configure { RelocateJar task -> tabooTask.configure { RelocateJar task ->
task.tabooExt = tabooExt task.tabooExt = tabooExt
@ -31,8 +31,8 @@ class TabooLibPlugin implements Plugin<Project> {
task.relocations = tabooExt.relocation task.relocations = tabooExt.relocation
task.classifier = tabooExt.classifier task.classifier = tabooExt.classifier
task.relocations['taboolib'] = project.group.toString() + '.taboolib' task.relocations['taboolib'] = project.group.toString() + '.taboolib'
if (!tabooExt.options.contains("skip-kotlin")) { if (!tabooExt.options.contains("skip-kotlin") && !tabooExt.options.contains("skip-kotlin-relocate")) {
task.relocations['kotlin'] = 'taboolib.library.kotlin_' + kv task.relocations['kotlin'] = 'kotlin' + kv
} }
} }
} }