Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update deps #333

Merged
merged 9 commits into from
Aug 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ services:
- docker

scala:
- 2.12.8
- 2.12.12

jdk:
- openjdk8
- oraclejdk11

cache:
directories:
Expand Down
29 changes: 18 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

[![Build Status](https://travis-ci.org/iheartradio/play-swagger.svg)](https://travis-ci.org/iheartradio/play-swagger)
[![Coverage Status](https://coveralls.io/repos/iheartradio/play-swagger/badge.svg?branch=master&service=github)](https://coveralls.io/github/iheartradio/play-swagger?branch=master)
[![Stories in Ready](https://badge.waffle.io/iheartradio/play-swagger.svg?label=ready&title=Ready)](http://waffle.io/iheartradio/play-swagger)
[ ![Download](https://api.bintray.com/packages/iheartradio/maven/play-swagger/images/download.svg) ](https://bintray.com/iheartradio/maven/play-swagger/_latestVersion)
[![Gitter](https://badges.gitter.im/iheartradio/play-swagger.svg)](https://gitter.im/iheartradio/play-swagger?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)

Expand Down Expand Up @@ -82,29 +81,33 @@ You can find the setup in the example project as well.

#### Step 1

For play2.5 add Swagger sbt plugin dependency to your plugins.sbt (see [the releases tab](https://github.com/iheartradio/play-swagger/releases) for the latest versions)

For Play 2.5
For play 2.6, sbt 1.x, Scala 2.12.x and 2.11.x please use
```scala
addSbtPlugin("com.iheart" % "sbt-play-swagger" % "0.6.5")
addSbtPlugin("com.iheart" % "sbt-play-swagger" % "0.9.1")
```

For play 2.6, sbt 1.x and Scala 2.12.x please use
For play 2.7, sbt 1.x please use
```scala
addSbtPlugin("com.iheart" %% "sbt-play-swagger" % "0.7.5")
addSbtPlugin("com.iheart" % "sbt-play-swagger" % "0.9.1-PLAY2.7")
```

For play 2.7, sbt 1.x and Scala 2.12.x please use
For play 2.8, please use
```scala
addSbtPlugin("com.iheart" %% "sbt-play-swagger" % "0.7.5-PLAY2.7")
addSbtPlugin("com.iheart" % "sbt-play-swagger" % "0.9.1-PLAY2.8")
```

For play 2.6 and sbt 0.13.x please use a special release build with play 2.6 binary. (No longer maintained after 0.6.2)
For play 2.6 and sbt 0.13.x please use a special release (No longer maintained after 0.6.2)
```scala
addSbtPlugin("com.iheart" % "sbt-play-swagger" % "0.6.2-PLAY2.6")

```
For Play 2.5 (No longer maintained after 0.6.5)
```scala
addSbtPlugin("com.iheart" % "sbt-play-swagger" % "0.6.5")
```

For play 2.4 please use a special release build with play 2.4 binary (No longer maintained after 0.6.0)
For play 2.4 (No longer maintained after 0.6.0)
```scala
addSbtPlugin("com.iheart" % "sbt-play-swagger" % "0.6.0-PLAY2.4")

Expand Down Expand Up @@ -404,4 +407,8 @@ POST /tracks controller.Api.createTrack()

#### Is play java supported?

Mostly. Auto definition generation for classes only works with Java classes that have all the fields in the first constructor.
you can generate models definition from java POJO by setting the flag:
```
playJava := true
```
The flag only suport PlayJava 2.7 and 2.8
10 changes: 6 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@ lazy val noPublishSettings = Seq(
publishArtifact := false
)

lazy val scalaV = "2.12.12"

lazy val root = project.in(file("."))
.aggregate(playSwagger, sbtPlaySwagger)
.settings(
Publish.coreSettings,
sourcesInBase := false,
noPublishSettings,

scalaVersion := "2.12.8"
scalaVersion := scalaV
)

lazy val playSwagger = project.in(file("core"))
Expand All @@ -33,8 +35,8 @@ lazy val playSwagger = project.in(file("core"))
Dependencies.refined ++
Dependencies.test ++
Dependencies.yaml,
scalaVersion := "2.12.8",
crossScalaVersions := Seq(scalaVersion.value, "2.13.0")
scalaVersion := scalaV,
crossScalaVersions := Seq(scalaVersion.value, "2.13.3")
)

lazy val sbtPlaySwagger = project.in(file("sbtPlugin"))
Expand All @@ -50,7 +52,7 @@ lazy val sbtPlaySwagger = project.in(file("sbtPlugin"))
name := "sbt-play-swagger",
description := "sbt plugin for play swagger spec generation",
sbtPlugin := true,
scalaVersion := "2.12.8",
scalaVersion := scalaV,
scripted := scripted.dependsOn(publishLocal in playSwagger).evaluated,
scriptedLaunchOpts := { scriptedLaunchOpts.value ++
Seq("-Xmx1024M", "-Dplugin.version=" + version.value)
Expand Down
1 change: 0 additions & 1 deletion core/src/test/java/com/iheart/playSwagger/Attribute.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
*/
@SuppressWarnings({"all"})
@ParametersAreNonnullByDefault
@javax.annotation.Generated("org.immutables.processor.ProxyProcessor")
@Immutable
@CheckReturnValue
public final class Attribute{
Expand Down
2 changes: 1 addition & 1 deletion example/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version := "1.0-SNAPSHOT"

lazy val root = (project in file(".")).enablePlugins(PlayScala, SwaggerPlugin) //enable plugin

scalaVersion := "2.12.8"
scalaVersion := "2.12.12"

libraryDependencies ++= Seq(
jdbc,
Expand Down
5 changes: 1 addition & 4 deletions example/project/build.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#Activator-generated Properties
#Wed Aug 24 09:12:28 EDT 2016
template.uuid=b0d11fa6-d1b3-4963-94aa-319a15612bf3
sbt.version=1.2.8
sbt.version=1.3.3
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.10")

addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.0")

addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")

addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name := "app"

version := "1.0.1-BETA1"

scalaVersion := "2.12.8"
scalaVersion := "2.12.12"

swaggerDomainNameSpaces := Seq("namespace1", "namespace2")

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.2.8
sbt.version=1.3.13