mirror of
https://github.com/digital-asset/daml.git
synced 2024-09-20 01:07:18 +03:00
Port //daml-script/... to Scala 2.13 (#8831)
* Port //daml-script/... to Scala 2.13 changelog_begin changelog_end * fmt changelog_begin changelog_end
This commit is contained in:
parent
0b937ed3e5
commit
2558843bc5
@ -183,12 +183,12 @@ jobs:
|
||||
//ledger/... \
|
||||
//ledger-service/... \
|
||||
//triggers/... \
|
||||
//daml-script/... \
|
||||
-//ledger-service/http-json:tests \
|
||||
-//ledger-service/http-json:integration-tests \
|
||||
-//ledger-service/http-json:failure-tests \
|
||||
-//ledger-service/http-json-perf/... \
|
||||
-//ledger-service/http-json-testing/... \
|
||||
//daml-script/dump/... \
|
||||
-//language-support/scala/examples/... \
|
||||
-//language-support/scala/codegen-sample-app/... \
|
||||
-//ledger/ledger-api-test-tool/... \
|
||||
@ -201,7 +201,7 @@ jobs:
|
||||
//ledger-api/... \
|
||||
//ledger/... \
|
||||
//ledger-service/... \
|
||||
//daml-script/dump/... \
|
||||
//daml-script/... \
|
||||
//triggers/... \
|
||||
-//libs-scala/gatling-utils/... \
|
||||
-//language-support/scala/examples/... \
|
||||
|
@ -109,6 +109,13 @@ EOF
|
||||
da_scala_library(
|
||||
name = "test-utils",
|
||||
srcs = glob(["src/test-utils/**/*.scala"]),
|
||||
scala_deps = [
|
||||
"@maven//:com_typesafe_akka_akka_stream",
|
||||
"@maven//:io_spray_spray_json",
|
||||
"@maven//:org_scalactic_scalactic",
|
||||
"@maven//:org_scalatest_scalatest",
|
||||
"@maven//:org_scalaz_scalaz_core",
|
||||
],
|
||||
deps = [
|
||||
"//bazel_tools/runfiles:scala_runfiles",
|
||||
"//daml-lf/archive:daml_lf_archive_reader",
|
||||
@ -141,11 +148,6 @@ da_scala_library(
|
||||
"//libs-scala/ports",
|
||||
"//libs-scala/resources",
|
||||
"@maven//:com_auth0_java_jwt",
|
||||
"@maven//:com_typesafe_akka_akka_stream_2_12",
|
||||
"@maven//:io_spray_spray_json_2_12",
|
||||
"@maven//:org_scalactic_scalactic_2_12",
|
||||
"@maven//:org_scalatest_scalatest_2_12",
|
||||
"@maven//:org_scalaz_scalaz_core_2_12",
|
||||
],
|
||||
)
|
||||
|
||||
@ -159,6 +161,12 @@ da_scala_test_suite(
|
||||
"//ledger/test-common/test-certificates",
|
||||
],
|
||||
resources = glob(["src/main/resources/**/*"]),
|
||||
scala_deps = [
|
||||
"@maven//:com_typesafe_akka_akka_http_core",
|
||||
"@maven//:com_typesafe_akka_akka_stream",
|
||||
"@maven//:io_spray_spray_json",
|
||||
"@maven//:org_scalaz_scalaz_core",
|
||||
],
|
||||
deps = [
|
||||
":test-utils",
|
||||
"//bazel_tools/runfiles:scala_runfiles",
|
||||
@ -196,10 +204,6 @@ da_scala_test_suite(
|
||||
"//libs-scala/resources-akka",
|
||||
"//libs-scala/resources-grpc",
|
||||
"@maven//:com_auth0_java_jwt",
|
||||
"@maven//:com_typesafe_akka_akka_http_core_2_12",
|
||||
"@maven//:com_typesafe_akka_akka_stream_2_12",
|
||||
"@maven//:io_spray_spray_json_2_12",
|
||||
"@maven//:org_scalaz_scalaz_core_2_12",
|
||||
],
|
||||
)
|
||||
|
||||
|
@ -9,7 +9,6 @@ import com.daml.bazeltools.BazelRunfiles._
|
||||
import com.daml.ledger.api.testing.utils.SuiteResourceManagementAroundAll
|
||||
import com.daml.lf.data.Ref._
|
||||
import com.daml.lf.speedy.SValue._
|
||||
import org.scalatest._
|
||||
import org.scalatest.matchers.should.Matchers
|
||||
import org.scalatest.wordspec.AsyncWordSpec
|
||||
import spray.json.{JsObject, JsString}
|
||||
|
@ -5,7 +5,6 @@ package com.daml.lf.engine.script.test
|
||||
|
||||
import com.daml.ledger.api.auth.AuthServiceJWTPayload
|
||||
import com.daml.lf.data.Ref
|
||||
import org.scalatest._
|
||||
import org.scalatest.matchers.should.Matchers
|
||||
import org.scalatest.wordspec.AnyWordSpec
|
||||
import com.daml.lf.engine.script.JsonLedgerClient
|
||||
|
@ -10,7 +10,6 @@ import com.daml.ledger.api.testing.utils.SuiteResourceManagementAroundAll
|
||||
import com.daml.lf.data.FrontStack
|
||||
import com.daml.lf.data.Ref._
|
||||
import com.daml.lf.speedy.SValue._
|
||||
import org.scalatest._
|
||||
import org.scalatest.matchers.should.Matchers
|
||||
import org.scalatest.wordspec.AsyncWordSpec
|
||||
|
||||
|
@ -10,7 +10,6 @@ import com.daml.ledger.api.testing.utils.SuiteResourceManagementAroundAll
|
||||
import com.daml.ledger.api.tls.TlsConfiguration
|
||||
import com.daml.lf.data.Ref._
|
||||
import com.daml.lf.engine.script.ScriptTimeMode
|
||||
import org.scalatest._
|
||||
import org.scalatest.matchers.should.Matchers
|
||||
import org.scalatest.wordspec.AsyncWordSpec
|
||||
|
||||
|
@ -9,7 +9,6 @@ import com.daml.lf.data.{FrontStack, FrontStackCons, Numeric}
|
||||
import com.daml.lf.engine.script.RunnerConfig
|
||||
import com.daml.lf.speedy.SValue
|
||||
import com.daml.lf.speedy.SValue._
|
||||
import org.scalatest._
|
||||
import org.scalatest.matchers.should.Matchers
|
||||
import org.scalatest.wordspec.AsyncWordSpec
|
||||
import spray.json.{JsNumber, JsObject, JsString}
|
||||
|
@ -11,7 +11,7 @@ import scala.collection.mutable.ArrayBuffer
|
||||
// Custom log collector to test order of trace statements
|
||||
object LogCollector {
|
||||
val events = new ArrayBuffer[ILoggingEvent]
|
||||
def clear(): Unit = events.clear
|
||||
def clear(): Unit = events.clear()
|
||||
}
|
||||
|
||||
final class LogCollector extends AppenderBase[ILoggingEvent] {
|
||||
|
Loading…
Reference in New Issue
Block a user