renovate things (requires Java 11) (#241)

lightbend · Dec 22, 2022 · 9831a32 · 9831a32
1 parent fd93747
commit 9831a32
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,9 +9,9 @@ name: Continuous Integration
 
 on:
   pull_request:
-    branches: [master]
+    branches: [main]
   push:
-    branches: [master]
+    branches: [main]
     tags: [v*]
 
 env:
@@ -24,20 +24,20 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.12.17]
-        java: [temurin@8]
+        java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Setup Java (temurin@8)
-        if: matrix.java == 'temurin@8'
+      - name: Setup Java (temurin@11)
+        if: matrix.java == 'temurin@11'
         uses: actions/setup-java@v2
         with:
           distribution: temurin
-          java-version: 8
+          java-version: 11
 
       - name: Cache sbt
         uses: actions/cache@v2
@@ -74,20 +74,20 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.12.17]
-        java: [temurin@8]
+        java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Setup Java (temurin@8)
-        if: matrix.java == 'temurin@8'
+      - name: Setup Java (temurin@11)
+        if: matrix.java == 'temurin@11'
         uses: actions/setup-java@v2
         with:
           distribution: temurin
-          java-version: 8
+          java-version: 11
 
       - name: Cache sbt
         uses: actions/cache@v2

diff --git a/build.sbt b/build.sbt
@@ -3,7 +3,7 @@ import scala.collection.JavaConverters._
 ThisBuild / scalaVersion := "2.12.17"
 
 sbtPlugin        := true
-crossSbtVersions := List("1.0.0")
+crossSbtVersions := List("1.4.9")
 organization     := "com.lightbend.paradox"
 name             := "sbt-paradox-apidoc"
 
@@ -59,7 +59,7 @@ ThisBuild / pomIncludeRepository   := (_ => false)
 sonatypeProfileName                := "com.lightbend"
 
 ThisBuild / githubWorkflowJavaVersions := List(
-  JavaSpec.temurin("8")
+  JavaSpec.temurin("11")
 )
 
-ThisBuild / githubWorkflowTargetBranches := Seq("master")
+ThisBuild / githubWorkflowTargetBranches := Seq("main")
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -1,8 +1,8 @@
 import sbt._
 
 object Library {
-  val classgraph     = "io.github.classgraph"   % "classgraph"  % "4.8.150"
-  val sbtParadox     = "com.lightbend.paradox"  % "sbt-paradox" % "0.9.2"
+  val classgraph     = "io.github.classgraph"   % "classgraph"  % "4.8.153"
+  val sbtParadox     = "com.lightbend.paradox"  % "sbt-paradox" % "0.10.3"
   val scalatest      = "org.scalatest"         %% "scalatest"   % "3.2.14"
-  val paradoxTestkit = "com.lightbend.paradox" %% "testkit"     % "0.9.2"
+  val paradoxTestkit = "com.lightbend.paradox" %% "testkit"     % "0.10.3"
 }
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.5.7
+sbt.version=1.7.3
diff --git a/src/main/scala/com/lightbend/paradox/apidoc/ApidocPlugin.scala b/src/main/scala/com/lightbend/paradox/apidoc/ApidocPlugin.scala
@@ -49,7 +49,7 @@ object ApidocPlugin extends AutoPlugin {
       paradoxDirectives ++= Def.taskDyn {
         val classLoader = new java.net.URLClassLoader(apidocClasses.value.toArray, this.getClass.getClassLoader)
         val scanner = new ClassGraph()
-          .whitelistPackages(apidocRootPackage.value)
+          .acceptPackages(apidocRootPackage.value)
           .addClassLoader(classLoader)
           .enableMethodInfo()
           .scan()