Skip to content

Commit 47f77e8

Browse files
authored
Merge pull request #152 from scala/bye-bye-travisci
2 parents 0a3edd6 + 124b52d commit 47f77e8

File tree

7 files changed

+53
-87
lines changed

7 files changed

+53
-87
lines changed

.github/workflows/ci.yml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: test
2+
on:
3+
push:
4+
branches:
5+
- main
6+
pull_request:
7+
jobs:
8+
test:
9+
strategy:
10+
fail-fast: false
11+
matrix:
12+
java: [8, 11, 17]
13+
scala: [2.13.6]
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v2
17+
with:
18+
fetch-depth: 0
19+
- uses: coursier/cache-action@v6
20+
- uses: actions/setup-java@v2
21+
with:
22+
distribution: adopt
23+
java-version: ${{matrix.java}}
24+
- name: Test
25+
run: sbt ++${{matrix.scala}} test package

.github/workflows/release.yml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Release
2+
on:
3+
push:
4+
tags: ["*"]
5+
jobs:
6+
publish:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
with:
11+
fetch-depth: 0
12+
- uses: actions/setup-java@v2
13+
with:
14+
distribution: adopt
15+
java-version: 8
16+
- run: sbt versionCheck ci-release
17+
env:
18+
PGP_PASSPHRASE: ${{secrets.PGP_PASSPHRASE}}
19+
PGP_SECRET: ${{secrets.PGP_SECRET}}
20+
SONATYPE_PASSWORD: ${{secrets.SONATYPE_PASSWORD}}
21+
SONATYPE_USERNAME: ${{secrets.SONATYPE_USERNAME}}

.travis.yml

-23
This file was deleted.

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# scala-collection-contrib
22

3-
[<img src="https://travis-ci.org/scala/scala-collection-contrib.svg?branch=master"/>](https://travis-ci.org/scala/scala-collection-contrib)
43
[<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-collection-contrib_2.13.svg?label=scala+2.13"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-collection-contrib_2.13)
54

65
This module provides various additions to the Scala 2.13 standard collections.

build.sbt

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
ThisBuild / scalaVersion := "2.13.6"
2+
13
lazy val root = project.in(file("."))
24
.aggregate(collectionContrib.jvm, collectionContrib.js)
35
.settings(
@@ -16,9 +18,9 @@ lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform)
1618
versionPolicyIntention := Compatibility.BinaryCompatible,
1719
scalaModuleAutomaticModuleName := Some("scala.collection.contrib"),
1820
scalacOptions ++= Seq("-opt-warnings", "-language:higherKinds", "-deprecation", "-feature", "-Xfatal-warnings"),
19-
scalacOptions in (Compile, doc) ++= Seq("-implicits", "-groups"),
21+
Compile / doc / scalacOptions ++= Seq("-implicits", "-groups"),
2022
testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v", "-s", "-a"),
21-
parallelExecution in Test := false, // why?
23+
Test / parallelExecution := false, // why?
2224
libraryDependencies ++= Seq(
2325
"junit" % "junit" % "4.13.2" % Test,
2426
"com.novocode" % "junit-interface" % "0.11" % Test,
@@ -27,7 +29,7 @@ lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform)
2729
.jsEnablePlugins(ScalaJSJUnitPlugin)
2830
.jsSettings(
2931
// Scala.js cannot run forked tests
30-
fork in Test := false
32+
Test / fork := false
3133
)
3234

3335
lazy val collectionContribJVM = collectionContrib.jvm

build.sh

-54
This file was deleted.

project/plugins.sbt

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
val scalaJSVersion =
2-
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.7.0")
3-
4-
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.4.0")
5-
1+
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.0.0")
62
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0")
7-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
3+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.0")

0 commit comments

Comments
 (0)