Skip to content

Commit

Permalink
Fix compilation
Browse files Browse the repository at this point in the history
Signed-off-by: Thibault Meyer <[email protected]>
  • Loading branch information
thibaultmeyer committed Aug 21, 2018
1 parent ba719c1 commit 2f940f1
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# play-ebean

[![Latest release](https://img.shields.io/badge/latest_release-18.07-orange.svg?style=flat)](https://github.com/payintech/play-ebean/releases)
[![Latest release](https://img.shields.io/badge/latest_release-18.08-orange.svg?style=flat)](https://github.com/payintech/play-ebean/releases)
[![Build Status](https://travis-ci.org/payintech/play-ebean.svg?branch=master)](https://travis-ci.org/payintech/play-ebean)
[![GitHub license](https://img.shields.io/badge/license-Apache%202%2E0-blue.svg?style=flat)](https://opensource.org/licenses/Apache-2.0)

Expand All @@ -11,8 +11,8 @@ This module provides Ebean support for Play Framework 2.5 and superior.

## About this project

This project was forked from the original repository [playframework/play-ebean](https://github.com/playframework/play-ebean). It allows usage of Ebean ORM and
Ebean Migration into a Play Framework project. Ebean is compatible with all major
This project was forked from the original repository [playframework/play-ebean](https://github.com/playframework/play-ebean).
It allows usage of Ebean ORM and Ebean Migration into a Play Framework project. Ebean is compatible with all major
databases: CockroachDB, MariaDB, MSSQL, MySQL, PostgreSQL, SQLite, ...


Expand All @@ -28,7 +28,7 @@ using an older version of Play Framework, think to use the right plugin version.

| Plugin | Min. Play Framework | Ebean ORM | Ebean Agent | Ebean Migration |
|---------|---------------------|-----------|-------------|-----------------|
| 18.07 | 2.6.15 | 11.18.1 | 11.11.1 | 11.6.1 |
| 18.08 | 2.6.15 | 11.22.1 | 11.11.1 | 11.9.1 |
| 18.06 | 2.6.15 | 11.17.5 | 11.11.1 | 11.5.4 |
| 18.05 | 2.6.12 | 11.15.10 | 11.11.1 | 11.5.4 |
| 18.04u1 | 2.6.12 | 11.15.3 | 11.11.1 | 11.5.1 |
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import interplay.ScalaVersions._

val PlayVersion = playVersion(sys.props.getOrElse("play.version", "2.6.15"))
val PlayEnhancerVersion = "1.2.2"
val EbeanVersion = "11.19.1"
val EbeanVersion = "11.22.1"
val EbeanAgentVersion = "11.11.1"
val EbeanDBMigrationVersion = "11.7.1"
val EbeanDBMigrationVersion = "11.9.1"
val TypesafeConfigVersion = "1.3.2"

lazy val root = project
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,13 @@ class PlayInitializer @Inject()
if (changedMigrationResource.nonEmpty) {
var data = ""
for (res <- changedMigrationResource) {
data +=
data = data.concat(
s"""▅▆▇█ ${res.getLocation.split("/").takeRight(1).apply(0)} █▇▆▅
|${res.getContent}
|
|
|""".stripMargin
)
}
if (data.nonEmpty) {
val ebeanMigrationWC = new EbeanMigrationWebCommand(this.configuration, this.environment)
Expand Down
4 changes: 2 additions & 2 deletions sbt-play-ebean-test/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.12")
addSbtPlugin("com.payintech" % "sbt-play-ebean" % "18.06-SNAPSHOT")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.15")
addSbtPlugin("com.payintech" % "sbt-play-ebean" % "18.08-SNAPSHOT")
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "18.06-SNAPSHOT"
version in ThisBuild := "18.08-SNAPSHOT"

0 comments on commit 2f940f1

Please sign in to comment.