Skip to content

Commit 2203dc6

Browse files
authored
deps: update all sorts of stuff (#82)
* deps: update all sorts of stuff This pr goes through and makes the various updates: - Bumps mill to the latest 0.10.5 - Bumps to the latest Scala versions for 2 and latest 3.1.x version - Drops 0.x support for ScalaJS - Move Scala native to 0.4.x - Adds in dependabot - Starts to cross test on 8 and 17 - Updates checkout and java actions * add issue filter for StringPrefix.apply * dep: update utest to 0.8.0
1 parent 2cd41af commit 2203dc6

File tree

6 files changed

+43
-32
lines changed

6 files changed

+43
-32
lines changed

.github/dependabot.yml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 2
2+
updates:
3+
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
interval: "monthly"

.github/workflows/actions.yml

+14-8
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,27 @@ on:
1313
jobs:
1414
test:
1515
runs-on: ubuntu-latest
16+
strategy:
17+
matrix:
18+
java: ['8', '17']
1619
steps:
17-
- uses: actions/checkout@v2
18-
- uses: actions/setup-java@v1
20+
- uses: actions/checkout@v3
21+
- uses: actions/setup-java@v3
1922
with:
20-
java-version: 8
23+
distribution: 'temurin'
24+
java-version: ${{ matrix.java }}
2125
- name: Run tests
2226
run: ./mill -i all __.publishArtifacts __.test
27+
2328
check-binary-compatibility:
2429
runs-on: ubuntu-latest
2530
steps:
26-
- uses: actions/checkout@v2
31+
- uses: actions/checkout@v3
2732
with:
2833
fetch-depth: 0
29-
- uses: actions/setup-java@v1
34+
- uses: actions/setup-java@v3
3035
with:
36+
distribution: 'temurin'
3137
java-version: 8
3238
- name: Check Binary Compatibility
3339
run: ./mill -i __.mimaReportBinaryIssues
@@ -45,9 +51,10 @@ jobs:
4551
LC_MESSAGES: "en_US.UTF-8"
4652
LC_ALL: "en_US.UTF-8"
4753
steps:
48-
- uses: actions/checkout@v2
49-
- uses: actions/setup-java@v1
54+
- uses: actions/checkout@v3
55+
- uses: actions/setup-java@v3
5056
with:
57+
distribution: 'temurin'
5158
java-version: 8
5259
- name: Publish to Maven Central
5360
run: |
@@ -72,5 +79,4 @@ jobs:
7279
with:
7380
tag_name: ${{ github.ref }}
7481
release_name: ${{ github.ref }}
75-
body:
7682
draft: false

.mill-version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.10.5

build.sc

+19-22
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,16 @@ import mill._, scalalib._, scalajslib._, scalanativelib._, publish._
22
import mill.scalalib.api.Util.isScala3
33
import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.1.4`
44
import de.tobiasroeser.mill.vcs.version.VcsVersion
5-
import $ivy.`com.github.lolgab::mill-mima::0.0.9`
5+
import $ivy.`com.github.lolgab::mill-mima::0.0.11`
66
import com.github.lolgab.mill.mima._
77

8-
val dottyVersions = sys.props.get("dottyVersion").toList
8+
val dottyCommunityBuildVersion = sys.props.get("dottyVersion").toList
99

10-
val scala2VersionsAndDotty = "2.12.13" :: "2.13.4" :: "2.11.12" :: dottyVersions
11-
val scala30 = "3.0.2"
12-
val scala31 = "3.1.1"
10+
val scalaVersions =
11+
"2.12.16" :: "2.13.8" :: "2.11.12" :: "3.1.3" :: dottyCommunityBuildVersion
1312

14-
val scalaJSVersions = for {
15-
scalaV <- scala30 :: scala2VersionsAndDotty
16-
scalaJSV <- Seq("0.6.33", "1.5.1")
17-
if scalaV.startsWith("2.") || scalaJSV.startsWith("1.")
18-
} yield (scalaV, scalaJSV)
19-
20-
val scalaNativeVersions = for {
21-
scalaV <- scala31 :: scala2VersionsAndDotty
22-
scalaNativeV <- Seq("0.4.4")
23-
} yield (scalaV, scalaNativeV)
13+
val scalaJSVersions = scalaVersions.map((_, "1.10.1"))
14+
val scalaNativeVersions = scalaVersions.map((_, "0.4.5"))
2415

2516
trait PPrintModule extends PublishModule with Mima {
2617
def artifactName = "pprint"
@@ -29,10 +20,17 @@ trait PPrintModule extends PublishModule with Mima {
2920

3021
def mimaPreviousVersions = VcsVersion.vcsState().lastTag.toSeq
3122

23+
def crossScalaVersion: String
24+
25+
// Temporary until the next version of Mima gets released with
26+
// https://github.com/lightbend/mima/issues/693 included in the release.
27+
def mimaPreviousArtifacts =
28+
if(isScala3(crossScalaVersion)) Agg.empty[Dep] else super.mimaPreviousArtifacts()
29+
3230
def pomSettings = PomSettings(
3331
description = artifactName(),
3432
organization = "com.lihaoyi",
35-
url = "https://github.com/lihaoyi/PPrint",
33+
url = "https://github.com/com-lihaoyi/PPrint",
3634
licenses = Seq(License.MIT),
3735
versionControl = VersionControl.github(
3836
owner = "com-lihaoyi",
@@ -46,8 +44,8 @@ trait PPrintModule extends PublishModule with Mima {
4644
trait PPrintMainModule extends CrossScalaModule {
4745
def millSourcePath = super.millSourcePath / offset
4846
def ivyDeps = Agg(
49-
ivy"com.lihaoyi::fansi::0.3.1",
50-
ivy"com.lihaoyi::sourcecode::0.2.8"
47+
ivy"com.lihaoyi::fansi::0.4.0",
48+
ivy"com.lihaoyi::sourcecode::0.3.0"
5149
)
5250
def compileIvyDeps =
5351
if (crossScalaVersion.startsWith("2")) Agg(
@@ -70,7 +68,7 @@ trait PPrintMainModule extends CrossScalaModule {
7068

7169
trait PPrintTestModule extends ScalaModule with TestModule.Utest {
7270
def crossScalaVersion: String
73-
def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.7.11")
71+
def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.8.0")
7472
def offset: os.RelPath = os.rel
7573
def millSourcePath = super.millSourcePath / os.up
7674

@@ -88,7 +86,7 @@ trait PPrintTestModule extends ScalaModule with TestModule.Utest {
8886
}
8987

9088
object pprint extends Module {
91-
object jvm extends Cross[JvmPPrintModule](scala30 :: scala2VersionsAndDotty:_*)
89+
object jvm extends Cross[JvmPPrintModule](scalaVersions:_*)
9290
class JvmPPrintModule(val crossScalaVersion: String)
9391
extends PPrintMainModule with ScalaModule with PPrintModule {
9492
object test extends Tests with PPrintTestModule{
@@ -99,6 +97,7 @@ object pprint extends Module {
9997
object js extends Cross[JsPPrintModule](scalaJSVersions:_*)
10098
class JsPPrintModule(val crossScalaVersion: String, crossJSVersion: String)
10199
extends PPrintMainModule with ScalaJSModule with PPrintModule {
100+
102101
def offset = os.up
103102
def scalaJSVersion = crossJSVersion
104103
object test extends Tests with PPrintTestModule{
@@ -112,8 +111,6 @@ object pprint extends Module {
112111
extends PPrintMainModule with ScalaNativeModule with PPrintModule {
113112
def offset = os.up
114113
def scalaNativeVersion = crossScalaNativeVersion
115-
// Remove after Scala Native Scala 3 artifacts are published
116-
def mimaPreviousArtifacts = T{ if(isScala3(scalaVersion())) Seq() else super.mimaPreviousArtifacts() }
117114
object test extends Tests with PPrintTestModule{
118115
def offset = os.up
119116
val crossScalaVersion = NativePPrintModule.this.crossScalaVersion

mill

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This is a wrapper script, that automatically download mill from GitHub release pages
44
# You can give the required mill version with MILL_VERSION env variable
55
# If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
6-
DEFAULT_MILL_VERSION=0.10.0-35-11bc3c
6+
DEFAULT_MILL_VERSION=0.10.5
77

88
set -e
99

pprint/src-2.13/pprint/StringPrefix.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ package pprint
22

33
object StringPrefix{
44
def apply(i: Iterable[_]) = i.asInstanceOf[{ def collectionClassName: String }].collectionClassName
5-
}
5+
}

0 commit comments

Comments
 (0)