diff --git a/build.gradle b/build.gradle index 9fd132e9d..51a8521a8 100644 --- a/build.gradle +++ b/build.gradle @@ -41,6 +41,18 @@ // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. } +repositories { + maven { + name = "squiddev" + url = "https://dl.bintray.com/squiddev/maven" + } +} + +configurations { + shade + compile.extendsFrom shade +} + dependencies { // you may put jars on which you depend on in ./libs // or you may define them like so.. @@ -63,6 +75,11 @@ // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html // http://www.gradle.org/docs/current/userguide/dependency_management.html + shade 'org.squiddev:Cobalt:0.3.0' +} + +jar { + from configurations.shade.collect { it.isDirectory() ? it : zipTree(it) } } jar { diff --git a/deploy.sh b/deploy.sh index 0ce941a6f..c2f1ecf97 100755 --- a/deploy.sh +++ b/deploy.sh @@ -35,12 +35,4 @@ zip -r $OUTPUTJAR api/src/dan200/computercraft > /dev/null cd .. rm -rf deploy/api -echo "Adding LuaJ to deployment..." -mkdir deploy/luaj -cd deploy/luaj -jar xf ../../libs/luaj-jse-2.0.3.jar -zip -r ../$OUTPUTJAR org > /dev/null -cd ../.. -rm -rf deploy/luaj - echo "Done."