502647092/TabooLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	gradle/wrapper/gradle-wrapper.properties
This commit is contained in:
坏黑 2019-07-11 16:18:06 +08:00
commit d4ddb7efda
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -34,10 +34,14 @@ dependencies {
shadow group: 'com.zaxxer', name: 'HikariCP', version: '3.1.0' shadow group: 'com.zaxxer', name: 'HikariCP', version: '3.1.0'
shadow group: 'org.scala-lang', name: 'scala-library', version: '2.12.8' shadow group: 'org.scala-lang', name: 'scala-library', version: '2.12.8'
shadow group: 'me.clip', name: 'placeholderapi', version: '2.8.4' 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']) shadow fileTree(dir: 'libs', includes: ['*.jar'])
} }
shadowJar { shadowJar {
// 免得 MANIFEST.MF 里面刷一堆 lib 难看
taskActions.removeIf { it.actionClassName.contains 'configureShadowTask' }
// 免得 MANIFEST.MF 里面刷一堆 lib 难看 // 免得 MANIFEST.MF 里面刷一堆 lib 难看
taskActions.removeIf { it.actionClassName.contains 'configureShadowTask' } taskActions.removeIf { it.actionClassName.contains 'configureShadowTask' }

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,4 +1,4 @@
#Wed Jul 10 21:21:15 CST 2019 #Wed Jul 10 22:34:36 CST 2019
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

1
src/main/scala/io/izzel/taboolib/TabooLib.java
View File

@ -29,6 +29,7 @@ import java.util.concurrent.Executors;
@Dependency(type = Dependency.Type.LIBRARY, maven = "org.slf4j:slf4j-api:1.7.25", url = "https://skymc.oss-cn-shanghai.aliyuncs.com/libs/org.slf4j-slf4j-api-1.7.25.jar") @Dependency(type = Dependency.Type.LIBRARY, maven = "org.slf4j:slf4j-api:1.7.25", url = "https://skymc.oss-cn-shanghai.aliyuncs.com/libs/org.slf4j-slf4j-api-1.7.25.jar")
@Dependency(type = Dependency.Type.LIBRARY, maven = "com.zaxxer:HikariCP:3.1.0", url = "https://skymc.oss-cn-shanghai.aliyuncs.com/libs/com.zaxxer-HikariCP-3.1.0.jar") @Dependency(type = Dependency.Type.LIBRARY, maven = "com.zaxxer:HikariCP:3.1.0", url = "https://skymc.oss-cn-shanghai.aliyuncs.com/libs/com.zaxxer-HikariCP-3.1.0.jar")
@Dependency(type = Dependency.Type.LIBRARY, maven = "org.scala-lang:scala-library:2.12.8", url = "https://skymc.oss-cn-shanghai.aliyuncs.com/libs/scala-library-2.12.8.jar") @Dependency(type = Dependency.Type.LIBRARY, maven = "org.scala-lang:scala-library:2.12.8", url = "https://skymc.oss-cn-shanghai.aliyuncs.com/libs/scala-library-2.12.8.jar")
@Dependency(type = Dependency.Type.LIBRARY, maven = "com.google.inject:guice:4.2.2", url = "https://skymc.oss-cn-shanghai.aliyuncs.com/libs/guice-4.2.2.jar")
public class TabooLib { public class TabooLib {
private static TabooLib inst = new TabooLib(); private static TabooLib inst = new TabooLib();