MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-160175 Error importing Scala project from Gradle 3.0

Browse Source
This commit is contained in:
Vladislav.Soroka
2016-09-27 18:01:36 +03:00
parent bc62a61c96
commit 81048333ef
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/scala/ScalaCompileOptions.java
+12
View File
@@ -23,8 +23,14 @@ import java.util.List;
* @since 1/31/14
*/
public interface ScalaCompileOptions extends Serializable {
/**
* @deprecated see https://docs.gradle.org/3.0/release-notes#ant-based-scala-compiler-has-been-removed
*/
boolean isUseCompileDaemon();
/**
* @deprecated see https://docs.gradle.org/3.0/release-notes#ant-based-scala-compiler-has-been-removed
*/
String getDaemonServer();
boolean isFailOnError();
@@ -49,8 +55,14 @@ public interface ScalaCompileOptions extends Serializable {
List<String> getLoggingPhases();
/**
* @deprecated see https://docs.gradle.org/3.0/release-notes#ant-based-scala-compiler-has-been-removed
*/
boolean isFork();
/**
* @deprecated see https://docs.gradle.org/3.0/release-notes#ant-based-scala-compiler-has-been-removed
*/
boolean isUseAnt();
ScalaForkOptions getForkOptions();
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ScalaModelBuilderImpl.groovy
+4 -4
View File
@@ -92,13 +92,13 @@ class ScalaModelBuilderImpl implements ModelBuilderService {
ScalaCompileOptionsImpl result = new ScalaCompileOptionsImpl()
result.additionalParameters = wrapStringList(options.additionalParameters)
result.daemonServer = options.daemonServer
result.daemonServer = options.hasProperty('daemonServer') ? options.daemonServer : null
result.debugLevel = options.debugLevel
result.deprecation = options.deprecation
result.encoding = options.encoding
result.failOnError = options.failOnError
result.force = String.valueOf(options.force)
result.fork = options.fork
result.fork = options.hasProperty('fork') ? options.fork : false
result.forkOptions = create(options.forkOptions)
result.listFiles = options.listFiles
result.loggingLevel = options.loggingLevel
@@ -106,8 +106,8 @@ class ScalaModelBuilderImpl implements ModelBuilderService {
result.loggingPhases = wrapStringList(options.loggingPhases)
result.optimize = options.optimize
result.unchecked = options.unchecked
result.useAnt = options.useAnt
result.useCompileDaemon = options.useCompileDaemon
result.useAnt = options.hasProperty('useAnt') ? options.useAnt : false
result.useCompileDaemon = options.hasProperty('useCompileDaemon') ? options.useCompileDaemon : false
return result
}