Skip to content

Commit

Permalink
Merge pull request #12 from nafg/scala-2.13
Browse files Browse the repository at this point in the history
build.sbt: add scala 2.13
  • Loading branch information
nafg authored Dec 16, 2019
2 parents 59ad5d7 + 9f7369e commit db7a8ee
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ jdk:

language: scala

script: "sbt evicted test"
script: "sbt +evicted +test"

deploy:
provider: script
script: sbt publish
script: sbt +publish
on:
tags: true
2 changes: 1 addition & 1 deletion asterisk/src/main/scala/simpleivr/asterisk/Ami.scala
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Ami(settings: AmiSettings)
val startTime = System.currentTimeMillis()
println(s"Executing call for $scriptAndArgs at ${Instant.now}")
var chan: Option[AsteriskChannel] = None
import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._
originateToApplicationAsync(
s"SIP/${settings.peer}/1$dest",
"Agi",
Expand Down
24 changes: 12 additions & 12 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ThisBuild / scalaVersion := "2.12.10"
ThisBuild / crossScalaVersions := Seq("2.12.10", "2.13.1")
ThisBuild / scalaVersion := (ThisBuild / crossScalaVersions).value.last
ThisBuild / organization := "io.github.nafg.simpleivr"

def ScalaTest = "org.scalatest" %% "scalatest" % "3.1.0"
Expand All @@ -8,22 +9,20 @@ ThisBuild / scalacOptions ++= Seq(
"-feature",
"-unchecked",
"-explaintypes",
"-Xfuture",
"-Xlint",
"-Yno-adapted-args",
"-Ypartial-unification",
"-Xlint:_",
"-Ywarn-dead-code",
"-Ywarn-extra-implicit",
"-Ywarn-inaccessible",
"-Ywarn-infer-any",
"-Ywarn-nullary-override",
"-Ywarn-nullary-unit",
"-Ywarn-numeric-widen",
"-Ywarn-unused-import",
"-Ywarn-unused",
"-Ywarn-unused:_",
"-Ywarn-value-discard"
)

ThisBuild / scalacOptions ++=
(if (scalaVersion.value.startsWith("2.12."))
List("-language:higherKinds", "-Xfuture", "-Ypartial-unification")
else
Nil)

lazy val core = project
.settings(
name := "simpleivr-core",
Expand All @@ -46,7 +45,8 @@ lazy val asterisk = project
.dependsOn(core)
.settings(
name := "simpleivr-asterisk",
libraryDependencies += "org.asteriskjava" % "asterisk-java" % "2.0.2"
libraryDependencies += "org.asteriskjava" % "asterisk-java" % "2.0.2",
libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.1.3"
)

skip in publish := true
2 changes: 0 additions & 2 deletions core/src/main/scala/simpleivr/IvrCommand.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ package simpleivr

import java.io.File

import scala.language.higherKinds

import cats.Functor
import cats.effect.IO
import cats.free.Free
Expand Down

0 comments on commit db7a8ee

Please sign in to comment.