Cross compile with Scala 2.13.0.

lomigmegard · Jun 12, 2019 · 128b1ce · 128b1ce
1 parent fff2692
commit 128b1ce
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,4 +6,4 @@ jdk:
 scala:
   - 2.11.12
   - 2.12.8
-  - 2.13.0-RC3
+  - 2.13.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,8 @@
 
 ## unreleased
 
-  - Update akka-http to 10.1.8.
+  - Cross compile with Scala 2.13.0.
+  - Update akka-http to 10.1.8. 
 
 ## 0.4.0 (2019-03-09)
 

diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ lazy val commonSettings = Seq(
   organization := "ch.megard",
   version := "0.4.1-SNAPSHOT",
   scalaVersion := "2.12.8",
-  crossScalaVersions := Seq(scalaVersion.value, "2.11.12", "2.13.0-RC3"),
+  crossScalaVersions := Seq(scalaVersion.value, "2.11.12", "2.13.0"),
   scalacOptions ++= Seq(
     "-unchecked",
     "-deprecation",
@@ -79,7 +79,7 @@ lazy val `akka-http-cors` = project
     libraryDependencies += "com.typesafe.akka" %% "akka-stream"         % akkaVersion      % Provided,
     libraryDependencies += "com.typesafe.akka" %% "akka-http-testkit"   % akkaHttpVersion  % Test,
     libraryDependencies += "com.typesafe.akka" %% "akka-stream-testkit" % akkaVersion      % Test,
-    libraryDependencies += "org.scalatest"     %% "scalatest"           % "3.0.8-RC5"      % Test,
+    libraryDependencies += "org.scalatest"     %% "scalatest"           % "3.0.8"          % Test,
   )
 
 lazy val `akka-http-cors-example` = project
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,4 +6,4 @@ jdk: @@
     scala:
       - 2.11.12
       - 2.12.8
-      - 2.13.0-RC3
+      - 2.13.0