Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Scala to 2.12.18 #277

Merged
merged 7 commits into from
Nov 4, 2023
Merged

Update Scala to 2.12.18 #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e38d05e
Update Scala to 2.12.18
lefou Nov 3, 2023
9d9faea
Vendored com.twitter.util.Eval as-is
lefou Nov 3, 2023
a8fa070
Version bumps
lefou Nov 3, 2023
e152eab
Slightly refactored Eval to make it work
lefou Nov 3, 2023
c1ea8a1
Renamed package
lefou Nov 3, 2023
f5135c1
Cleanup
lefou Nov 3, 2023
21e6cee
Dependency cleanup
lefou Nov 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions polyglot-scala/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@
<name>Polyglot :: Scala</name>

<properties>
<!-- We cannot use 2.12+, as Maven 3.x requires us to run on Java7 -->
<scala.version>2.11.12</scala.version>
<scala.bin.version>2.11</scala.bin.version>
<scala.version>2.12.18</scala.version>
<scala.bin.version>2.12</scala.bin.version>
</properties>

<contributors>
Expand All @@ -45,10 +44,16 @@

<dependency>
<groupId>com.twitter</groupId>
<artifactId>util-eval_${scala.bin.version}</artifactId>
<artifactId>util-core_${scala.bin.version}</artifactId>
<version>6.43.0</version>
</dependency>

<dependency>
<groupId>org.scala-lang.modules</groupId>
<artifactId>scala-xml_${scala.bin.version}</artifactId>
<version>1.0.6</version>
</dependency>

<dependency>
<groupId>com.googlecode.kiama</groupId>
<artifactId>kiama_${scala.bin.version}</artifactId>
Expand Down Expand Up @@ -98,7 +103,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>4.8.0</version>
<version>4.8.1</version>
<executions>
<execution>
<goals>
Expand Down
8 changes: 4 additions & 4 deletions polyglot-scala/src/it/java-and-scala-project-MavenModel/pom.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@ Model(
name = "Test for Java + Scala compilation",
description = "Test for Java + Scala compilation",
dependencies = Seq(
"org.scala-lang" % "scala-library" % "2.12.15"
"org.scala-lang" % "scala-library" % "2.12.18"
),
build = Build(
pluginManagement = PluginManagement(
plugins = Seq(
Plugin(
"net.alchim31.maven" % "scala-maven-plugin" % "4.3.1"
"net.alchim31.maven" % "scala-maven-plugin" % "4.8.1"
),
Plugin(
"org.apache.maven.plugins" % "maven-compiler-plugin" % "2.0.2"
"org.apache.maven.plugins" % "maven-compiler-plugin" % "3.11.0"
)
)
),
plugins = Seq(
Plugin(
"net.alchim31.maven" % "scala-maven-plugin" % "4.3.1",
"net.alchim31.maven" % "scala-maven-plugin" % "4.8.1",
executions = Seq(
Execution(
id = "scala-compile-first",
Expand Down
4 changes: 2 additions & 2 deletions polyglot-scala/src/main/scala/org/sonatype/maven/polyglot/scala/ScalaModelReader.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import scala.collection.immutable
import scala.language.implicitConversions

import com.twitter.io.StreamIO
import com.twitter.util.Eval
import org.sonatype.maven.polyglot.scala.eval.Eval

import java.io._
import java.util
Expand Down Expand Up @@ -260,7 +260,7 @@ class ScalaModelReader @Inject() (executeManager: ExecuteManager) extends ModelR
try {
eval.apply[ScalaModel](sourcePomFile)
} catch {
case e: eval.CompilerException =>
case e: Eval.CompilerException =>
// ModuleParseException is able to provide exact position (line nr., column nr.), so if later
// versions of CompilerException make those information available, we should map them here (instead of zeros).
// Currently, the information is only available as text in the exeception message.
Expand Down
Loading