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 @@
         <version>3.13.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>jooq-scala_2.12</artifactId>
-    <name>jOOQ Scala 2.12</name>
+    <artifactId>jooq-scala_2.13</artifactId>
+    <name>jOOQ Scala 2.13</name>
 
     <properties>
-        <scala.version>2.12.9</scala.version>
+        <scala.version>2.13.0</scala.version>
         <jdbc-url-postfix>default</jdbc-url-postfix>
     </properties>
 
@@ -157,7 +157,7 @@
                             <classesDirectory>${basedir}/javadoc</classesDirectory>
                             <archive>
                                 <manifestEntries>
-                                    <Automatic-Module-Name>org.jooq.scala_2_12</Automatic-Module-Name>
+                                    <Automatic-Module-Name>org.jooq.scala_2_13</Automatic-Module-Name>
                                 </manifestEntries>
                             </archive>
                         </configuration>
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 @@
             </dependency>
             <dependency>
                 <groupId>org.jooq</groupId>
-                <artifactId>jooq-scala_2.12</artifactId>
+                <artifactId>jooq-scala_2.13</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
@@ -109,6 +109,11 @@
 
 
 
+
+
+
+
+
             <!-- From JDK 9 onwards, the JAXB dependency needs to be made explicit -->
             <!-- The dependency can cause trouble in older JDKs, so it needs to be
                  excluded from pre-java-9 builds: https://github.com/jOOQ/jOOQ/issues/7649 -->
@@ -199,6 +204,12 @@
                 <version>3.0.8</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.scalatest</groupId>
+                <artifactId>scalatest_2.13</artifactId>
+                <version>3.0.8</version>
+                <scope>test</scope>
+            </dependency>
 
             <!-- Some projects will need an H2 database for testing, or to create temporary in-memory databases -->
             <dependency>
@@ -348,7 +359,7 @@
                 <plugin>
                     <groupId>net.alchim31.maven</groupId>
                     <artifactId>scala-maven-plugin</artifactId>
-                    <version>4.1.1</version>
+                    <version>4.2.0</version>
                 </plugin>
 
                 <plugin>
@@ -405,7 +416,8 @@
         <module>jOOQ-meta-extensions</module>
         <module>jOOQ-codegen</module>
         <module>jOOQ-codegen-maven</module>
-        <module>jOOQ-scala_2.12</module>
+        <module>jOOQ-scala_2.13</module>
+