From 33349bcb710386de8e2ea3c3b679529642d4ed0d Mon Sep 17 00:00:00 2001 From: sky Date: Tue, 22 Dec 2020 15:57:14 +0800 Subject: [PATCH] 1.3 --- .gitignore | 3 +++ build.gradle | 2 +- .../groovy/io/izzel/taboolib/gradle/TabooLibExtension.groovy | 2 ++ .../groovy/io/izzel/taboolib/gradle/TabooLibPlugin.groovy | 4 +++- 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e0d53d8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.gradle +.idea +build diff --git a/build.gradle b/build.gradle index ba20b3a..418c021 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { } group 'io.izzel.taboolib' -version '1.2' +version '1.3' configurations { embed diff --git a/src/main/groovy/io/izzel/taboolib/gradle/TabooLibExtension.groovy b/src/main/groovy/io/izzel/taboolib/gradle/TabooLibExtension.groovy index b1a7e00..e4fecdf 100644 --- a/src/main/groovy/io/izzel/taboolib/gradle/TabooLibExtension.groovy +++ b/src/main/groovy/io/izzel/taboolib/gradle/TabooLibExtension.groovy @@ -11,6 +11,8 @@ class TabooLibExtension { String classifier = 'all' + boolean builtin = true + Map relocation = new LinkedHashMap<>() def relocate(String pre, String post) { diff --git a/src/main/groovy/io/izzel/taboolib/gradle/TabooLibPlugin.groovy b/src/main/groovy/io/izzel/taboolib/gradle/TabooLibPlugin.groovy index 98c6d71..a2537ec 100644 --- a/src/main/groovy/io/izzel/taboolib/gradle/TabooLibPlugin.groovy +++ b/src/main/groovy/io/izzel/taboolib/gradle/TabooLibPlugin.groovy @@ -17,7 +17,9 @@ class TabooLibPlugin implements Plugin { project.afterEvaluate { project.configurations.compileClasspath.extendsFrom(taboo) project.configurations.compileClasspath.dependencies.add(project.dependencies.create("io.izzel.taboolib:TabooLib:${tabooExt.tabooLibVersion}:all")) - taboo.dependencies.add(project.dependencies.create("io.izzel.taboolib:TabooLibLoader:${tabooExt.loaderVersion}:all")) + if (tabooExt.builtin) { + taboo.dependencies.add(project.dependencies.create("io.izzel.taboolib:TabooLibLoader:${tabooExt.loaderVersion}:all")) + } def shadowPresent = project.plugins.hasPlugin('com.github.johnrengelman.shadow') if (!shadowPresent) {