Skip to content

Commit 7cec300

Browse files
committed
in with GitHub Actions, out with Travis-CI
1 parent fdc2b8a commit 7cec300

File tree

11 files changed

+98
-80
lines changed

11 files changed

+98
-80
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-ea]
13+
scala: [2.11.12, 2.12.15, 2.13.6, 3.0.2]
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 headerCheck 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

-25
This file was deleted.

README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# scala-java8-compat [![Build Status](https://travis-ci.org/scala/scala-java8-compat.svg?branch=master)](https://travis-ci.org/scala/scala-java8-compat) [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-java8-compat_2.11.svg?label=latest%20release%20for%202.11"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-java8-compat_2.11) [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-java8-compat_2.12.svg?label=latest%20release%20for%202.12"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-java8-compat_2.12) [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-java8-compat_2.13.svg?label=latest%20release%20for%202.13"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-java8-compat_2.13)
2-
1+
# scala-java8-compat [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-java8-compat_2.11.svg?label=latest%20release%20for%202.11"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-java8-compat_2.11) [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-java8-compat_2.12.svg?label=latest%20release%20for%202.12"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-java8-compat_2.12) [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-java8-compat_2.13.svg?label=latest%20release%20for%202.13"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-java8-compat_2.13) [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-java8-compat_3.svg?label=latest%20release%20for%203"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-java8-compat_3)
32

43
A Java 8 compatibility kit for Scala 2.12 and 2.11.
54

build.sbt

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ def osgiExport(scalaVersion: String, version: String) = {
1919
}
2020

2121
lazy val commonSettings = Seq(
22+
crossScalaVersions := Seq("2.13.6", "2.12.15", "2.11.12", "3.0.2"),
23+
scalaVersion := crossScalaVersions.value.head,
2224
versionPolicyIntention := Compatibility.BinaryAndSourceCompatible,
2325
Compile / unmanagedSourceDirectories ++= {
2426
(Compile / unmanagedSourceDirectories).value.flatMap { dir =>
@@ -44,7 +46,6 @@ lazy val fnGen = (project in file("fnGen"))
4446
.settings(commonSettings)
4547
.settings(
4648
crossScalaVersions := Seq("2.12.14"),
47-
scalaVersion := crossScalaVersions.value.head,
4849
run / fork := true, // Needed if you run this project directly
4950
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
5051
libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value

build.sh

-51
This file was deleted.

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.4.0")
1+
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.0.0")

src/main/scala-2.13+/scala/compat/java8/collectionImpl/package.scala

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
12+
113
package scala.compat.java8
214

315
package object collectionImpl {

src/main/scala-2.13+/scala/compat/java8/converterImpl/StepperExtensions.scala

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
12+
113
package scala.compat.java8.converterImpl
214

315
import scala.collection.convert.StreamExtensions.AccumulatorFactoryInfo

src/main/scala-2.13+/scala/concurrent/java8/FuturesConvertersImplCompat.scala

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
12+
113
package scala.concurrent.java8
214

315
import scala.concurrent.ExecutionContext

src/main/scala-2.13-/scala/concurrent/java8/FuturesConvertersImplCompat.scala

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
12+
113
package scala.concurrent.java8
214

315
import scala.concurrent.Future

0 commit comments

Comments
 (0)