Skip to content
This repository was archived by the owner on Mar 21, 2025. It is now read-only.

Commit 7f95754

Browse files
committed
replace sample app with scala seed app
1 parent abc5102 commit 7f95754

File tree

19 files changed

+43
-174
lines changed

19 files changed

+43
-174
lines changed

build/package/Dockerfile.sbt-toolset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM registry.access.redhat.com/ubi8/openjdk-11:1.13
22

33
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
44

5-
ARG SBT_VERSION=1.7.1
6-
ARG SBT_SHA256=2ae094410b518acc46d9cdcdc4e138b4c27cd5040fc91d48d2d823fe84984294
5+
ARG SBT_VERSION=1.7.2
6+
ARG SBT_SHA256=e9e3814b2a5a83734d02bf8f1dd8ac285620e601e2f9b1c0fa18c8b38d0dabe3
77

88
ENV LANG=en_US.UTF-8 \
99
LC_ALL=en_US.UTF-8

test/tasks/ods-build-sbt_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestTaskODSBuildSbt(t *testing.T) {
3535
checkFilesExist(t, wsDir,
3636
"docker/Dockerfile",
3737
"docker/dist",
38-
filepath.Join(pipelinectxt.XUnitReportsPath, "TEST-controllers.HomeControllerSpec.xml"),
38+
filepath.Join(pipelinectxt.XUnitReportsPath, "TEST-example.HelloSpec.xml"),
3939
filepath.Join(pipelinectxt.CodeCoveragesPath, "scoverage.xml"),
4040
filepath.Join(pipelinectxt.SonarAnalysisPath, "analysis-report.md"),
4141
filepath.Join(pipelinectxt.SonarAnalysisPath, "issues-report.csv"),

test/testdata/workspaces/sbt-sample-app/app/controllers/HomeController.scala

Lines changed: 0 additions & 21 deletions
This file was deleted.

test/testdata/workspaces/sbt-sample-app/app/views/index.scala.html

Lines changed: 0 additions & 5 deletions
This file was deleted.

test/testdata/workspaces/sbt-sample-app/app/views/main.scala.html

Lines changed: 0 additions & 25 deletions
This file was deleted.
Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
1-
name := """sbt-sample-app"""
2-
organization := "org.opendevstack.pipeline.sbt"
1+
import Dependencies._
32

4-
version := "1.0-SNAPSHOT"
3+
ThisBuild / scalaVersion := "2.13.9"
4+
ThisBuild / version := "0.1.0-SNAPSHOT"
5+
ThisBuild / organization := "com.example"
6+
ThisBuild / organizationName := "example"
57

6-
lazy val root = (project in file(".")).enablePlugins(PlayScala)
8+
lazy val root = (project in file("."))
9+
.enablePlugins(JavaAppPackaging)
10+
.settings(
11+
name := "scala-seed",
12+
libraryDependencies += scalaTest % Test
13+
)
714

8-
scalaVersion := "2.13.9"
9-
10-
// this fixes the problem with different versions of scala-xml in twirl and the scoverage sbt plugin :F
11-
libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
12-
13-
libraryDependencies += guice
14-
libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test
15-
16-
// Adds additional packages into Twirl
17-
//TwirlKeys.templateImports += "org.opendevstack.pipeline.sbt.controllers._"
18-
19-
// Adds additional packages into conf/routes
20-
// play.sbt.routes.RoutesKeys.routesImport += "org.opendevstack.pipeline.sbt.binders._"
15+
// See https://www.scala-sbt.org/1.x/docs/Using-Sonatype.html for instructions on how to publish to Sonatype.

test/testdata/workspaces/sbt-sample-app/conf/application.conf

Lines changed: 0 additions & 2 deletions
This file was deleted.

test/testdata/workspaces/sbt-sample-app/conf/logback.xml

Lines changed: 0 additions & 42 deletions
This file was deleted.

test/testdata/workspaces/sbt-sample-app/conf/messages

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/testdata/workspaces/sbt-sample-app/conf/routes

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)