fixing build issues
continuous-integration/drone/push Build is failing Details

drone-setup
Override-6 2 years ago
parent 4916c0ee3d
commit 6865b91bc5

@ -7,7 +7,7 @@ plugins {
id 'com.github.johnrengelman.shadow' version '7.1.2' //for building optimised jar id 'com.github.johnrengelman.shadow' version '7.1.2' //for building optimised jar
} }
final var scalaVersion = "2.13" final var scalaVersion = "2.13.10"
mainClassName = 'org.tbasket.Main' mainClassName = 'org.tbasket.Main'
group 'org.tbasket' group 'org.tbasket'
@ -24,8 +24,9 @@ shadowJar {
dependencies { dependencies {
implementation project(':API') implementation project(':API')
implementation project(':DB') implementation project(':DB')
implementation 'io.getquill:quill_2.12:3.2.0' implementation 'io.getquill:quill-jdbc_2.13:4.6.0'
implementation 'com.typesafe.play:play-json_2.13:2.10.0-RC7' implementation 'com.typesafe.play:play-json_2.13:2.10.0-RC7'
testImplementation "io.circe:circe-core_$scalaVersion:0.15.0-M1" testImplementation "io.circe:circe-core_$scalaVersion:0.15.0-M1"
testImplementation "io.circe:circe-parser_$scalaVersion:0.15.0-M1" testImplementation "io.circe:circe-parser_$scalaVersion:0.15.0-M1"
@ -61,7 +62,7 @@ allprojects {
implementation 'org.apache.logging.log4j:log4j-core:2.17.2' implementation 'org.apache.logging.log4j:log4j-core:2.17.2'
implementation 'org.apache.logging.log4j:log4j-api:2.17.2' implementation 'org.apache.logging.log4j:log4j-api:2.17.2'
implementation 'org.slf4j:slf4j-simple:2.0.4' implementation 'org.slf4j:slf4j-simple:2.0.4'
implementation "org.scala-lang:scala-library:$scalaVersion.10" implementation "org.scala-lang:scala-library:$scalaVersion"
} }

@ -10,7 +10,7 @@ object LoginHandler extends APIRequestHandler {
private val ctx = new SqlMirrorContext(MirrorSqlDialect, Literal) private val ctx = new SqlMirrorContext(MirrorSqlDialect, Literal)
import ctx._ import ctx._
private def getAccount(mail: String, passwordHash: Int) = quote { private def getAccount(mail: String, passwordHash: Int) = quote {
query[User].filter(_.mailAddress == mail).filter(_.passwordHash == passwordHash) //query[User].filter(_.mailAddress == mail).filter(_.passwordHash == passwordHash)
} }