Merge pull request #653 from Max-AR/remove-examples

Migrate samples from play-slick repo to play-samples repo
playframework · Jan 30, 2022 · ee06309 · ee06309
2 parents 587a5d5 + 7e5a861
commit ee06309
Show file tree

Hide file tree

Showing 59 changed files with 3 additions and 3,048 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,22 +22,3 @@ bin
 
 # IntelliJ IDEA specific
 .idea
-
-# samples
-samples/*/logs
-samples/*/project/project
-samples/*/project/target
-samples/*/target
-samples/*/bin
-samples/*/tmp
-samples/*/.history
-samples/*/dist
-samples/*/.idea
-samples/*/*.iml
-samples/*/out
-samples/*/.idea_modules
-samples/*/.classpath
-samples/*/.project
-samples/*/RUNNING_PID
-samples/*/.settings
-/bin/
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,6 @@ install: jabba install "adopt@~1.$TRAVIS_JDK.0-0" && jabba use "$_" && java -Xmx
 script:
   - sbt ++$TRAVIS_SCALA_VERSION scalafmtCheckAll scalafmtSbtCheck mimaReportBinaryIssues
   - sbt ++$TRAVIS_SCALA_VERSION docs/scalafmtCheckAll docs/scalafmtSbtCheck docs/test docs/validateDocs
-  - sbt ++$TRAVIS_SCALA_VERSION test samples/test
 
 cache:
   directories:

diff --git a/README.md b/README.md
@@ -14,6 +14,8 @@ Because Slick creates and manages both a connection pool and a thread pool, inte
 
 The plugin has its own release cycle and therefore is not integrated into either core Play or Slick.
 
+Examples of `play-slick`s usage can be found [here](https://github.com/playframework/play-samples).
+
 ## Current Version
 
 To use play-slick, you need to add the following dependencies:

diff --git a/build.sbt b/build.sbt
@@ -74,9 +74,6 @@ lazy val docs = project
   .settings(commonSettings)
 
 playBuildRepoName in ThisBuild := "play-slick"
-playBuildExtraTests := {
-  (test in (samples, Test)).value
-}
 
 // Binary compatibility is tested against this version
 val previousVersion: Option[String] = Some("5.0.0")
@@ -86,31 +83,3 @@ ThisBuild / mimaFailOnNoPrevious := false
 def mimaSettings = mimaDefaultSettings ++ Seq(
   mimaPreviousArtifacts := previousVersion.map(organization.value %% moduleName.value % _).toSet
 )
-
-lazy val samples = project
-  .in(file("samples"))
-  .aggregate(
-    basicSample,
-    computerDatabaseSample,
-    streamsSample
-  )
-
-def sampleProject(name: String) =
-  Project(s"$name-sample", file("samples") / name)
-    .enablePlugins(PlayScala)
-    .disablePlugins(PlayFilters)
-    .dependsOn(`play-slick`)
-    .dependsOn(`play-slick-evolutions`)
-    .settings(
-      libraryDependencies += Library.playSpecs2 % "test",
-      concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)
-    )
-    .settings(libraryDependencies += Library.h2)
-    .settings(javaOptions in Test += "-Dslick.dbs.default.connectionTimeout=30 seconds")
-    .settings(commonSettings)
-
-lazy val computerDatabaseSample = sampleProject("computer-database")
-
-lazy val streamsSample = sampleProject("streams")
-
-lazy val basicSample = sampleProject("basic")
diff --git a/docs/manual/working/scalaGuide/main/sql/slick/PlaySlick.md b/docs/manual/working/scalaGuide/main/sql/slick/PlaySlick.md
@@ -129,7 +129,7 @@ Of course, you should replace the string `"<db-name>"` with the name of the data
 
 > Note: To access the database object, you need only call the function `db` on the `HasDatabaseConfig` trait. You do not need to reference the dbConfigProvider constructor parameter.
 
-For a full example, have a look at [this sample project](https://github.com/playframework/play-slick/tree/master/samples/basic).
+For a full example, have a look at [this sample project](https://github.com/playframework/play-samples/tree/HEAD/play-scala-slick-example/samples/basic).
 
 ### Compile-time dependency injection
 

diff --git a/samples/basic/app/controllers/Application.scala b/samples/basic/app/controllers/Application.scala
diff --git a/samples/basic/app/dao/CatDAO.scala b/samples/basic/app/dao/CatDAO.scala
diff --git a/samples/basic/app/dao/DogDAO.scala b/samples/basic/app/dao/DogDAO.scala
diff --git a/samples/basic/app/models/Models.scala b/samples/basic/app/models/Models.scala
diff --git a/samples/basic/app/views/index.scala.html b/samples/basic/app/views/index.scala.html
diff --git a/samples/basic/app/views/main.scala.html b/samples/basic/app/views/main.scala.html
diff --git a/samples/basic/build.sbt b/samples/basic/build.sbt
diff --git a/samples/basic/conf/application.conf b/samples/basic/conf/application.conf
diff --git a/samples/basic/conf/evolutions/default/1.sql b/samples/basic/conf/evolutions/default/1.sql
diff --git a/samples/basic/conf/logback.xml b/samples/basic/conf/logback.xml
diff --git a/samples/basic/conf/routes b/samples/basic/conf/routes
diff --git a/samples/basic/public/images/favicon.png b/samples/basic/public/images/favicon.png
diff --git a/samples/basic/public/javascripts/jquery-1.9.0.min.js b/samples/basic/public/javascripts/jquery-1.9.0.min.js
diff --git a/samples/basic/public/stylesheets/main.css b/samples/basic/public/stylesheets/main.css