From 828adac48d0e08766d192c7ce01021083cfc4d67 Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Sun, 12 Mar 2017 22:00:00 -0400 Subject: fix file watching for real last file watching update didn’t work well enough. This now - rips out barbary watch service as it seems buggy crashing the jvm - make cbt exclusively write files to watch to a file - uses fswatch instead watching all files in that file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- compatibility/BuildInterface.java | 5 ++++- compatibility/Context.java | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'compatibility') diff --git a/compatibility/BuildInterface.java b/compatibility/BuildInterface.java index eb60960..d6d11db 100644 --- a/compatibility/BuildInterface.java +++ b/compatibility/BuildInterface.java @@ -6,7 +6,10 @@ public interface BuildInterface extends Dependency{ public default BuildInterface finalBuild(File current){ return finalBuild(); // legacy forwarder } - public abstract File[] triggerLoopFilesArray(); // needed for watching files across composed builds + @Deprecated + public default File[] triggerLoopFilesArray(){ + return new File[0]; + }; // deprecated methods, which clients are still allowed to implement, but not required public abstract BuildInterface finalBuild(); // needed to propagage through build builds. Maybe we can get rid of this. diff --git a/compatibility/Context.java b/compatibility/Context.java index 1657ef0..f0fa42c 100644 --- a/compatibility/Context.java +++ b/compatibility/Context.java @@ -21,6 +21,9 @@ public interface Context{ public default File workingDirectory(){ return projectDirectory(); }; + public default boolean loop(){ + return false; + }; // methods that exist for longer which every CBT version in use should have by now, no default values needed public abstract File cwd(); // REPLACE by something that allows to run cbt on some other directly @@ -32,9 +35,6 @@ public interface Context{ public abstract File cbtRootHome(); // REMOVE public abstract File compatibilityTarget(); // maybe replace this with search in the classloader for it? public abstract BuildInterface parentBuildOrNull(); - public default File[] triggerLoopFilesArray(){ - return new File[0]; // REMOVE default value on next compatibility breaking release - } // deprecated methods @java.lang.Deprecated -- cgit v1.2.3