From 81048333ef680de6985a6da7154836087d249953 Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Tue, 27 Sep 2016 18:00:01 +0300 Subject: [PATCH] IDEA-160175 Error importing Scala project from Gradle 3.0 --- .../gradle/model/scala/ScalaCompileOptions.java | 12 ++++++++++++ .../tooling/builder/ScalaModelBuilderImpl.groovy | 8 ++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/scala/ScalaCompileOptions.java b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/scala/ScalaCompileOptions.java index 4e8746c51c40..713da904e62a 100644 --- a/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/scala/ScalaCompileOptions.java +++ b/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/scala/ScalaCompileOptions.java @@ -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 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(); diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ScalaModelBuilderImpl.groovy b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ScalaModelBuilderImpl.groovy index b32238b92af7..8ab7e46a5cd7 100644 --- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ScalaModelBuilderImpl.groovy +++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ScalaModelBuilderImpl.groovy @@ -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 }