Skip to content

Commit 36c9cb3

Browse files
author
ntwigg
committed
Fixes classloader stuff surprisingly...
1 parent bfe1849 commit 36c9cb3

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

src/main/java/com/diffplug/webtools/node/SetupCleanup.java renamed to src/main/java/com/diffplug/webtools/SetupCleanup.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.diffplug.webtools.node;
16+
package com.diffplug.webtools;
1717

1818
import java.io.ByteArrayInputStream;
1919
import java.io.ByteArrayOutputStream;

src/main/java/com/diffplug/webtools/flywayjooq/SetupCleanupDockerFlyway.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.diffplug.common.base.Errors;
2020
import com.diffplug.common.base.Throwables;
2121
import com.diffplug.common.base.Throwing;
22-
import com.diffplug.webtools.node.SetupCleanup;
22+
import com.diffplug.webtools.SetupCleanup;
2323
import com.google.common.collect.ImmutableList;
2424
import com.google.common.io.ByteStreams;
2525
import com.google.common.io.Files;

src/main/java/com/diffplug/webtools/node/NodePlugin.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.gradle.api.tasks.TaskAction;
3333
import org.gradle.api.tasks.TaskProvider;
3434
import org.gradle.work.DisableCachingByDefault;
35+
import webtools.Env;
3536

3637
/**
3738
* Installs a specific version of node.js and npm,
@@ -49,6 +50,14 @@ public Extension(Project project) {
4950
this.project = Objects.requireNonNull(project);
5051
}
5152

53+
public boolean envIsHerokuBuild() {
54+
return Env.isHerokuBuild();
55+
}
56+
57+
public boolean envIsGitHubAction() {
58+
return Env.isGitHubAction();
59+
}
60+
5261
public TaskProvider<?> npm_run(String name, Action<NpmRunTask> taskConfig) {
5362
return project.getTasks().register("npm_run_" + name.replace(':', '-'), NpmRunTask.class, task -> {
5463
task.npmTaskName = name;

src/main/java/com/diffplug/webtools/node/SetupCleanupNode.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package com.diffplug.webtools.node;
1717

1818
import com.diffplug.common.swt.os.OS;
19+
import com.diffplug.webtools.SetupCleanup;
1920
import com.github.eirslett.maven.plugins.frontend.lib.FrontendPluginFactory;
2021
import com.github.eirslett.maven.plugins.frontend.lib.InstallationException;
2122
import com.github.eirslett.maven.plugins.frontend.lib.ProxyConfig;

0 commit comments

Comments
 (0)