eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 08:14:09 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix IDEA plugin build

Browse Source
This commit is contained in:
Alexey Andreev 2018-11-20 15:21:55 +03:00
parent 7588962212
commit c7e7e3b3f0
4 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tools/idea/jps-common/src/main/java/org/teavm/idea/jps/util/ExceptionUtil.java
View File

@ -1,32 +0,0 @@
/*
* Copyright 2017 Alexey Andreev.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.teavm.idea.jps.util;
import java.io.PrintWriter;
import java.io.StringWriter;
public final class ExceptionUtil {
private ExceptionUtil() {
}
public static String exceptionToString(Throwable e) {
StringWriter writer = new StringWriter();
PrintWriter output = new PrintWriter(writer);
e.printStackTrace(output);
output.close();
return writer.toString();
}
}

4
tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java
View File

@ -81,9 +81,9 @@ public class TeaVMBuilder extends TargetBuilder<BuildRootDescriptor, TeaVMBuildT
build.perform(target.getModule(), target);
} catch (BuildException e) {
context.processMessage(CompilerMessage.createInternalBuilderError("TeaVM", e.getCause()));
context.processMessage(new CompilerMessage("TeaVM", e.getCause()));
} catch (Exception e) {
context.processMessage(CompilerMessage.createInternalBuilderError("TeaVM", e));
context.processMessage(new CompilerMessage("TeaVM", e));
}
}

2
tools/idea/jps-common/src/main/java/org/teavm/idea/jps/util/DaemonUtil.java → tools/idea/plugin/src/main/java/org/teavm/idea/DaemonUtil.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.teavm.idea.jps.util;
package org.teavm.idea;
import com.intellij.ide.plugins.IdeaPluginDescriptor;
import com.intellij.ide.plugins.PluginManager;

1
tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMDaemonComponent.java
View File

@ -22,7 +22,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jetbrains.annotations.NotNull;
import org.teavm.idea.jps.model.TeaVMJpsWorkspaceConfiguration;
import org.teavm.idea.jps.util.DaemonUtil;
import org.teavm.tooling.daemon.BuildDaemon;
import org.teavm.tooling.daemon.DaemonInfo;
import org.teavm.tooling.daemon.DaemonLog;