More compile fixes and upstream mergesa

2019-10-09 16:15:26 -04:00
parent 67b3fa054a
commit da3019ae3d
16 changed files with 191 additions and 159 deletions
--- a/buildSrc/src/main/kotlin/LibsConfig.kt
+++ b/buildSrc/src/main/kotlin/LibsConfig.kt
@ -16,7 +16,6 @@ fun Project.applyLibrariesConfiguration() {
    apply(plugin = "java-base")
    apply(plugin = "maven")
    apply(plugin = "com.github.johnrengelman.shadow")
-    apply(plugin = "com.jfrog.artifactory")

    configurations {
        create("shade")