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

upd #6

Merged
merged 3 commits into from
Nov 22, 2023
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: 0 additions & 4 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
version: 1
labels:
- label: "AnyTitleAndSmall"
title: ".*"
size:
below: 100
- label: "TestFileMatch"
files:
- "cmd/.*.go"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ jobs:
name: automerge
uses: "pascalgn/[email protected]"
env:
GITHUB_TOKEN: "${{ secrets.REPO_GITHUB_TOKEN }}"
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- uses: srvaroa/labeler@master
env:
GITHUB_TOKEN: "${{ secrets.REPO_GITHUB_TOKEN }}"
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

ci:
# run on external PRs, but not on internal PRs since those will be run by push to branch
Expand Down
16 changes: 11 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import com.softwaremill.SbtSoftwareMillCommon.commonSmlBuildSettings
import Dependencies._

lazy val commonSettings = commonSmlBuildSettings ++ Seq(
organization := "com.softwaremill.xxx",
scalaVersion := "2.13.12"
)

val scalaTest = "org.scalatest" %% "scalatest" % "3.2.17" % Test

lazy val rootProject = (project in file("."))
.settings(commonSettings: _*)
.settings(publishArtifact := false, name := "root")
Expand All @@ -16,7 +15,14 @@ lazy val core: Project = (project in file("core"))
.settings(commonSettings: _*)
.settings(
name := "core",
libraryDependencies ++= Seq(
scalaTest
)
libraryDependencies ++=
scalaTest ++
cats ++
http4s

)

addCommandAlias(
"format",
"; scalafmtAll ; scalafmtSbt; Test / scalafmtAll"
)
4 changes: 1 addition & 3 deletions core/src/main/scala/Main.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


object Main {
def main(args: Array[String]) = println("hello world")
}
}
5 changes: 2 additions & 3 deletions core/src/test/scala/MySpec.scala
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@

import org.scalatest.matchers.should.Matchers
import org.scalatest.flatspec.AnyFlatSpec
class MySpec extends AnyFlatSpec with Matchers {
"This" should "do" in {
1 + 2 should be (3)
1 + 2 should be(3)
}
}
}
20 changes: 20 additions & 0 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import sbt.*

object Dependencies {

lazy val cats: Seq[ModuleID] = Seq(
"org.typelevel" %% "cats-core" % Versions.cats,
"org.typelevel" %% "cats-effect" % Versions.catsEffect
)

lazy val http4s: Seq[ModuleID] = Seq(
"org.http4s" %% "http4s-ember-client" % Versions.http4s,
"org.http4s" %% "http4s-ember-server" % Versions.http4s,
"org.http4s" %% "http4s-circe" % Versions.http4s,
"org.http4s" %% "http4s-dsl" % Versions.http4s
)

lazy val scalaTest: Seq[ModuleID] = Seq(
"org.scalatest" %% "scalatest" % Versions.scalaTest % Test
)
}
3 changes: 3 additions & 0 deletions project/Versions.scala
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
object Versions {
val cats = "2.10.0"
val catsEffect = "3.5.2"
val http4s = "0.23.21"
val scalaTest = "3.2.17"
}
Loading