Skip to content

Commit

Permalink
Switch to org.playframework + Play 3
Browse files Browse the repository at this point in the history
  • Loading branch information
mkurz committed Oct 21, 2023
1 parent ccf6956 commit 77c4360
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[![OpenCollective](https://img.shields.io/opencollective/all/playframework?label=financial%20contributors&logo=open-collective)](https://opencollective.com/playframework)

[![Build Status](https://github.com/playframework/omnidoc/actions/workflows/build-test.yml/badge.svg)](https://github.com/playframework/omnidoc/actions/workflows/build-test.yml)
[![Maven](https://img.shields.io/maven-central/v/com.typesafe.play/play-omnidoc_2.13.svg?logo=apache-maven)](https://mvnrepository.com/artifact/com.typesafe.play/play-omnidoc_2.13)
[![Maven](https://img.shields.io/maven-central/v/org.playframework/play-omnidoc_2.13.svg?logo=apache-maven)](https://mvnrepository.com/artifact/org.playframework/play-omnidoc_2.13)
[![Repository size](https://img.shields.io/github/repo-size/playframework/omnidoc.svg?logo=git)](https://github.com/playframework/omnidoc)
[![Scala Steward badge](https://img.shields.io/badge/Scala_Steward-helping-blue.svg?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAMAAAARSr4IAAAAVFBMVEUAAACHjojlOy5NWlrKzcYRKjGFjIbp293YycuLa3pYY2LSqql4f3pCUFTgSjNodYRmcXUsPD/NTTbjRS+2jomhgnzNc223cGvZS0HaSD0XLjbaSjElhIr+AAAAAXRSTlMAQObYZgAAAHlJREFUCNdNyosOwyAIhWHAQS1Vt7a77/3fcxxdmv0xwmckutAR1nkm4ggbyEcg/wWmlGLDAA3oL50xi6fk5ffZ3E2E3QfZDCcCN2YtbEWZt+Drc6u6rlqv7Uk0LdKqqr5rk2UCRXOk0vmQKGfc94nOJyQjouF9H/wCc9gECEYfONoAAAAASUVORK5CYII=)](https://scala-steward.org)
[![Mergify Status](https://img.shields.io/endpoint.svg?url=https://api.mergify.com/v1/badges/playframework/omnidoc&style=flat)](https://mergify.com)
Expand Down
17 changes: 9 additions & 8 deletions project/OmnidocBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ object OmnidocBuild {
val scala213 = "2.13.12"
val scala3 = "3.3.1"

val playOrganisation = "com.typesafe.play"
val playOrganisation = "org.playframework"
val scalaTestPlusPlayOrganisation = "org.scalatestplus.play"
val playOrganisations = Seq(playOrganisation, scalaTestPlusPlayOrganisation)

val snapshotVersionLabel = "2.9.x"
val snapshotVersionLabel = "3.0.x"

val playVersion = sys.props.getOrElse("play.version", "2.9.0-RC3")
val playVersion = sys.props.getOrElse("play.version", "3.0.0-M3")
val scalaTestPlusPlayVersion = sys.props.getOrElse("scalatestplus-play.version", "6.0.0-RC2")
val playJsonVersion = sys.props.getOrElse("play-json.version", "2.10.1")
val playSlickVersion = sys.props.getOrElse("play-slick.version", "5.2.0-RC1")
Expand All @@ -33,8 +33,8 @@ object OmnidocBuild {
val playProjects = Seq(
"play",
"play-ahc-ws",
"play-akka-http-server",
"play-akka-http2-support",
"play-pekko-http-server",
"play-pekko-http2-support",
"play-cache",
"play-caffeine-cache",
"play-cluster-sharding",
Expand Down Expand Up @@ -308,16 +308,17 @@ Compile / dependencyClasspath := dependencyClasspath.value, // Needed for Scala
val label = s"Play $versionish"
Seq(
"-windowtitle", label,
// Adding a user agent when we run `javadoc` is necessary to create link docs
// Adding a user agent when we run `javadoc` was necessary to create link docs
// with Akka (at least, maybe play too) because doc.akka.io is served by Cloudflare
// which blocks requests without a User-Agent header.
// Not sure we need that for Pekko however.
"-J-Dhttp.agent=Play-Unidoc-Javadoc",
"-link",
"https://docs.oracle.com/en/java/javase/11/docs/api/",
"-link",
"https://doc.akka.io/japi/akka/2.6/",
"https://pekko.apache.org/japi/pekko/1.0/",
"-link",
"https://doc.akka.io/japi/akka-http/10.2/",
"https://pekko.apache.org/japi/pekko-http/1.0/",
"-notimestamp",
"-exclude", "play.api:play.core",
"-Xdoclint:none",
Expand Down

0 comments on commit 77c4360

Please sign in to comment.