Skip to content

Commit 9831a32

Browse files
authored
renovate things (requires Java 11) (#241)
1 parent fd93747 commit 9831a32

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ name: Continuous Integration
99

1010
on:
1111
pull_request:
12-
branches: [master]
12+
branches: [main]
1313
push:
14-
branches: [master]
14+
branches: [main]
1515
tags: [v*]
1616

1717
env:
@@ -24,20 +24,20 @@ jobs:
2424
matrix:
2525
os: [ubuntu-latest]
2626
scala: [2.12.17]
27-
java: [temurin@8]
27+
java: [temurin@11]
2828
runs-on: ${{ matrix.os }}
2929
steps:
3030
- name: Checkout current branch (full)
3131
uses: actions/checkout@v2
3232
with:
3333
fetch-depth: 0
3434

35-
- name: Setup Java (temurin@8)
36-
if: matrix.java == 'temurin@8'
35+
- name: Setup Java (temurin@11)
36+
if: matrix.java == 'temurin@11'
3737
uses: actions/setup-java@v2
3838
with:
3939
distribution: temurin
40-
java-version: 8
40+
java-version: 11
4141

4242
- name: Cache sbt
4343
uses: actions/cache@v2
@@ -74,20 +74,20 @@ jobs:
7474
matrix:
7575
os: [ubuntu-latest]
7676
scala: [2.12.17]
77-
java: [temurin@8]
77+
java: [temurin@11]
7878
runs-on: ${{ matrix.os }}
7979
steps:
8080
- name: Checkout current branch (full)
8181
uses: actions/checkout@v2
8282
with:
8383
fetch-depth: 0
8484

85-
- name: Setup Java (temurin@8)
86-
if: matrix.java == 'temurin@8'
85+
- name: Setup Java (temurin@11)
86+
if: matrix.java == 'temurin@11'
8787
uses: actions/setup-java@v2
8888
with:
8989
distribution: temurin
90-
java-version: 8
90+
java-version: 11
9191

9292
- name: Cache sbt
9393
uses: actions/cache@v2

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import scala.collection.JavaConverters._
33
ThisBuild / scalaVersion := "2.12.17"
44

55
sbtPlugin := true
6-
crossSbtVersions := List("1.0.0")
6+
crossSbtVersions := List("1.4.9")
77
organization := "com.lightbend.paradox"
88
name := "sbt-paradox-apidoc"
99

@@ -59,7 +59,7 @@ ThisBuild / pomIncludeRepository := (_ => false)
5959
sonatypeProfileName := "com.lightbend"
6060

6161
ThisBuild / githubWorkflowJavaVersions := List(
62-
JavaSpec.temurin("8")
62+
JavaSpec.temurin("11")
6363
)
6464

65-
ThisBuild / githubWorkflowTargetBranches := Seq("master")
65+
ThisBuild / githubWorkflowTargetBranches := Seq("main")

project/Dependencies.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import sbt._
22

33
object Library {
4-
val classgraph = "io.github.classgraph" % "classgraph" % "4.8.150"
5-
val sbtParadox = "com.lightbend.paradox" % "sbt-paradox" % "0.9.2"
4+
val classgraph = "io.github.classgraph" % "classgraph" % "4.8.153"
5+
val sbtParadox = "com.lightbend.paradox" % "sbt-paradox" % "0.10.3"
66
val scalatest = "org.scalatest" %% "scalatest" % "3.2.14"
7-
val paradoxTestkit = "com.lightbend.paradox" %% "testkit" % "0.9.2"
7+
val paradoxTestkit = "com.lightbend.paradox" %% "testkit" % "0.10.3"
88
}

project/build.properties

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

src/main/scala/com/lightbend/paradox/apidoc/ApidocPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ object ApidocPlugin extends AutoPlugin {
4949
paradoxDirectives ++= Def.taskDyn {
5050
val classLoader = new java.net.URLClassLoader(apidocClasses.value.toArray, this.getClass.getClassLoader)
5151
val scanner = new ClassGraph()
52-
.whitelistPackages(apidocRootPackage.value)
52+
.acceptPackages(apidocRootPackage.value)
5353
.addClassLoader(classLoader)
5454
.enableMethodInfo()
5555
.scan()

0 commit comments

Comments
 (0)