update for fsesl
This commit is contained in:
parent
cb716b005b
commit
c76ab27d8e
@ -17,7 +17,7 @@ object Dependencies {
|
|||||||
val akkaHttpVersion = "10.2.7"
|
val akkaHttpVersion = "10.2.7"
|
||||||
val gson = "2.8.9"
|
val gson = "2.8.9"
|
||||||
val jackson = "2.13.0"
|
val jackson = "2.13.0"
|
||||||
val logback = "1.2.7"
|
val logback = "1.2.10"
|
||||||
val quicklens = "1.7.5"
|
val quicklens = "1.7.5"
|
||||||
val spray = "1.3.6"
|
val spray = "1.3.6"
|
||||||
|
|
||||||
@ -29,7 +29,7 @@ object Dependencies {
|
|||||||
val bbbCommons = "0.0.21-SNAPSHOT"
|
val bbbCommons = "0.0.21-SNAPSHOT"
|
||||||
|
|
||||||
// Test
|
// Test
|
||||||
val scalaTest = "3.0.5"
|
val scalaTest = "3.2.11"
|
||||||
val mockito = "2.23.0"
|
val mockito = "2.23.0"
|
||||||
val akkaTestKit = "2.6.0"
|
val akkaTestKit = "2.6.0"
|
||||||
}
|
}
|
||||||
|
@ -27,6 +27,8 @@ val compileSettings = Seq(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
scalaVersion := "2.13.4"
|
||||||
|
|
||||||
resolvers += Resolver.sonatypeRepo("releases")
|
resolvers += Resolver.sonatypeRepo("releases")
|
||||||
|
|
||||||
publishTo := Some(Resolver.file("file", new File(Path.userHome.absolutePath+"/dev/repo/maven-repo/releases" )) )
|
publishTo := Some(Resolver.file("file", new File(Path.userHome.absolutePath+"/dev/repo/maven-repo/releases" )) )
|
||||||
@ -47,6 +49,7 @@ lazy val bbbFseslAkka = (project in file(".")).settings(name := "bbb-fsesl-akka"
|
|||||||
// Config file is in ./.scalariform.conf
|
// Config file is in ./.scalariform.conf
|
||||||
scalariformAutoformat := true
|
scalariformAutoformat := true
|
||||||
|
|
||||||
|
|
||||||
//-----------
|
//-----------
|
||||||
// Packaging
|
// Packaging
|
||||||
//
|
//
|
||||||
|
@ -7,9 +7,9 @@ object Dependencies {
|
|||||||
|
|
||||||
object Versions {
|
object Versions {
|
||||||
// Scala
|
// Scala
|
||||||
val scala = "2.12.15"
|
val scala = "2.13.4"
|
||||||
val junitInterface = "0.11"
|
val junitInterface = "0.11"
|
||||||
val scalactic = "3.0.3"
|
val scalactic = "3.0.8"
|
||||||
|
|
||||||
// Libraries
|
// Libraries
|
||||||
val akkaVersion = "2.6.17"
|
val akkaVersion = "2.6.17"
|
||||||
@ -21,12 +21,12 @@ object Dependencies {
|
|||||||
val codec = "1.15"
|
val codec = "1.15"
|
||||||
|
|
||||||
// BigBlueButton
|
// BigBlueButton
|
||||||
val bbbCommons = "0.0.20-SNAPSHOT"
|
val bbbCommons = "0.0.21-SNAPSHOT"
|
||||||
val bbbFsesl = "0.0.7-SNAPSHOT"
|
val bbbFsesl = "0.0.8-SNAPSHOT"
|
||||||
|
|
||||||
// Test
|
// Test
|
||||||
val scalaTest = "3.0.5"
|
val scalaTest = "3.2.11"
|
||||||
val akkaTestKit = "2.5.18"
|
val akkaTestKit = "2.6.0"
|
||||||
val junit = "4.12"
|
val junit = "4.12"
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -34,8 +34,8 @@ object Dependencies {
|
|||||||
val scalaLibrary = "org.scala-lang" % "scala-library" % Versions.scala
|
val scalaLibrary = "org.scala-lang" % "scala-library" % Versions.scala
|
||||||
val scalaCompiler = "org.scala-lang" % "scala-compiler" % Versions.scala
|
val scalaCompiler = "org.scala-lang" % "scala-compiler" % Versions.scala
|
||||||
|
|
||||||
val akkaActor = "com.typesafe.akka" % "akka-actor_2.12" % Versions.akkaVersion
|
val akkaActor = "com.typesafe.akka" % "akka-actor_2.13" % Versions.akkaVersion
|
||||||
val akkaSl4fj = "com.typesafe.akka" % "akka-slf4j_2.12" % Versions.akkaVersion
|
val akkaSl4fj = "com.typesafe.akka" % "akka-slf4j_2.13" % Versions.akkaVersion
|
||||||
val akkaStream = "com.typesafe.akka" %% "akka-stream" % Versions.akkaVersion
|
val akkaStream = "com.typesafe.akka" %% "akka-stream" % Versions.akkaVersion
|
||||||
|
|
||||||
val akkaHttp = "com.typesafe.akka" %% "akka-http" % Versions.akkaHttpVersion
|
val akkaHttp = "com.typesafe.akka" %% "akka-http" % Versions.akkaHttpVersion
|
||||||
@ -46,28 +46,31 @@ object Dependencies {
|
|||||||
|
|
||||||
val apacheLang = "org.apache.commons" % "commons-lang3" % Versions.lang
|
val apacheLang = "org.apache.commons" % "commons-lang3" % Versions.lang
|
||||||
|
|
||||||
val bbbCommons = "org.bigbluebutton" % "bbb-common-message_2.12" % Versions.bbbCommons excludeAll (
|
val bbbCommons = "org.bigbluebutton" % "bbb-common-message_2.13" % Versions.bbbCommons excludeAll (
|
||||||
ExclusionRule(organization = "org.red5"))
|
ExclusionRule(organization = "org.red5"))
|
||||||
val bbbFseslClient = "org.bigbluebutton" % "bbb-fsesl-client" % Versions.bbbFsesl
|
val bbbFseslClient = "org.bigbluebutton" % "bbb-fsesl-client" % Versions.bbbFsesl
|
||||||
}
|
}
|
||||||
|
|
||||||
object Test {
|
object Test {
|
||||||
val scalaTest = "org.scalatest" %% "scalatest" % Versions.scalaTest % "test"
|
val scalaTest = "org.scalatest" %% "scalatest" % Versions.scalaTest % "test"
|
||||||
val junit = "junit" % "junit" % Versions.junit % "test"
|
// val junit = "junit" % "junit" % Versions.junit % "test"
|
||||||
val scalactic = "org.scalactic" % "scalactic_2.12" % Versions.scalactic % "test"
|
val scalactic = "org.scalactic" % "scalactic_2.13" % Versions.scalactic % "test"
|
||||||
val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % Versions.akkaTestKit % "test"
|
val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % Versions.akkaTestKit % "test"
|
||||||
|
|
||||||
// https://mvnrepository.com/artifact/com.typesafe.akka/akka-http-testkit
|
// https://mvnrepository.com/artifact/com.typesafe.akka/akka-http-testkit
|
||||||
val akkaHttpTestkit = "com.typesafe.akka" %% "akka-http-testkit" % "10.1.4" % "test"
|
val akkaHttpTestkit = "com.typesafe.akka" %% "akka-http-testkit" % "10.2.0" % "test"
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
val testing = Seq(
|
val testing = Seq(
|
||||||
Test.scalaTest,
|
Test.scalaTest,
|
||||||
Test.junit,
|
// Test.junit,
|
||||||
Test.scalactic,
|
Test.scalactic,
|
||||||
Test.akkaTestKit,
|
Test.akkaTestKit,
|
||||||
Test.akkaHttpTestkit)
|
Test.akkaHttpTestkit
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
val runtime = Seq(
|
val runtime = Seq(
|
||||||
Compile.scalaLibrary,
|
Compile.scalaLibrary,
|
||||||
|
@ -1 +1 @@
|
|||||||
sbt.version=1.5.5
|
sbt.version=1.6.2
|
@ -37,7 +37,7 @@ object Dependencies {
|
|||||||
val bbbCommons = "0.0.21-SNAPSHOT"
|
val bbbCommons = "0.0.21-SNAPSHOT"
|
||||||
|
|
||||||
// Test
|
// Test
|
||||||
val scalaTest = "3.0.5"
|
val scalaTest = "3.2.11"
|
||||||
}
|
}
|
||||||
|
|
||||||
object Compile {
|
object Compile {
|
||||||
|
@ -2,7 +2,7 @@ import org.bigbluebutton.build._
|
|||||||
|
|
||||||
description := "BigBlueButton custom FS-ESL client built on top of FS-ESL Java library."
|
description := "BigBlueButton custom FS-ESL client built on top of FS-ESL Java library."
|
||||||
|
|
||||||
version := "0.0.7-SNAPSHOT"
|
version := "0.0.8-SNAPSHOT"
|
||||||
|
|
||||||
val compileSettings = Seq(
|
val compileSettings = Seq(
|
||||||
organization := "org.bigbluebutton",
|
organization := "org.bigbluebutton",
|
||||||
@ -52,6 +52,8 @@ crossPaths := false
|
|||||||
// This forbids including Scala related libraries into the dependency
|
// This forbids including Scala related libraries into the dependency
|
||||||
autoScalaLibrary := false
|
autoScalaLibrary := false
|
||||||
|
|
||||||
|
scalaVersion := "2.13.4"
|
||||||
|
|
||||||
publishTo := Some(Resolver.file("file", new File(Path.userHome.absolutePath + "/.m2/repository")))
|
publishTo := Some(Resolver.file("file", new File(Path.userHome.absolutePath + "/.m2/repository")))
|
||||||
|
|
||||||
//publishTo := {
|
//publishTo := {
|
||||||
|
@ -7,11 +7,11 @@ object Dependencies {
|
|||||||
|
|
||||||
object Versions {
|
object Versions {
|
||||||
// Scala
|
// Scala
|
||||||
val scala = "2.12.15"
|
val scala = "2.13.4"
|
||||||
|
|
||||||
// Libraries
|
// Libraries
|
||||||
val netty = "3.2.10.Final"
|
val netty = "3.2.10.Final"
|
||||||
val logback = "1.3.0-alpha10"
|
val logback = "1.2.10"
|
||||||
|
|
||||||
// Test
|
// Test
|
||||||
val junit = "4.12"
|
val junit = "4.12"
|
||||||
|
@ -1 +1 @@
|
|||||||
sbt.version=1.5.5
|
sbt.version=1.6.2
|
Loading…
Reference in New Issue
Block a user