Commit 8447327

authored

Merge branch 'master' into update/sbt-scalafmt-2.4.6

2 parents 2042f4d + ea59736 commit 8447327Copy full SHA for 8447327

File tree

+21

-7

lines changed

+21

-7

lines changed

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,3 +20,17 @@ jobs:`
`20`	`20`	`distribution: 'adopt'`
`21`	`21`	`- name: Run Tests`
`22`	`22`	`run: sbt clean compile test`
	`23`	`+`
	`24`	`+ merge:`
	`25`	`+ name: Merge dependency update`
	`26`	`+ if: github.actor == 'anand-singh'`
	`27`	`+ needs:`
	`28`	`+ - build`
	`29`	`+ runs-on: ubuntu-latest`
	`30`	`+ steps:`
	`31`	`+ - name: merge PR`
	`32`	`+ uses: desbo/merge-pr-action@v0`
	`33`	`+ with:`
	`34`	`+ GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}`
	`35`	`+ ALLOWED_UPDATE: major`
	`36`	`+ MERGE_METHOD: squash`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ lazy val root = (project in file("."))`
`11`	`11`	`inThisBuild(`
`12`	`12`	`List(`
`13`	`13`	`organization := "com.techmonal",`
`14`		`- scalaVersion := "2.13.5",`
	`14`	`+ scalaVersion := "2.13.7",`
`15`	`15`	`scalastyleFailOnError := true,`
`16`	`16`	`scalastyleFailOnWarning := false,`
`17`	`17`	`scalafmtOnCompile := true`
`@@ -54,17 +54,17 @@ lazy val db = project`
`54`	`54`	`.settings(libraryDependencies ++= dbLibraryDependencies)`
`55`	`55`
`56`	`56`	`lazy val commonLibraryDependencies = Seq(`
`57`		`- "com.twitter" %% "util-core" % "21.6.0",`
`58`		`- "ch.qos.logback" % "logback-classic" % "1.2.6",`
`59`		`- "org.scalatest" %% "scalatest" % "3.0.8" % Test,`
	`57`	`+ "com.twitter" %% "util-core" % "21.12.0",`
	`58`	`+ "ch.qos.logback" % "logback-classic" % "1.2.9",`
	`59`	`+ "org.scalatest" %% "scalatest" % "3.0.8" % Test,`
`60`	`60`	`"org.scalatestplus" %% "scalatestplus-scalacheck" % "3.1.0.0-RC2" % Test`
`61`	`61`	`) ++ circeDependencies`
`62`	`62`
`63`	`63`	`lazy val webLibraryDependencies = Seq()`
`64`	`64`
`65`	`65`	`lazy val dbLibraryDependencies = commonLibraryDependencies ++ Seq(`
`66`	`66`	`"com.datastax.dse" % "dse-java-driver-core" % "1.5.1",`
`67`		`- "org.typelevel" %% "cats-core" % "2.6.1",`
	`67`	`+ "org.typelevel" %% "cats-core" % "2.7.0",`
`68`	`68`	`"org.cassandraunit" % "cassandra-unit" % "3.5.0.1"`
`69`	`69`	`)`
`70`	`70`

Lines changed: 1 addition & 1 deletion

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")`
`2`	`2`
`3`		`-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.2")`
	`3`	`+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.2")`
`4`	`4`
`5`	`5`	`addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")`
`6`	`6`

Comments

(0)