Skip to content

Commit 1c41bc4

Browse files
committed
Upgrade Scala 2.12 to 2.13
1 parent 55147d9 commit 1c41bc4

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

pom.xml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Wisconsin-Madison.</license.copyrightOwners>
9595
<!-- NB: Deploy releases to the SciJava Maven repository. -->
9696
<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>
9797

98-
<scala.version>2.12.17</scala.version>
98+
<scala.version>2.13.10</scala.version>
9999
</properties>
100100

101101
<dependencies>
@@ -110,6 +110,21 @@ Wisconsin-Madison.</license.copyrightOwners>
110110
<groupId>org.scala-lang</groupId>
111111
<artifactId>scala-compiler</artifactId>
112112
<version>${scala.version}</version>
113+
<exclusions>
114+
<exclusion>
115+
<!-- To avoid error:
116+
[ERROR] Rule 3: org.apache.maven.plugins.enforcer.BanDuplicateClasses failed with message:
117+
No Duplicate Classes Allowed!
118+
- For duplicate transitive dependencies, add dependency exclusions.
119+
- For duplications between direct dependencies, resolve or add
120+
ignored classes to this rule's configuration.
121+
Found in:
122+
io.github.java-diff-utils:java-diff-utils:jar:4.12:compile
123+
org.scala-lang:scala-compiler:jar:2.13.10:compile -->
124+
<groupId>io.github.java-diff-utils</groupId>
125+
<artifactId>java-diff-utils</artifactId>
126+
</exclusion>
127+
</exclusions>
113128
</dependency>
114129

115130
<!-- Test dependencies -->

src/main/java/org/scijava/plugins/scripting/scala/ScalaScriptLanguage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import scala.tools.nsc.ConsoleWriter;
4646
import scala.tools.nsc.NewLinePrintWriter;
4747
import scala.tools.nsc.Settings;
48-
import scala.tools.nsc.interpreter.Scripted;
48+
import scala.tools.nsc.interpreter.shell.Scripted;
4949

5050
/**
5151
* An adapter of the Scala interpreter to the SciJava scripting interface.

0 commit comments

Comments
 (0)