diff options
author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2017-02-13 10:39:40 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-13 10:39:40 -0500 |
commit | e0fb6ec75286c695b7e4c5ed9189714d40f9b672 (patch) | |
tree | 3cf36e22305cc1da608667cfef85afcf682cc21a /compatibility | |
parent | 0a295c21d3379117e661fdbf586ecb6222c3602b (diff) | |
parent | d1cbc1efffd5c2a6511f1ccca43ccfb37a7f1af8 (diff) | |
download | cbt-e0fb6ec75286c695b7e4c5ed9189714d40f9b672.tar.gz cbt-e0fb6ec75286c695b7e4c5ed9189714d40f9b672.tar.bz2 cbt-e0fb6ec75286c695b7e4c5ed9189714d40f9b672.zip |
Merge pull request #303 from cvogt/nested-builds
Add support for nested builds and use it to replace cross compilation command which was previously hard-coded
Diffstat (limited to 'compatibility')
-rw-r--r-- | compatibility/BuildInterface.java | 8 | ||||
-rw-r--r-- | compatibility/Dependency.java | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/compatibility/BuildInterface.java b/compatibility/BuildInterface.java index f061832..ebcfb99 100644 --- a/compatibility/BuildInterface.java +++ b/compatibility/BuildInterface.java @@ -2,9 +2,11 @@ package cbt; import java.io.*; public abstract class BuildInterface implements Dependency{ - public abstract BuildInterface copy(Context context); // needed to configure builds - public abstract String scalaVersion(); // needed to propagate scalaVersion to dependent builds - public abstract String[] crossScalaVersionsArray(); // FIXME: this probably can't use Scala classes public abstract BuildInterface finalBuild(); // needed to propagage through build builds. Maybe we can get rid of this. public abstract File[] triggerLoopFilesArray(); // needed for watching files across composed builds + + // deprecated methods, which clients are still allowed to implement, but not required + public abstract BuildInterface copy(Context context); + public abstract String scalaVersion(); + public abstract String[] crossScalaVersionsArray(); } diff --git a/compatibility/Dependency.java b/compatibility/Dependency.java index 1f719c2..e23faa6 100644 --- a/compatibility/Dependency.java +++ b/compatibility/Dependency.java @@ -13,11 +13,12 @@ public interface Dependency{ // methods that exist for longer which every CBT version in use should have by now, no default values needed public abstract String show(); public abstract Dependency[] dependenciesArray(); - public abstract File[] dependencyClasspathArray(); public abstract File[] exportedClasspathArray(); // deprecated methods @java.lang.Deprecated public abstract boolean needsUpdateCompat(); + @java.lang.Deprecated + public abstract File[] dependencyClasspathArray(); } |