scala 3

nemoo · Mar 8, 2024 · 2418e6c · 2418e6c
1 parent edba315
commit 2418e6c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/app/models/Project.scala b/app/models/Project.scala
@@ -64,8 +64,7 @@ class ProjectRepo @Inject()(taskRepo: TaskRepo)(protected val dbConfigProvider:
     def id = column[Long]("id", O.AutoInc, O.PrimaryKey)
     def name = column[String]("name")
 
-    def * = (id, name) <> (Project.tupled, Project.unapply)
-    def ? = (id.?, name.?).shaped.<>({ r => import r._; _1.map(_ => Project.tupled((_1.get, _2.get))) }, (_: Any) => throw new Exception("Inserting into ? projection not supported."))
+    def * = (id, name) <> ((Project.apply _).tupled, Project.unapply)
 
   }
 }
diff --git a/app/models/Task.scala b/app/models/Task.scala
@@ -29,7 +29,7 @@ class TaskRepo @Inject()(protected val dbConfigProvider: DatabaseConfigProvider)
   import dbConfig.profile.api._
   private[models] val Tasks = TableQuery[TasksTable]
 
-  implicit val taskStatusColumnType = MappedColumnType.base[TaskStatus.Value, String](
+  implicit val taskStatusColumnType: BaseColumnType[TaskStatus.Value] = MappedColumnType.base[TaskStatus.Value, String](
     _.toString, string => TaskStatus.withName(string))
 
   def findById(id: Long): Future[Task] =
@@ -73,8 +73,7 @@ class TaskRepo @Inject()(protected val dbConfigProvider: DatabaseConfigProvider)
     def status = column[TaskStatus.Value]("status")
     def project = column[Long]("project")
 
-    def * = (id, color, status, project) <> (Task.tupled, Task.unapply)
-    def ? = (id.?, color.?, status.?, project.?).shaped.<>({ r => import r._; _1.map(_ => Task.tupled((_1.get, _2.get, _3.get, _4.get))) }, (_: Any) => throw new Exception("Inserting into ? projection not supported."))
+    def * = (id, color, status, project) <> ((Task.apply _).tupled, Task.unapply)
   }
 
 }
diff --git a/build.sbt b/build.sbt
@@ -8,7 +8,7 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
 
-scalaVersion := "2.13.12"
+scalaVersion := "3.3.3"
 
 routesGenerator := InjectedRoutesGenerator
 
@@ -30,7 +30,6 @@ libraryDependencies += "org.playframework.silhouette" %% "play-silhouette-passwo
 libraryDependencies += "org.playframework.silhouette" %% "play-silhouette-persistence" % "10.0.0"
 libraryDependencies += "org.playframework.silhouette" %% "play-silhouette-crypto-jca" % "10.0.0"
 libraryDependencies += "net.codingwell" %% "scala-guice" % "6.0.0"
-libraryDependencies += "com.iheart" %% "ficus" % "1.4.7"
 
 ThisBuild / libraryDependencySchemes ++= Seq(
     "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always