Skip to content

Commit b21860f

Browse files
japgollyjapgolly
committed
Merge branch 'master' into imageCapture
2 parents 37c1412 + 30d0e6b commit b21860f

File tree

114 files changed

+76074
-27156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+76074
-27156
lines changed

‎.github/dependabot.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
version: 2
2+
updates:
3+
4+
- package-ecosystem: github-actions
5+
directory: "/"
6+
schedule:
7+
interval: daily
8+
open-pull-requests-limit: 10
9+

‎.github/pull_request_template.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Hi there!
2+
3+
Before submitting a PR containing any Scala changes, please make sure you...
4+
5+
* run `sbt prePR`
6+
* commit changes to `api-reports`
7+
8+
Thanks for contributing!

‎.github/release-drafter.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name-template: 'v$NEXT_PATCH_VERSION'
2+
tag-template: 'v$NEXT_PATCH_VERSION'
3+
template: |
4+
# What's Changed
5+
$CHANGES
6+
categories:
7+
- title: 'New'
8+
label: 'type: feature'
9+
- title: 'Bug Fixes'
10+
label: 'type: bug'
11+
- title: 'Maintenance'
12+
label: 'type: maintenance'
13+
- title: 'Documentation'
14+
label: 'type: docs'
15+
- title: 'Dependency Updates'
16+
label: 'type: dependencies'

‎.github/workflows/ci.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: CI
2+
3+
on:
4+
pull_request:
5+
push:
6+
tags-ignore:
7+
- v*
8+
9+
jobs:
10+
11+
build:
12+
runs-on: ubuntu-latest
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
scalaversion: ["2.11.12", "2.12.14", "2.13.6", "3.0.2"]
17+
steps:
18+
19+
- uses: actions/checkout@v2
20+
21+
- name: Setup Scala
22+
uses: japgolly/[email protected]
23+
24+
- name: Build and test
25+
run: sbt -DCI=1 "++${{ matrix.scalaversion }}" test package doc
26+
27+
- name: Validate formatting
28+
run: sbt -DCI=1 "++${{ matrix.scalaversion }}" dom/scalafmtCheck
29+
30+
- name: Validate api report
31+
if: matrix.scalaversion != '2.11.12' && matrix.scalaversion != '3.0.2'
32+
run: ./api-reports/validate "${{ matrix.scalaversion }}"
33+
34+
readme:
35+
runs-on: ubuntu-latest
36+
steps:
37+
- uses: actions/checkout@v2
38+
- uses: japgolly/[email protected]
39+
- name: Readme generation
40+
run: sbt readme/run

‎.github/workflows/ghpages.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
2+
name: Build and Deploy GhPages docs
3+
4+
on:
5+
push:
6+
branches:
7+
- master
8+
9+
jobs:
10+
build-and-deploy:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v2
14+
15+
- name: Setup Scala
16+
uses: japgolly/[email protected]
17+
18+
- name: Build
19+
run: sbt readme/run
20+
21+
- name: Deploy
22+
uses: JamesIves/[email protected]
23+
with:
24+
token: ${{ secrets.GITHUB_TOKEN }}
25+
branch: gh-pages
26+
folder: readme/target/scalatex

‎.github/workflows/release-drafter.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Release Drafter
2+
3+
on:
4+
push:
5+
# branches to consider in the event; optional, defaults to all
6+
branches:
7+
- master
8+
- series/1.x
9+
10+
jobs:
11+
update_release_draft:
12+
runs-on: ubuntu-latest
13+
steps:
14+
# Drafts your next Release notes as Pull Requests are merged into "master"
15+
- uses: release-drafter/release-drafter@v5
16+
env:
17+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/release.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Release
2+
on:
3+
push:
4+
branches: ["master"]
5+
tags: ["v*"]
6+
jobs:
7+
publish:
8+
runs-on: ubuntu-latest
9+
steps:
10+
11+
- uses: actions/checkout@v2
12+
with:
13+
fetch-depth: 0
14+
15+
- name: Setup Scala
16+
uses: japgolly/[email protected]
17+
18+
- name: Release
19+
run: sbt ci-release
20+
env:
21+
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
22+
PGP_SECRET: ${{ secrets.PGP_SECRET }}
23+
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
24+
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}

‎.gitignore

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
target/
1+
.bloop
2+
.bsp
23
.cache
34
.classpath
5+
.idea
6+
.idea_modules
7+
.metals
48
.project
9+
.sbtboot
510
.settings/
6-
.idea
7-
.idea_modules
11+
.vscode
12+
metals.sbt
13+
target/

‎.scala-steward.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
updates.ignore = [
2+
{ groupId = "org.scala-lang", artifactId = "scala-library" }
3+
]

‎.scalafix.conf

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
rules = [
2+
ExplicitResultTypes,
3+
OrganizeImports,
4+
RemoveUnused,
5+
GenerateApiReport,
6+
]
7+
8+
RemoveUnused {
9+
imports = false
10+
privates = true
11+
locals = true
12+
}
13+
14+
OrganizeImports {
15+
expandRelative = true
16+
groupedImports = Merge
17+
groupExplicitlyImportedImplicitsSeparately = false
18+
groups = ["*"]
19+
importSelectorsOrder = Ascii
20+
removeUnused = true
21+
}

0 commit comments

Comments
 (0)