Update Intellij setting and Scala version 2.13

build.sbt

@@ -19,10 +19,10 @@ name := "org.adempiere.jetty"
 lazy val commonSettings = Seq(
   organization := "org.adempiere.net",
   version := "3.9.0-SNAPSHOT",
-  scalaVersion := "2.12.10"
+  scalaVersion := "2.13.1"
 )
 
-scalaVersion := "2.12.10"
+scalaVersion := "2.13.1"
 resolvers += "Artima Maven Repository" at "http://repo.artima.com/releases"
 
 fork := true
@@ -32,13 +32,11 @@ javaOptions in Test := Seq (adempiereProperties)
 
 libraryDependencies ++= Seq(
   "javax.servlet" % "javax.servlet-api" % "3.0.1" % "provided",
-  "com.typesafe" % "config" % "1.2.0",
-  "org.scala-lang" % "scala-reflect" % "2.12.8",
-  "org.scalactic" %% "scalactic" % "3.0.5",
-  "org.scalatest" %% "scalatest" % "3.0.5" % "test"
+  "org.scala-lang" % "scala-reflect" % "2.13.1",
+  "org.scalactic" %% "scalactic" % "3.1.0",
+  "org.scalatest" %% "scalatest" % "3.1.0" % "test"
 )
 
-
 //Documentation here ~compile https://github.com/earldouglas/xsbt-web-plugin/blob/master/docs/2.0.md
 //execute with sbt ~jetty:start
 javaOptions in Jetty ++= Seq(

org.adempiere.test/build.sbt

@@ -21,7 +21,7 @@ name := "org.adempiere.test"
 
 //organization := "e-Evolution"
 //version := "0.1.0-SNAPSHOT"
-scalaVersion := "2.12.8"
+scalaVersion := "2.13.1"
 
 resolvers += "Artima Maven Repository" at "http://repo.artima.com/releases"
 
@@ -31,7 +31,9 @@ val adempiereProperties = "-DPropertyFile=/Users/e-Evolution/AdempierePG.propert
 javaOptions in Test := Seq (adempiereProperties)
 
 libraryDependencies ++= Seq(
-  "org.scalatest" %% "scalatest" % "3.0.5"
+  "org.scala-lang" % "scala-reflect" % "2.13.1",
+  "org.scalactic" %% "scalactic" % "3.1.0",
+  "org.scalatest" %% "scalatest" % "3.1.0" % "test"
 )
 
 //Documentation here ~compilehttps://github.com/earldouglas/xsbt-web-plugin/blob/master/docs/2.0.md
@@ -50,7 +52,7 @@ assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeSca
 lazy val commonSettings = Seq(
   version := "0.1-SNAPSHOT",
   organization := "org.eevolution",
-  scalaVersion := "2.12.8"
+  scalaVersion := "2.13.1"
 )
 
 

org.adempiere.test/project/build.properties

@@ -1,2 +1 @@
-sbt.version=1.1.4
-
+sbt.version=1.3.2

org.adempiere.test/project/plugins.sbt

@@ -1,5 +1,5 @@
 import _root_.sbt._
 
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")
-addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "1.0.1")
-addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "4.0.1")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
+addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.5.0")
+addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "4.1.0")

org.adempiere.test/src/main/scala/org/eevolution/dsl/builder/DistributionOrderBuilder.scala

@@ -86,9 +86,9 @@ object DistributionOrderBuilder {
 
 
       val order = new DistributionOrder(context, 0, trxName)
-      order.setAD_Org_ID(organization.get getAD_Org_ID())
+      order.setAD_Org_ID(organization.get.getAD_Org_ID())
       order.setBPartner(partner.get)
-      order.setM_Warehouse_ID(warehouse.get getM_Warehouse_ID)
+      order.setM_Warehouse_ID(warehouse.get.getM_Warehouse_ID)
       if (X_C_DocType.DOCBASETYPE_DistributionOrder== baseDocumentType.get)
       {
         val documentTypeId = MDocType.getDocType(baseDocumentType.get,organization.get.getAD_Org_ID)

org.adempiere.test/src/main/scala/org/eevolution/dsl/builder/OrderBuilder.scala

@@ -95,10 +95,10 @@ object OrderBuilder {
 
 
       val order = new Order(context, 0, trxName)
-      order.setAD_Org_ID(organization.get getAD_Org_ID())
+      order.setAD_Org_ID(organization.get.getAD_Org_ID())
       order.setBPartner(partner.get)
-      order.setM_PriceList_ID(priceList.get getM_PriceList_ID)
-      order.setM_Warehouse_ID(warehouse.get getM_Warehouse_ID)
+      order.setM_PriceList_ID(priceList.get.getM_PriceList_ID)
+      order.setM_Warehouse_ID(warehouse.get.getM_Warehouse_ID)
       if (X_C_DocType.DOCBASETYPE_SalesOrder == baseDocumentType.get)
       {
         val documentTypeId = MDocType.getDocTypeBaseOnSubType(organization.get.getAD_Org_ID, baseDocumentType.get , subTypeDocument.getOrElse(X_C_DocType.DOCSUBTYPESO_StandardOrder))

org.adempiere.test/src/main/scala/org/eevolution/services/PaymentService.scala

@@ -16,11 +16,10 @@
 
 package org.eevolution.services
 
-import java.util.{ArrayList, List}
 
 import org.compiere.model._
 import org.eevolution.dsl._
-import scala.collection.JavaConversions._
+import scala.jdk.CollectionConverters._
 
 /**
  *  Payment Service
@@ -33,7 +32,7 @@ trait PaymentService {
     whereClause.append(I_C_Payment.COLUMNNAME_C_Order_ID).append("=?")
     val payments = new Query(order.getCtx(), I_C_Payment.Table_Name, whereClause.toString(), order.get_TrxName())
       .setClient_ID().setParameters(order.get_ID().asInstanceOf[Object])
-      .list().toList
+      .list().asScala.toList
     payments
   }
 }

project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.8

project/plugins.sbt

@@ -1,6 +1,5 @@
 import _root_.sbt._
 
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")
-resolvers += Resolver.url("bintray-sbt-plugins", url("http://dl.bintray.com/sbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns)
-addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "1.0.1")
-addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "4.0.1")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
+addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.5.0")
+addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "4.1.0")