Skip to content

Commit 983073a

Browse files
Merge pull request #273 from alexarchambault/bump-scala
Bump Scala versions
2 parents 827efef + 147ee2f commit 983073a

File tree

5 files changed

+21
-5
lines changed

5 files changed

+21
-5
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
SCALA: [2.12.11, 2.13.2]
16+
SCALA: [2.12.13, 2.13.5]
1717
steps:
1818
- uses: actions/checkout@v2
1919
- uses: coursier/cache-action@v6

project/Settings.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ object Settings {
8787
sourceGenerators.in(Compile) += customSourceGenerators.taskValue
8888
)
8989

90-
private val scala212 = "2.12.11"
91-
private val scala213 = "2.13.2"
90+
private val scala212 = "2.12.13"
91+
private val scala213 = "2.13.5"
9292

9393
private lazy val isAtLeastScala213 = Def.setting {
9494
import Ordering.Implicits._
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package plotly.doc;
2+
3+
// Defining these from Java code, so that scalac doesn't give
4+
// those weird looking names under the hood.
5+
public interface Document {
6+
String getElementById(String id);
7+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package plotly.doc;
2+
3+
// Defining these from Java code, so that scalac doesn't give
4+
// those weird looking names under the hood.
5+
public interface Plotly {
6+
void newPlot(String div, Object data, Object layout, Object other);
7+
void newPlot(String div, Object data, Object layout);
8+
void newPlot(String div, Object data);
9+
}

tests/src/test/scala/plotly/doc/DocumentationTests.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ object DocumentationTests {
6363
}
6464
}
6565

66-
private class Plotly {
66+
private class Plotly extends plotly.doc.Plotly {
6767

6868
var dataOpt = Option.empty[Object]
6969
var layoutOpt = Option.empty[Object]
@@ -111,7 +111,7 @@ object DocumentationTests {
111111
}
112112
}
113113

114-
private object Document {
114+
private object Document extends plotly.doc.Document {
115115
// stub...
116116
def getElementById(id: String): String = id
117117
}

0 commit comments

Comments
 (0)