diff --git a/cloudinary-core/build.sbt b/cloudinary-core/build.sbt index 6ce9cf3..c8de54c 100644 --- a/cloudinary-core/build.sbt +++ b/cloudinary-core/build.sbt @@ -32,19 +32,22 @@ pomExtra := { info@cloudinary.com -} - +} + libraryDependencies ++= Seq( - "com.ning" % "async-http-client" % "1.9.40", - "org.json4s" %% "json4s-native" % "3.4.0", - "org.json4s" %% "json4s-ext" % "3.4.0", - "org.scalatest" %% "scalatest" % "2.2.1" % "test", - "org.nanohttpd" % "nanohttpd" % "2.2.0" % "test") + "com.ning" % "async-http-client" % "1.9.40", + "org.json4s" %% "json4s-native" % "3.5.3", + "org.json4s" %% "json4s-ext" % "3.5.3", + "org.scalatest" %% "scalatest" % "3.0.4" % "test", + "org.nanohttpd" % "nanohttpd" % "2.3.1" % "test", + "org.slf4j" % "slf4j-simple" % "1.7.25" % "test", + "org.scalamock" %% "scalamock-scalatest-support" % "3.6.0" % "test" +) // http://mvnrepository.com/artifact/org.slf4j/slf4j-simple -libraryDependencies += "org.slf4j" % "slf4j-simple" % "1.7.21" % "test" -libraryDependencies += "org.scalamock" %% "scalamock-scalatest-support" % "3.2.2" % "test" -resolvers ++= Seq("sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots", "sonatype releases" at "https://oss.sonatype.org/content/repositories/releases") +resolvers ++= Seq( + "sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots", + "sonatype releases" at "https://oss.sonatype.org/content/repositories/releases" +) scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature") - diff --git a/cloudinary-core/project/build.properties b/cloudinary-core/project/build.properties index 817bc38..c091b86 100644 --- a/cloudinary-core/project/build.properties +++ b/cloudinary-core/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.9 +sbt.version=0.13.16 diff --git a/cloudinary-play-plugin/build.sbt b/cloudinary-play-plugin/build.sbt index 80ba827..f058601 100644 --- a/cloudinary-play-plugin/build.sbt +++ b/cloudinary-play-plugin/build.sbt @@ -1,3 +1,5 @@ +import play.sbt.PlayImport._ + name := "cloudinary-scala-play" organization := "com.cloudinary" @@ -10,9 +12,12 @@ resolvers += "sonatype snapshots" at "https://oss.sonatype.org/content/repositor resolvers += "sonatype releases" at "https://oss.sonatype.org/content/repositories/releases" -resolvers += Resolver.file("Local Ivy", file(Path.userHome + "/.ivy2/local"))(Resolver.ivyStylePatterns) +resolvers += Resolver.file("Local Ivy", file(Path.userHome + "/.ivy2/local"))( + Resolver.ivyStylePatterns) -libraryDependencies += "com.cloudinary" %% "cloudinary-core-scala" % version.value +libraryDependencies ++= Seq( + "com.cloudinary" %% "cloudinary-core-scala" % version.value, + guice) pomExtra := { http://cloudinary.com diff --git a/cloudinary-play-plugin/project/build.properties b/cloudinary-play-plugin/project/build.properties index 817bc38..c091b86 100644 --- a/cloudinary-play-plugin/project/build.properties +++ b/cloudinary-play-plugin/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.9 +sbt.version=0.13.16 diff --git a/project/Common.scala b/project/Common.scala index a363e9e..d754d23 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -1,6 +1,6 @@ object Common { def version = "1.2.1" - def playVersion = System.getProperty("play.version", "2.4.2") - def scalaVersion = "2.11.5" - def scalaVersions = Seq("2.10.4", scalaVersion) + def playVersion = System.getProperty("play.version", "2.6.7") + def scalaVersion = "2.12.4" + def scalaVersions = Seq("2.11.11", scalaVersion) } diff --git a/project/build.properties b/project/build.properties index 176a863..c091b86 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.9 \ No newline at end of file +sbt.version=0.13.16 diff --git a/project/plugins.sbt b/project/plugins.sbt index a34ea1e..027426c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/" // Use the Play sbt plugin for Play projects -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % System.getProperty("play.version", "2.4.2")) +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % System.getProperty("play.version", "2.6.7")) addSbtPlugin("com.typesafe.sbt" % "sbt-less" % "1.0.0") diff --git a/samples/photo_album/app/controllers/PhotosController.scala b/samples/photo_album/app/controllers/PhotosController.scala index 6d87ee4..9381427 100644 --- a/samples/photo_album/app/controllers/PhotosController.scala +++ b/samples/photo_album/app/controllers/PhotosController.scala @@ -1,37 +1,33 @@ package controllers +import java.util.Locale import javax.inject._ import scala.concurrent._ import ExecutionContext.Implicits.global - import org.joda.time.DateTime - import play.api._ import play.api.mvc.Controller import play.api.mvc.Action -import play.api.i18n.I18nSupport -import play.api.i18n.MessagesApi - +import play.api.i18n._ import play.api.data._ import play.api.data.Forms._ - import cloudinary.model.{CloudinaryResource, CloudinaryResourceBuilder} - import com.cloudinary.parameters.UploadParameters import com.cloudinary.Implicits._ - import dao._ import models._ class PhotosController @Inject() ( - photoDao:PhotoDAO, - cloudinaryResourceBuilder: CloudinaryResourceBuilder, + photoDao:PhotoDAO, + cloudinaryResourceBuilder: CloudinaryResourceBuilder, val messagesApi: MessagesApi) extends Controller with I18nSupport { - + implicit val cld:com.cloudinary.Cloudinary = cloudinaryResourceBuilder.cld import cloudinaryResourceBuilder.preloadedFormatter + implicit val messagesProvider: MessagesProvider = MessagesImpl(Lang(Locale.ENGLISH), messagesApi) + val photoForm = Form( mapping( "title" -> nonEmptyText)(PhotoDetails.apply)(PhotoDetails.unapply)) @@ -59,7 +55,7 @@ class PhotosController @Inject() ( } def freshUnsignedDirect = Action { - // Preset creation does not really belong here - it's just here for the sample to work. + // Preset creation does not really belong here - it's just here for the sample to work. // The preset should be created offline val presetName = "sample_" + com.cloudinary.Cloudinary.apiSignRequest( diff --git a/samples/photo_album/build.sbt b/samples/photo_album/build.sbt index dd7d8c4..25ce8af 100644 --- a/samples/photo_album/build.sbt +++ b/samples/photo_album/build.sbt @@ -4,12 +4,14 @@ version := Common.version scalaVersion := Common.scalaVersion +val playSlickVersion = "3.0.2" + libraryDependencies ++= Seq( "com.h2database" % "h2" % "1.4.188", - "com.typesafe.play" %% "play-slick" % "1.0.1", - "com.typesafe.play" %% "play-slick-evolutions" % "1.0.1", + "com.typesafe.play" %% "play-slick" % playSlickVersion, + "com.typesafe.play" %% "play-slick-evolutions" % playSlickVersion, evolutions -) +) resolvers += Resolver.file("Local Ivy", file(Path.userHome + "/.ivy2/local"))(Resolver.ivyStylePatterns)