diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-20 22:09:38 -0400 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-27 19:56:13 -0400 |
| commit | bba2abe7ee38b8903822a07578c46466923d13ed (patch) | |
| tree | a357fb8def6f58a9ea9a37411f3f5640dcb525fe /plugins | |
| parent | d2f8cade709b7d55a93e18592b6e38247d648ca9 (diff) | |
| download | cbt-bba2abe7ee38b8903822a07578c46466923d13ed.tar.gz cbt-bba2abe7ee38b8903822a07578c46466923d13ed.tar.bz2 cbt-bba2abe7ee38b8903822a07578c46466923d13ed.zip | |
start modularizing cbt into libraries
this extracts certain parts of cbt into stand-alone libraries, which can
be published to maven and used outside of cbt.
This also adds scalariform for these parts of the code.
This slows down cbt’s own build a lot because of the number of projects
involved! So we’ll follow this by a bunch of performance tweak commits.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/proguard/Proguard.scala | 2 | ||||
| -rw-r--r-- | plugins/uber-jar/src/UberJar.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/proguard/Proguard.scala b/plugins/proguard/Proguard.scala index 486d969..f229e66 100644 --- a/plugins/proguard/Proguard.scala +++ b/plugins/proguard/Proguard.scala @@ -24,7 +24,7 @@ object ProGuard { context.logger, transientCache, context.classLoaderCache ).bindOne( MavenDependency(groupId, artifactId, version) - ).runMain(cbt.proguard.ProGuard.mainClass, args: _*).integer, + ).runMain(cbt.proguard.ProGuard.mainClass, args).integer, ClassPath(_), context.logger.log("proguard",_) ) diff --git a/plugins/uber-jar/src/UberJar.scala b/plugins/uber-jar/src/UberJar.scala index f330f83..856b69a 100644 --- a/plugins/uber-jar/src/UberJar.scala +++ b/plugins/uber-jar/src/UberJar.scala @@ -41,7 +41,7 @@ class UberJarLib(lib: cbt.Lib, log: String => Unit) { val uberJar = lib.createJar(jarFile, dirs :+ extracted, mainClass=mainClass) log("Writing uber jar - DONE") - extracted.deleteRecursive + lib.deleteRecursive( extracted ) System.err.println(lib.green("Creating uber jar - DONE")) |