Skip to content

renovate things (requires Java 11) #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ name: Continuous Integration

on:
pull_request:
branches: [master]
branches: [main]
push:
branches: [master]
branches: [main]
tags: [v*]

env:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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")
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
@@ -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"
}
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.7
sbt.version=1.7.3
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down