From 8a483d095f13e2b765cfbd14349ea9948c858099 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 24 Sep 2019 12:49:53 +0200 Subject: [PATCH] [jOOQ/jOOQ#8870] Support Scala 2.13 --- .../.gitignore | 0 .../LICENSE.txt | 0 .../NOTICE.txt | 0 .../javadoc/readme.txt | 0 {jOOQ-scala_2.12 => jOOQ-scala_2.13}/pom.xml | 8 ++++---- .../src/main/resources/META-INF/LICENSE.txt | 0 .../src/main/resources/META-INF/README.txt | 0 .../org/jooq/scalaextensions/Conversions.scala | 8 ++++---- pom.xml | 18 +++++++++++++++--- 9 files changed, 23 insertions(+), 11 deletions(-) rename {jOOQ-scala_2.12 => jOOQ-scala_2.13}/.gitignore (100%) rename {jOOQ-scala_2.12 => jOOQ-scala_2.13}/LICENSE.txt (100%) rename {jOOQ-scala_2.12 => jOOQ-scala_2.13}/NOTICE.txt (100%) rename {jOOQ-scala_2.12 => jOOQ-scala_2.13}/javadoc/readme.txt (100%) rename {jOOQ-scala_2.12 => jOOQ-scala_2.13}/pom.xml (94%) rename {jOOQ-scala_2.12 => jOOQ-scala_2.13}/src/main/resources/META-INF/LICENSE.txt (100%) rename {jOOQ-scala_2.12 => jOOQ-scala_2.13}/src/main/resources/META-INF/README.txt (100%) rename {jOOQ-scala_2.12 => jOOQ-scala_2.13}/src/main/scala/org/jooq/scalaextensions/Conversions.scala (99%) diff --git a/jOOQ-scala_2.12/.gitignore b/jOOQ-scala_2.13/.gitignore similarity index 100% rename from jOOQ-scala_2.12/.gitignore rename to jOOQ-scala_2.13/.gitignore diff --git a/jOOQ-scala_2.12/LICENSE.txt b/jOOQ-scala_2.13/LICENSE.txt similarity index 100% rename from jOOQ-scala_2.12/LICENSE.txt rename to jOOQ-scala_2.13/LICENSE.txt diff --git a/jOOQ-scala_2.12/NOTICE.txt b/jOOQ-scala_2.13/NOTICE.txt similarity index 100% rename from jOOQ-scala_2.12/NOTICE.txt rename to jOOQ-scala_2.13/NOTICE.txt diff --git a/jOOQ-scala_2.12/javadoc/readme.txt b/jOOQ-scala_2.13/javadoc/readme.txt similarity index 100% rename from jOOQ-scala_2.12/javadoc/readme.txt rename to jOOQ-scala_2.13/javadoc/readme.txt diff --git a/jOOQ-scala_2.12/pom.xml b/jOOQ-scala_2.13/pom.xml similarity index 94% rename from jOOQ-scala_2.12/pom.xml rename to jOOQ-scala_2.13/pom.xml index 5d11e27306..948f8b0bf4 100644 --- a/jOOQ-scala_2.12/pom.xml +++ b/jOOQ-scala_2.13/pom.xml @@ -10,11 +10,11 @@ 3.13.0-SNAPSHOT - jooq-scala_2.12 - jOOQ Scala 2.12 + jooq-scala_2.13 + jOOQ Scala 2.13 - 2.12.9 + 2.13.0 default @@ -157,7 +157,7 @@ ${basedir}/javadoc - org.jooq.scala_2_12 + org.jooq.scala_2_13 diff --git a/jOOQ-scala_2.12/src/main/resources/META-INF/LICENSE.txt b/jOOQ-scala_2.13/src/main/resources/META-INF/LICENSE.txt similarity index 100% rename from jOOQ-scala_2.12/src/main/resources/META-INF/LICENSE.txt rename to jOOQ-scala_2.13/src/main/resources/META-INF/LICENSE.txt diff --git a/jOOQ-scala_2.12/src/main/resources/META-INF/README.txt b/jOOQ-scala_2.13/src/main/resources/META-INF/README.txt similarity index 100% rename from jOOQ-scala_2.12/src/main/resources/META-INF/README.txt rename to jOOQ-scala_2.13/src/main/resources/META-INF/README.txt diff --git a/jOOQ-scala_2.12/src/main/scala/org/jooq/scalaextensions/Conversions.scala b/jOOQ-scala_2.13/src/main/scala/org/jooq/scalaextensions/Conversions.scala similarity index 99% rename from jOOQ-scala_2.12/src/main/scala/org/jooq/scalaextensions/Conversions.scala rename to jOOQ-scala_2.13/src/main/scala/org/jooq/scalaextensions/Conversions.scala index 4763c19787..6dfd8e0d92 100644 --- a/jOOQ-scala_2.12/src/main/scala/org/jooq/scalaextensions/Conversions.scala +++ b/jOOQ-scala_2.13/src/main/scala/org/jooq/scalaextensions/Conversions.scala @@ -44,7 +44,7 @@ import org.jooq.impl._ // Avoid ambiguity with the internal org.jooq.impl.Array type. import scala.Array -import scala.collection.convert.WrapAsScala +import scala.collection.JavaConverters /** * jOOQ type conversions used to enhance the jOOQ Java API with Scala Traits @@ -114,7 +114,7 @@ object Conversions { while (pi.hasNext) { sb += '{' - sb ++= (i toString) + sb ++= (i.toString()) sb += '}' sb ++= pi.next() @@ -172,7 +172,7 @@ object Conversions { def fetchAnyOptionArray () : Option[Array[AnyRef]] = Option(query.fetchAnyArray) def fetchAnyOptionInto[E] (newType : Class[_ <: E]) : Option[E] = Option(query.fetchAnyInto(newType)) def fetchAnyOptionInto[Z <: Record](table : Table[Z]) : Option[Z] = Option(query.fetchAnyInto(table)) - def fetchAnyOptionMap () : Option[Map[String, AnyRef]] = Option(query.fetchAnyMap).map(WrapAsScala.mapAsScalaMap) + def fetchAnyOptionMap () : Option[Map[String, AnyRef]] = Option(query.fetchAnyMap).map((m: java.util.Map[String, AnyRef]) => JavaConverters.asScala(m)) def fetchOneOption () : Option[R] = Option(query.fetchOne) def fetchOneOption[E] (mapper : RecordMapper[_ >: R, E]) : Option[E] = Option(query.fetchOne(mapper)) @@ -188,7 +188,7 @@ object Conversions { def fetchOneOptionArray () : Option[Array[AnyRef]] = Option(query.fetchOneArray) def fetchOneOptionInto[E] (newType : Class[_ <: E]) : Option[E] = Option(query.fetchOneInto(newType)) def fetchOneOptionInto[Z <: Record](table : Table[Z]) : Option[Z] = Option(query.fetchOneInto(table)) - def fetchOneOptionMap () : Option[Map[String, AnyRef]] = Option(query.fetchOneMap).map(WrapAsScala.mapAsScalaMap) + def fetchOneOptionMap () : Option[Map[String, AnyRef]] = Option(query.fetchOneMap).map((m: java.util.Map[String, AnyRef]) => JavaConverters.asScala(m)) } // ------------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3ba3e1f04c..75ed250b61 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ org.jooq - jooq-scala_2.12 + jooq-scala_2.13 ${project.version} @@ -109,6 +109,11 @@ + + + + + @@ -199,6 +204,12 @@ 3.0.8 test + + org.scalatest + scalatest_2.13 + 3.0.8 + test + @@ -348,7 +359,7 @@ net.alchim31.maven scala-maven-plugin - 4.1.1 + 4.2.0 @@ -405,7 +416,8 @@ jOOQ-meta-extensions jOOQ-codegen jOOQ-codegen-maven - jOOQ-scala_2.12 + jOOQ-scala_2.13 +