From b53a0d68d210d5b68741c9c259b4e4b7f044fa6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=9D=8F=E9=BB=91?= <b@skymc.me>
Date: Mon, 16 Aug 2021 22:37:07 +0800
Subject: [PATCH] 1.18

---
 build.gradle                                                | 2 +-
 .../io/izzel/taboolib/gradle/KotlinAnnotationVisitor.groovy | 2 +-
 .../groovy/io/izzel/taboolib/gradle/TabooLibPlugin.groovy   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2a3defd..f99aea5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ plugins {
 apply plugin: 'kotlin'
 
 group 'io.izzel.taboolib'
-version '1.17'
+version '1.18'
 
 configurations {
     embed
diff --git a/src/main/groovy/io/izzel/taboolib/gradle/KotlinAnnotationVisitor.groovy b/src/main/groovy/io/izzel/taboolib/gradle/KotlinAnnotationVisitor.groovy
index c369e0b..a09f580 100644
--- a/src/main/groovy/io/izzel/taboolib/gradle/KotlinAnnotationVisitor.groovy
+++ b/src/main/groovy/io/izzel/taboolib/gradle/KotlinAnnotationVisitor.groovy
@@ -50,6 +50,6 @@ class KotlinAnnotationVisitor extends AnnotationVisitor {
     }
 
     String getKotlinVersionEscape() {
-        return getKotlinVersion().replaceAll("[.-]", "_")
+        return getKotlinVersion().replaceAll("[._-]", "")
     }
 }
diff --git a/src/main/groovy/io/izzel/taboolib/gradle/TabooLibPlugin.groovy b/src/main/groovy/io/izzel/taboolib/gradle/TabooLibPlugin.groovy
index 0cc47c5..6a1ca63 100644
--- a/src/main/groovy/io/izzel/taboolib/gradle/TabooLibPlugin.groovy
+++ b/src/main/groovy/io/izzel/taboolib/gradle/TabooLibPlugin.groovy
@@ -22,7 +22,7 @@ class TabooLibPlugin implements Plugin<Project> {
             project.tasks.jar.configure { Jar task ->
                 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
             tabooTask.configure { RelocateJar task ->
                 task.tabooExt = tabooExt
@@ -31,8 +31,8 @@ class TabooLibPlugin implements Plugin<Project> {
                 task.relocations = tabooExt.relocation
                 task.classifier = tabooExt.classifier
                 task.relocations['taboolib'] = project.group.toString() + '.taboolib'
-                if (!tabooExt.options.contains("skip-kotlin")) {
-                    task.relocations['kotlin'] = 'taboolib.library.kotlin_' + kv
+                if (!tabooExt.options.contains("skip-kotlin") && !tabooExt.options.contains("skip-kotlin-relocate")) {
+                    task.relocations['kotlin'] = 'kotlin' + kv
                 }
             }
         }