Merge pull request #8 from takezoe/scala3

Support Scala 3
takezoe · Sep 10, 2022 · d01cbe9 · d01cbe9
2 parents e069c7e + cfb1b9e
commit d01cbe9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/build.sbt b/build.sbt
@@ -2,16 +2,14 @@ name := "scala-jdbc"
 
 organization := "com.github.takezoe"
 
-version := "1.0.5"
+version := "1.0.6"
 
 scalaVersion := "2.13.8"
 
-crossScalaVersions := Seq("2.11.12", "2.12.16", "2.13.8")
+crossScalaVersions := Seq("2.11.12", "2.12.16", "2.13.8", "3.2.0")
 
 libraryDependencies ++= Seq(
-  "org.scala-lang" % "scala-reflect"  % scalaVersion.value,
-  "org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided",
-  "org.scalatest" %% "scalatest" % "3.0.8" % "test",
+  "org.scalatest" %% "scalatest" % "3.2.13" % "test",
   "com.h2database" % "h2" % "1.4.192" % "test"
 )
 

diff --git a/src/main/scala/com/github/takezoe/scala/jdbc/package.scala b/src/main/scala/com/github/takezoe/scala/jdbc/package.scala
@@ -2,17 +2,14 @@ package com.github.takezoe.scala
 
 import com.github.takezoe.scala.jdbc.SqlTemplate
 
-import scala.language.experimental.macros
-import scala.reflect.macros.blackbox.Context
-
 import scala.language.implicitConversions
 
 package object jdbc {
 
   /**
    * Implicit conversion to convert a raw string with no parameter to SqlTemplate
    */
-  implicit def String2SqlTemplate(sql: String) = SqlTemplate(sql)
+  implicit def String2SqlTemplate(sql: String): SqlTemplate = SqlTemplate(sql)
 
   /**
    * String interpolation to convert a variable-embedded SQL to SqlTemplate

diff --git a/src/test/scala/com/github/takezoe/scala/jdbc/SqlTemplateSpec.scala b/src/test/scala/com/github/takezoe/scala/jdbc/SqlTemplateSpec.scala
@@ -2,9 +2,9 @@ package com.github.takezoe.scala.jdbc
 
 import java.sql.DriverManager
 
-import org.scalatest.FunSuite
+import org.scalatest.funsuite.AnyFunSuite
 
-class SqlTemplateSpec extends FunSuite {
+class SqlTemplateSpec extends AnyFunSuite {
 
   test("set parameters"){
     val a = Article(0, System.currentTimeMillis, "takezoe", "Database access in Scala")