Skip to content

Commit 5bebe6a

Browse files
authored
Merge pull request #225 from Atry/scala-2.13-wip
Build for Scala 2.13
2 parents a2ea4ca + 735bfd4 commit 5bebe6a

File tree

42 files changed

+296
-4730
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+296
-4730
lines changed

.travis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ addons:
1010
language: scala
1111

1212
scala:
13-
- 2.10.7
14-
- 2.11.12
15-
- 2.12.10
13+
- 2.13.1
1614

1715
jdk:
1816
- oraclejdk8

Binding/build.sbt.shared

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
organization := "com.thoughtworks.binding"
2-
3-
name := "Binding"
4-
51
description := "Reactive data-binding for Scala. This artifact is available for both Scala.js and JVM."
62

7-
libraryDependencies += "com.thoughtworks.extractor" %%% "extractor" % "2.1.2"
8-
93
libraryDependencies += "com.thoughtworks.enableIf" %% "enableif" % "1.1.7"
104

115
libraryDependencies += "com.thoughtworks.sde" %%% "core" % "3.3.2"
@@ -14,11 +8,6 @@ libraryDependencies += "org.scalatest" %%% "scalatest" % "3.1.0" % Test
148

159
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value
1610

17-
// Enable SAM type
18-
scalacOptions += "-Xexperimental"
19-
20-
libraryDependencies += "org.typelevel" %% "macro-compat" % "1.1.1"
21-
2211
libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value % Provided
2312

24-
addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full)
13+
scalacOptions += "-Ymacro-annotations"

0 commit comments

Comments
 (0)