Skip to content

Commit

Permalink
Merge 3a4926c into 77857e6
Browse files Browse the repository at this point in the history
  • Loading branch information
Z1kkurat committed Nov 17, 2022
2 parents 77857e6 + 3a4926c commit 8b8e363
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 48 deletions.
43 changes: 43 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: CI

on: [push, pull_request]

jobs:
test:

runs-on: ubuntu-latest

strategy:
matrix:
scala:
- 2.13.10
- 2.12.17
- 3.2.1

steps:
- uses: actions/checkout@v3

- uses: coursier/cache-action@v6

- name: scala
uses: olafurpg/setup-scala@v13
with:
java-version: openjdk@1.11

- name: build ${{ matrix.scala }}
run: sbt ++${{ matrix.scala }} clean coverage test

- name: test coverage
if: success()
env:
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COVERALLS_FLAG_NAME: Scala ${{ matrix.scala }}
run: sbt ++${{ matrix.scala }} coverageReport coveralls

- name: slack
uses: homoluctus/slatify@master
if: failure() && github.ref == 'refs/heads/master'
with:
type: ${{ job.status }}
job_name: Build
url: ${{ secrets.SLACK_WEBHOOK }}
31 changes: 0 additions & 31 deletions .travis.yml

This file was deleted.

12 changes: 5 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,21 @@ homepage := Some(new URL("http://github.com/evolution-gaming/config-tools"))

startYear := Some(2017)

organizationName := "Evolution Gaming"
organizationName := "Evolution"

organizationHomepage := Some(url("http://evolutiongaming.com"))
organizationHomepage := Some(url("http://evolution.com"))

bintrayOrganization := Some("evolutiongaming")
publishTo := Some(Resolver.evolutionReleases)

scalaVersion := crossScalaVersions.value.head

crossScalaVersions := Seq("2.13.0", "2.12.9")
crossScalaVersions := Seq("2.13.10", "2.12.17", "3.2.1")

scalacOptions in (Compile,doc) ++= Seq("-groups", "-implicits", "-no-link-warnings")

resolvers += Resolver.bintrayRepo("evolutiongaming", "maven")

libraryDependencies ++= Seq(
"com.typesafe" % "config" % "1.3.4",
"org.scalatest" %% "scalatest" % "3.0.8" % Test)
"org.scalatest" %% "scalatest" % "3.2.14" % Test)

licenses := Seq(("MIT", url("https://opensource.org/licenses/MIT")))

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.3.0
sbt.version=1.8.0
12 changes: 5 additions & 7 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
externalResolvers += Resolver.bintrayIvyRepo("evolutiongaming", "sbt-plugins")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.5")

addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.5")
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.1")

addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")

addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7")
addSbtPlugin("com.evolution" % "sbt-scalac-opts-plugin" % "0.0.9")

addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.11")

addSbtPlugin("com.evolutiongaming" % "sbt-scalac-opts-plugin" % "0.0.4")
addSbtPlugin("com.evolution" % "sbt-artifactory-plugin" % "0.0.2")
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ package com.evolutiongaming.config

import com.evolutiongaming.config.ConfigHelper._
import com.typesafe.config.{Config, ConfigException, ConfigFactory}
import org.scalatest.{FunSuite, Matchers}
import org.scalatest.funsuite.AnyFunSuite
import org.scalatest.matchers.should._

import scala.concurrent.duration._

class ConfigHelperSpec extends FunSuite with Matchers {
class ConfigHelperSpec extends AnyFunSuite with Matchers {

test("get") {
val config = ConfigFactory.parseString("key:value")
Expand Down

0 comments on commit 8b8e363

Please sign in to comment.