Merge remote-tracking branch 'origin/master'

# Conflicts: # gradle/wrapper/gradle-wrapper.properties
2019-07-11 16:18:06 +08:00
parent 577f384fd3 ebce2efd54
commit d4ddb7efda
3 changed files with 6 additions and 1 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -34,10 +34,14 @@ dependencies {
    shadow group: 'com.zaxxer', name: 'HikariCP', version: '3.1.0'
    shadow group: 'org.scala-lang', name: 'scala-library', version: '2.12.8'
    shadow group: 'me.clip', name: 'placeholderapi', version: '2.8.4'
+    shadow group: 'com.google.inject', name: 'guice', version: '4.2.2'
    shadow fileTree(dir: 'libs', includes: ['*.jar'])
 }

 shadowJar {
+
+    // 免得 MANIFEST.MF 里面刷一堆 lib 难看
+    taskActions.removeIf { it.actionClassName.contains 'configureShadowTask' }
    
    // 免得 MANIFEST.MF 里面刷一堆 lib 难看
    taskActions.removeIf { it.actionClassName.contains 'configureShadowTask' }