1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
Date: Sun, 12 Nov 2017 21:04:50 +0100
Subject: _scala_zinc
No Zinc Compiler (https://github.com/typesafehub/zinc) in Debian. Zinc depends
on SBT compiler and SBT is not yet in Debian See SBT ITP :
https://bugs.debian.org/639910
Forwarded: not-needed
---
subprojects/language-scala/language-scala.gradle | 4 ++--
.../scala/internal/toolchain/DefaultScalaToolProvider.java | 7 +------
.../org/gradle/api/internal/tasks/scala/ScalaCompilerFactory.java | 6 ++----
.../main/java/org/gradle/api/plugins/scala/ScalaBasePlugin.java | 6 +-----
4 files changed, 6 insertions(+), 17 deletions(-)
--- a/subprojects/language-scala/language-scala.gradle
+++ b/subprojects/language-scala/language-scala.gradle
@@ -7,8 +7,6 @@
compile project(":platformJvm")
compile project(":languageJava")
compile project(":languageJvm")
-
- compileOnly libraries.zinc
}
strictCompile()
@@ -16,3 +14,5 @@
useTestFixtures(project: ":languageJvm", sourceSet: 'testFixtures')
useTestFixtures(project: ":platformBase")
useTestFixtures(project: ":launcher")
+
+sourceSets.main.java { exclude "**/ZincScalaCompiler*.java" }
--- a/subprojects/language-scala/src/main/java/org/gradle/language/scala/internal/toolchain/DefaultScalaToolProvider.java
+++ b/subprojects/language-scala/src/main/java/org/gradle/language/scala/internal/toolchain/DefaultScalaToolProvider.java
@@ -21,7 +21,6 @@
import org.gradle.api.internal.tasks.scala.DaemonScalaCompiler;
import org.gradle.api.internal.tasks.scala.NormalizingScalaCompiler;
import org.gradle.api.internal.tasks.scala.ScalaJavaJointCompileSpec;
-import org.gradle.api.internal.tasks.scala.ZincScalaCompiler;
import org.gradle.language.base.internal.compile.CompileSpec;
import org.gradle.language.base.internal.compile.Compiler;
import org.gradle.platform.base.internal.toolchain.ToolProvider;
@@ -52,11 +51,7 @@
@Override
@SuppressWarnings("unchecked")
public <T extends CompileSpec> org.gradle.language.base.internal.compile.Compiler<T> newCompiler(Class<T> spec) {
- if (ScalaJavaJointCompileSpec.class.isAssignableFrom(spec)) {
- Compiler<ScalaJavaJointCompileSpec> scalaCompiler = new ZincScalaCompiler(resolvedScalaClasspath, resolvedZincClasspath, gradleUserHomeDir);
- return (Compiler<T>) new NormalizingScalaCompiler(new DaemonScalaCompiler<ScalaJavaJointCompileSpec>(daemonWorkingDir, scalaCompiler, workerDaemonFactory, resolvedZincClasspath, fileResolver));
- }
- throw new IllegalArgumentException(String.format("Cannot create Compiler for unsupported CompileSpec type '%s'", spec.getSimpleName()));
+ throw new org.gradle.api.GradleException("Gradle in Debian does not support Zinc compiler.");
}
@Override
--- a/subprojects/scala/src/main/java/org/gradle/api/internal/tasks/scala/ScalaCompilerFactory.java
+++ b/subprojects/scala/src/main/java/org/gradle/api/internal/tasks/scala/ScalaCompilerFactory.java
@@ -49,9 +49,7 @@
Set<File> zincClasspathFiles = zincClasspath.getFiles();
// currently, we leave it to ZincScalaCompiler to also compile the Java code
- Compiler<ScalaJavaJointCompileSpec> scalaCompiler = new DaemonScalaCompiler<ScalaJavaJointCompileSpec>(
- daemonWorkingDir, new ZincScalaCompiler(scalaClasspathFiles, zincClasspathFiles, gradleUserHomeDir),
- workerDaemonFactory, zincClasspathFiles, fileResolver);
- return new NormalizingScalaCompiler(scalaCompiler);
+ Compiler<ScalaJavaJointCompileSpec> scalaCompiler = null;
+ throw new org.gradle.api.GradleException("Gradle in Debian does not support Zinc compiler.");
}
}
--- a/subprojects/scala/src/main/java/org/gradle/api/plugins/scala/ScalaBasePlugin.java
+++ b/subprojects/scala/src/main/java/org/gradle/api/plugins/scala/ScalaBasePlugin.java
@@ -155,11 +155,7 @@
compile.getConventionMapping().map("zincClasspath", new Callable<Configuration>() {
@Override
public Configuration call() throws Exception {
- Configuration config = project.getConfigurations().getAt(ZINC_CONFIGURATION_NAME);
- if (config.getDependencies().isEmpty()) {
- project.getDependencies().add("zinc", "com.typesafe.zinc:zinc:" + DefaultScalaToolProvider.DEFAULT_ZINC_VERSION);
- }
- return config;
+ return null;
}
});
}
|
