Skip to content

Commit 2bda92d

Browse files
authored
Merge pull request #128 from cb372/sbt-1.8
2 parents 8185bdf + 3719a0d commit 2bda92d

File tree

8 files changed

+17
-15
lines changed

8 files changed

+17
-15
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
name: CI
2-
on: [push, pull_request]
2+
on:
3+
push:
4+
branches: [main]
5+
pull_request:
36

47
jobs:
58
build:
69
strategy:
710
fail-fast: false
811
matrix:
912
include:
10-
- sbt_version: 1.2.8
11-
test_groups: 'basic/*'
1213
- sbt_version: 1.3.13
13-
test_groups: 'basic/* 1.3+/*'
1414
- sbt_version: 1.4.0
15-
test_groups: 'basic/* 1.3+/*'
15+
- sbt_version: 1.8.3
1616

1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v2
20-
- uses: olafurpg/setup-scala@v10
21-
- uses: coursier/cache-action@v3
19+
- uses: actions/checkout@v3
20+
- uses: actions/setup-java@v3
21+
with:
22+
distribution: adopt
23+
java-version: 17
2224
- name: Test
23-
run: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M "^^${{ matrix.sbt_version }}" "scripted ${{ matrix.test_groups }}"
25+
run: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M "^^${{ matrix.sbt_version }}" "scripted basic/*"

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ import ReleaseTransformations._
22

33
enablePlugins(SbtPlugin)
44

5-
val latestSbt_1_2_x_version = "1.2.8"
65
val latestSbt_1_3_x_version = "1.3.13"
76
val latestSbt_1_4_x_version = "1.4.0"
7+
val latestSbt_1_8_x_version = "1.8.3"
88

99
crossSbtVersions := Seq(
10-
latestSbt_1_2_x_version,
1110
latestSbt_1_3_x_version,
12-
latestSbt_1_4_x_version
11+
latestSbt_1_4_x_version,
12+
latestSbt_1_8_x_version
1313
)
1414

15-
scalaVersion := "2.12.11"
15+
scalaVersion := "2.12.17"
1616
organization := "com.github.cb372"
1717
description := "An sbt plugin to check that your project does not directly depend on any transitive dependencies for compilation"
1818
homepage := Some(url("https://github.com/cb372/sbt-explicit-dependencies"))

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.3.13
1+
sbt.version=1.8.3

src/main/scala/explicitdeps/ExplicitDepsPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package explicitdeps
22

33
import sbt.Keys._
4-
import sbt._
4+
import sbt.{ScalaVersion => _, _}
55

66
object ExplicitDepsPlugin extends AutoPlugin {
77

0 commit comments

Comments
 (0)