Merge pull request #12 from zaneli/feature/update-libs

update lib versions, bump version to 0.3.0

Author: zaneli

.github/workflows/ci.yml

@@ -7,16 +7,16 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.14, 2.13.6, 3.0.1-RC2]
+        scala: [2.12.18, 2.13.12, 3.3.1]
         java: [11]
     runs-on: ${{ matrix.os }}
     env:
       TZ: Asia/Tokyo
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
           distribution: adopt

README.md

@@ -16,8 +16,8 @@ Library for using [Amazon Athena](https://aws.amazon.com/athena/) JDBC Driver wi
 - Add library dependencies to sbt build settings
 ```scala
 libraryDependencies ++= Seq(
-  "org.scalikejdbc" %% "scalikejdbc" % "3.4.0",
-  "com.zaneli" %% "scalikejdbc-athena" % "0.2.4"
+  "org.scalikejdbc" %% "scalikejdbc" % "4.0.0",
+  "com.zaneli" %% "scalikejdbc-athena" % "0.3.0"
 )
 ```
 

build.sbt

@@ -2,22 +2,22 @@ organization := "com.zaneli"
 
 name := "scalikejdbc-athena"
 
-version := "0.2.4"
+version := "0.3.0"
 
-val Scala212 = "2.12.14"
+val Scala212 = "2.12.18"
 
 scalaVersion := Scala212
 
-crossScalaVersions := Seq(Scala212, "2.13.6", "3.0.1-RC2")
+crossScalaVersions := Seq(Scala212, "2.13.12", "3.3.1")
 
-val scalikejdbcVersion = "4.0.0-RC1"
+val scalikejdbcVersion = "4.0.0"
 
 libraryDependencies ++= Seq(
   "org.scalikejdbc" %% "scalikejdbc" % scalikejdbcVersion % Provided,
-  "com.typesafe" % "config" % "1.4.0" % Provided,
-  "org.scalatest" %% "scalatest-funspec" % "3.2.9" % Test,
+  "com.typesafe" % "config" % "1.4.2" % Provided,
+  "org.scalatest" %% "scalatest-funspec" % "3.2.17" % Test,
   "org.scalikejdbc" %% "scalikejdbc-syntax-support-macro" % scalikejdbcVersion % Test,
-  "com.h2database" % "h2" % "1.4.200" % Test
+  "com.h2database" % "h2" % "2.2.224" % Test
 )
 
 publishTo := sonatypePublishTo.value

project/build.properties

@@ -1 +1 @@
-sbt.version=1.5.3
+sbt.version=1.9.3

project/plugins.sbt

@@ -1,2 +1,2 @@
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7")
-addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21")
+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")

src/test/scala/scalikejdbc/athena/UsingOtherDBSpec.scala

@@ -13,13 +13,13 @@ class UsingOtherDBSpec extends AnyFunSpec with BeforeAndAfter {
 
   before {
     NamedDB(User.connectionPoolName).athena { implicit s =>
-      sql"""create table user (id int, name varchar(10), created_at timestamp)""".execute.apply()
+      sql"""create table users (id int, name varchar(10), created_at timestamp)""".execute.apply()
     }
   }
 
   after {
     NamedDB(User.connectionPoolName).athena { implicit s =>
-      sql"""drop table user""".execute.apply()
+      sql"""drop table users""".execute.apply()
     }
   }
 
@@ -33,10 +33,10 @@ class UsingOtherDBSpec extends AnyFunSpec with BeforeAndAfter {
       val results = NamedDB(User.connectionPoolName).athena { implicit s =>
 
         val params = sqls.csv(users.map(u => sqls"(${u.id}, ${u.name}, ${u.createdAt})"): _*)
-        val count = sql"""insert into user values $params""".executeUpdate.apply()
+        val count = sql"""insert into users values $params""".executeUpdate.apply()
         assert(count === users.size)
 
-        sql"""select id, name, created_at from user order by id""".map(r => User(r.int("id"), r.string("name"), r.zonedDateTime("created_at"))).list.apply()
+        sql"""select id, name, created_at from users order by id""".map(r => User(r.int("id"), r.string("name"), r.zonedDateTime("created_at"))).list.apply()
       }
       assert(users === results)
     }
@@ -57,6 +57,7 @@ class UsingOtherDBSpec extends AnyFunSpec with BeforeAndAfter {
   case class User(id: Long, name: String, createdAt: ZonedDateTime)
   object User extends SQLSyntaxSupport[User] {
     override lazy val connectionPoolName = "h2"
+    override lazy val tableName = "users"
     override lazy val columnNames = Seq("id", "name", "created_at")
     def apply(n: ResultName[User])(rs: WrappedResultSet): User = autoConstruct(rs, n)
   }