Skip to content

Commit 275e4ac

Browse files
committed
Upgrade components
1 parent 7bfa71e commit 275e4ac

File tree

6 files changed

+26
-15
lines changed

6 files changed

+26
-15
lines changed

build.sbt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,17 @@ dependencyUpgradeModuleNames := Map(
1919

2020
dependencyUpgradeComponentSorter := ComponentSorter.ByAlphabetically
2121

22+
lazy val utf8: String = "UTF-8"
23+
lazy val javaVersion: String = "1.8"
24+
25+
Compile / compile / javacOptions ++= Seq(
26+
"-source", javaVersion, "-target", javaVersion, "-encoding", utf8, "-deprecation"
27+
)
28+
29+
Compile / doc / javacOptions ++= Seq(
30+
"-linksource", "-source", javaVersion, "-docencoding", utf8, "-charset", utf8, "-encoding", utf8, "-nodeprecated"
31+
)
32+
2233
releasePublishArtifactsAction := PgpKeys.publishSigned.value
2334

2435
releaseCrossBuild := true

project/Dependencies.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ object Dependencies extends AutoPlugin {
1010

1111
object Versions {
1212
val config = "1.4.0"
13-
val grpcCore = "1.29.0"
14-
val grpcStub = "1.29.0"
13+
val grpcCore = "1.32.2"
14+
val grpcStub = "1.32.2"
1515
val guava = "23.0"
1616
val guice = "4.2.3"
1717
val guiceMultibindings = "4.2.3"
18-
val protobufJava = "3.12.1"
19-
val scala = "2.13.2"
18+
val protobufJava = "3.13.0"
19+
val scala = "2.13.3"
2020
val scala212 = "2.12.10"
2121
val scalaI18n = "1.0.8"
2222
val scalaLogging = "3.9.2"
23-
val scalatest = "3.1.2"
24-
val scalikejdbc = "3.4.2"
25-
val undertow = "2.1.1.Final"
23+
val scalatest = "3.2.2"
24+
val scalikejdbc = "3.5.0"
25+
val undertow = "2.2.2.Final"
2626
}
2727

2828
object Compiles {

src/test/scala/org/jmotor/concurrent/ExecutorLookupSpec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package org.jmotor.concurrent
22

33
import com.typesafe.config.ConfigFactory
4-
import org.scalatest.FunSuite
4+
import org.scalatest.funsuite.AnyFunSuite
55

66
/**
77
*
88
* @author AI
99
* 2020/1/11
1010
*/
11-
class ExecutorLookupSpec extends FunSuite {
11+
class ExecutorLookupSpec extends AnyFunSuite {
1212

1313
test("lookup by partition") {
1414
val name = "repositories-dispatcher"

src/test/scala/org/jmotor/http/RoutesSpec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package org.jmotor.http
33
import com.google.inject.Guice
44
import org.jmotor.guice.AbstractModuleSupport
55
import org.jmotor.http.router.{ ArgumentRouter, PatternRouter, PingRouter }
6-
import org.scalatest.FunSuite
6+
import org.scalatest.funsuite.AnyFunSuite
77

88
/**
99
* Component:
@@ -12,7 +12,7 @@ import org.scalatest.FunSuite
1212
*
1313
* @author AI
1414
*/
15-
class RoutesSpec extends FunSuite {
15+
class RoutesSpec extends AnyFunSuite {
1616

1717
test("load handlers") {
1818
val injector = Guice.createInjector(new AbstractModuleSupport {

src/test/scala/org/jmotor/utils/ObjectsSpec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.jmotor.utils
22

3-
import org.scalatest.FunSuite
3+
import org.scalatest.funsuite.AnyFunSuite
44

55
/**
66
* Component:
@@ -9,7 +9,7 @@ import org.scalatest.FunSuite
99
*
1010
* @author AI
1111
*/
12-
class ObjectsSpec extends FunSuite {
12+
class ObjectsSpec extends AnyFunSuite {
1313

1414
test("Get properties") {
1515
val properties = Objects.properties(Foo("bar", "foo"))

src/test/scala/org/jmotor/utils/StringsSpec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.jmotor.utils
22

3-
import org.scalatest.FunSuite
3+
import org.scalatest.funsuite.AnyFunSuite
44

55
/**
66
* Component:
@@ -9,7 +9,7 @@ import org.scalatest.FunSuite
99
*
1010
* @author AI
1111
*/
12-
class StringsSpec extends FunSuite {
12+
class StringsSpec extends AnyFunSuite {
1313

1414
test("Avoid blank") {
1515
assert(Strings.avoidBlank(Option(" ")).isEmpty)

0 commit comments

Comments
 (0)