Skip to content

Commit

Permalink
Support for play framework 2.3.4 #8
Browse files Browse the repository at this point in the history
Cross compiled against 2.11 and 2.10
  • Loading branch information
Leon Radley committed Sep 11, 2014
1 parent 0e2ac25 commit cd2f85a
Show file tree
Hide file tree
Showing 20 changed files with 127 additions and 336 deletions.
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
*.
!.gitignore
!.travis.yml

tmp
target

/project/sonatype.sbt

logs
logs
.DS_Store
.idea
.idea_modules
17 changes: 8 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,11 @@
## Add plugin to dependencies
```scala
val appDependencies = Seq(
"se.digiplant" %% "play-scalr" % "1.0.1"
"se.digiplant" %% "play-scalr" % "1.1.0"
)

val root = PlayProject(appName, appVersion, appDependencies, mainLang = SCALA).settings(
resolvers += "OSS Sonatype Snapshots" at "http://oss.sonatype.org/content/repositories/snapshots/",
// To simplify the reverse routing we can import the digiPlant namespace
templatesImport ++= Seq(
"se.digiplant._"
)
)
// To simplify the reverse routing we can import the digiPlant namespace
TwirlKeys.templateImports += "se.digiplant._"
```

## Add to `conf/application.conf`
Expand All @@ -33,9 +28,13 @@ scalr.cache=scalrcache

## Add to `conf/routes`
```
# Image scaling for play-res plugin
# Dynamic image scaling
GET /res/:width/:height/:file se.digiplant.scalr.ScalrResAssets.at(file, width: Int, height: Int)
# Fixed image scaling
GET /res/small/:file se.digiplant.scalr.ScalrResAssets.at(file, width: Int = 50, height: Int = 50)
GET /res/medium/:file se.digiplant.scalr.ScalrResAssets.at(file, width: Int = 200, height: Int = 200)
# Image resizing for any folder specified as path parameter (will cache thumbnails using play-res plugin)
GET /scalr/:width/:height/*file se.digiplant.scalr.ScalrAssets.at(path="/public/images", file, width: Int, height: Int)
Expand Down
20 changes: 20 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# 1.1.0

* Play 2.3.4 and scala 2.10.4 and 2.11.1

# 1.0.0

* Plugin is now out of beta
* Using custom version of Scalr which supports cropping
* Play 2.1-RC2 compatible

# 0.2.0
Makeover so that it's no longer a play plugin but a static library, with configuration possibilities.
forked imgscalr and imported it, since it's no longer maintained

* Fixed #2 - Function calling itself.
* Updated to Play 2.1.1

# 0.1.0

* Implemented Scalr so that you can resize images on the fly
25 changes: 0 additions & 25 deletions app/ls/1.0.1.json

This file was deleted.

25 changes: 0 additions & 25 deletions app/ls/1.0.json

This file was deleted.

25 changes: 25 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import play.PlayImport.PlayKeys._

name := "play-scalr"

version := "1.1.0"

scalaVersion := "2.11.1"

crossScalaVersions := Seq("2.10.4", "2.11.1")

organization := "se.digiplant"

playPlugin := true

scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")

resolvers += Resolver.sonatypeRepo("releases")

libraryDependencies ++= Seq(
"se.digiplant" %% "play-res" % "1.1.0",
"com.typesafe.play" %% "play" % play.core.PlayVersion.current % "provided",
"com.typesafe.play" %% "play-test" % play.core.PlayVersion.current % "test"
)

lazy val root = (project in file(".")).enablePlugins(PlayScala)
26 changes: 26 additions & 0 deletions deploy.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import xerial.sbt.Sonatype.SonatypeKeys._

sonatypeSettings

// Workaround for bouncycastle not working with play 2.3

useGpg := true

//credentials := Seq(Credentials(Path.userHome / ".ivy2" / ".digiplantcredentials"))

licenses := Seq("Apache 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0"))

homepage := Some(url("https://github.com/digiplant/play-scalr"))

pomExtra :=
<scm>
<url>git://github.com/digiPlant/play-scalr.git</url>
<connection>scm:git://github.com/digiPlant/play-scalr.git</connection>
</scm>
<developers>
<developer>
<id>leon</id>
<name>Leon Radley</name>
<url>http://github.com/leon</url>
</developer>
</developers>
3 changes: 0 additions & 3 deletions notes/0.1.markdown

This file was deleted.

4 changes: 0 additions & 4 deletions notes/0.2.markdown

This file was deleted.

2 changes: 0 additions & 2 deletions notes/1.0.1.markdown

This file was deleted.

5 changes: 0 additions & 5 deletions notes/1.0.markdown

This file was deleted.

90 changes: 0 additions & 90 deletions notes/about.markdown

This file was deleted.

19 changes: 0 additions & 19 deletions notes/copyright.markdown

This file was deleted.

Loading

0 comments on commit cd2f85a

Please sign in to comment.