Skip to content

Bump Scala versions #273

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.

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

Merged
merged 3 commits into from
Mar 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
SCALA: [2.12.11, 2.13.2]
SCALA: [2.12.13, 2.13.5]
steps:
- uses: actions/checkout@v2
- uses: coursier/cache-action@v6
Expand Down
4 changes: 2 additions & 2 deletions project/Settings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ object Settings {
sourceGenerators.in(Compile) += customSourceGenerators.taskValue
)

private val scala212 = "2.12.11"
private val scala213 = "2.13.2"
private val scala212 = "2.12.13"
private val scala213 = "2.13.5"

private lazy val isAtLeastScala213 = Def.setting {
import Ordering.Implicits._
Expand Down
7 changes: 7 additions & 0 deletions tests/src/test/java/plotly/doc/Document.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package plotly.doc;

// Defining these from Java code, so that scalac doesn't give
// those weird looking names under the hood.
public interface Document {
String getElementById(String id);
}
9 changes: 9 additions & 0 deletions tests/src/test/java/plotly/doc/Plotly.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package plotly.doc;

// Defining these from Java code, so that scalac doesn't give
// those weird looking names under the hood.
public interface Plotly {
void newPlot(String div, Object data, Object layout, Object other);
void newPlot(String div, Object data, Object layout);
void newPlot(String div, Object data);
}
4 changes: 2 additions & 2 deletions tests/src/test/scala/plotly/doc/DocumentationTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ object DocumentationTests {
}
}

private class Plotly {
private class Plotly extends plotly.doc.Plotly {

var dataOpt = Option.empty[Object]
var layoutOpt = Option.empty[Object]
Expand Down Expand Up @@ -111,7 +111,7 @@ object DocumentationTests {
}
}

private object Document {
private object Document extends plotly.doc.Document {
// stub...
def getElementById(id: String): String = id
}
Expand Down