Skip to content

Commit

Permalink
Update various dependencies, Drop Scala 2.11 (#27)
Browse files Browse the repository at this point in the history
- Update sourcecode to 0.3.0
- Drop support for Scala 2.11
- Update Scala 2.12 to 2.12.17
- Update Scala 2.13 to 2.13.10
- Update Scala.js to 1.13.0
- Update Scala Native to 0.4.10
- Update test depedencies
- Update Mill to 0.10.11
- Fix Github Actions running twice on PRs from `com-lihaoyi` branches
  • Loading branch information
lolgab authored Mar 16, 2023
1 parent ae2ba2f commit 799ac40
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 17 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: ci

on:
push:
branches:
- master
pull_request:
branches:
- master
Expand Down
2 changes: 1 addition & 1 deletion .mill-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.10.5
0.10.11
26 changes: 10 additions & 16 deletions build.sc
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
import mill._, scalalib._, scalajslib._, scalanativelib._, publish._
import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.1.4`
import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.3.0`
import de.tobiasroeser.mill.vcs.version.VcsVersion
import $ivy.`com.github.lolgab::mill-mima::0.0.10`
import $ivy.`com.github.lolgab::mill-mima::0.0.13`
import com.github.lolgab.mill.mima._
import mill.scalalib.api.Util.isScala3

val communityBuildDottyVersion = sys.props.get("dottyVersion").toList

val scala211 = "2.11.12"
val scala212 = "2.12.16"
val scala213 = "2.13.8"
val scala212 = "2.12.17"
val scala213 = "2.13.10"
val scala3 = "3.1.3"

val scalaVersions = scala3 :: scala213 :: scala212 :: scala211 :: communityBuildDottyVersion
val scalaVersions = scala3 :: scala213 :: scala212 :: communityBuildDottyVersion

val scalaJSVersions = scalaVersions.map((_, "1.10.1"))
val scalaNativeVersions = scalaVersions.map((_, "0.4.5"))
val scalaJSVersions = scalaVersions.map((_, "1.13.0"))
val scalaNativeVersions = scalaVersions.map((_, "0.4.10"))

trait MimaCheck extends Mima {
def mimaPreviousVersions = VcsVersion.vcsState().lastTag.toSeq
Expand All @@ -25,11 +24,6 @@ object castor extends Module {
abstract class ActorModule(crossVersion: String) extends CrossScalaModule with PublishModule with MimaCheck {
def publishVersion = VcsVersion.vcsState().format()

// Temporary until the next version of Mima gets released with
// https://github.com/lightbend/mima/issues/693 included in the release.
def mimaPreviousArtifacts =
if(isScala3(crossVersion)) Agg.empty[Dep] else super.mimaPreviousArtifacts()

def crossScalaVersion = crossVersion
def pomSettings = PomSettings(
description = artifactName(),
Expand All @@ -51,15 +45,15 @@ object castor extends Module {
millSourcePath / s"src-$platformSegment"
)

def ivyDeps = Agg(ivy"com.lihaoyi::sourcecode::0.2.8")
def ivyDeps = Agg(ivy"com.lihaoyi::sourcecode::0.3.0")
}
trait ActorTestModule extends ScalaModule with TestModule.Utest {
def platformSegment: String
def sources = T.sources(
millSourcePath / "src",
millSourcePath / s"src-$platformSegment"
)
def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.8.0")
def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.8.1")
}

object js extends Cross[ActorJsModule](scalaJSVersions:_*)
Expand All @@ -81,7 +75,7 @@ object castor extends Module {
object test extends Tests with ActorTestModule{
def platformSegment: String = "jvm"
def ivyDeps = super.ivyDeps() ++ Agg(
ivy"com.lihaoyi::os-lib:0.8.1"
ivy"com.lihaoyi::os-lib:0.9.1"
)
}
}
Expand Down

0 comments on commit 799ac40

Please sign in to comment.