Skip to content

Commit

Permalink
Update to the latest standard (#258)
Browse files Browse the repository at this point in the history
  • Loading branch information
sideeffffect committed May 12, 2021
1 parent 6ca62f1 commit 27e4d07
Show file tree
Hide file tree
Showing 35 changed files with 601 additions and 232 deletions.
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
@@ -1,2 +1 @@
* @zio/zio-logging

47 changes: 32 additions & 15 deletions .github/release-drafter.yml
@@ -1,19 +1,36 @@
name-template: 'v$NEXT_PATCH_VERSION'
tag-template: 'v$NEXT_PATCH_VERSION'
name-template: 'v$RESOLVED_VERSION'
tag-template: 'v$RESOLVED_VERSION'
template: |
# What's Changed
$CHANGES
categories:
- title: '🚀 Features'
labels:
- 'feature'
- title: '🐛 Bug Fixes'
- title: 'Breaking'
label: 'type: breaking'
- title: 'New'
label: 'type: feature'
- title: 'Bug Fixes'
label: 'type: bug'
- title: 'Maintenance'
label: 'type: maintenance'
- title: 'Documentation'
label: 'type: docs'
- title: 'Dependency Updates'
label: 'type: dependencies'

version-resolver:
major:
labels:
- 'bug'
- title: '🧰 Maintenance'
- 'type: breaking'
minor:
labels:
- 'build'
- title: '🌱 Dependency Updates'
- 'type: feature'
patch:
labels:
- 'dependency-update'
change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
template: |
## Changes
$CHANGES
- 'type: bug'
- 'type: maintenance'
- 'type: docs'
- 'type: dependencies'
- 'type: security'

exclude-labels:
- 'skip-changelog'
13 changes: 13 additions & 0 deletions .github/renovate.json
@@ -0,0 +1,13 @@
{
"automerge": true,
"rebaseWhen": "conflicted",
"labels": ["type: dependencies"],
"packageRules": [
{
"matchManagers": [
"sbt"
],
"enabled": false
}
]
}
4 changes: 2 additions & 2 deletions .github/workflows/auto-approve.yml
Expand Up @@ -7,7 +7,7 @@ jobs:
auto-approve:
runs-on: ubuntu-20.04
steps:
- uses: hmarr/auto-approve-action@v2.0.0
if: github.actor == 'scala-steward'
- uses: hmarr/auto-approve-action@v2.1.0
if: github.actor == 'scala-steward' || github.actor == 'renovate[bot]'
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
49 changes: 37 additions & 12 deletions .github/workflows/ci.yml
@@ -1,5 +1,9 @@
name: CI

env:
JDK_JAVA_OPTIONS: -XX:+PrintCommandLineFlags # JDK_JAVA_OPTIONS is _the_ env. variable to use for modern Java
JVM_OPTS: -XX:+PrintCommandLineFlags # for Java 8 only (sadly, it is not modern enough for JDK_JAVA_OPTIONS)

on:
pull_request:
push:
Expand All @@ -11,8 +15,7 @@ on:
jobs:
lint:
runs-on: ubuntu-20.04
strategy:
fail-fast: false
timeout-minutes: 30
steps:
- name: Checkout current branch
uses: actions/checkout@v2.3.4
Expand All @@ -21,17 +24,31 @@ jobs:
- name: Setup Scala and Java
uses: olafurpg/setup-scala@v10
- name: Cache scala dependencies
uses: coursier/cache-action@v5
uses: coursier/cache-action@v6
- name: Lint code
run: sbt check
run: sbt check

mdoc:
runs-on: ubuntu-20.04
timeout-minutes: 60
steps:
- name: Checkout current branch
uses: actions/checkout@v2.3.4
- name: Setup Scala and Java
uses: olafurpg/setup-scala@v10
- name: Cache scala dependencies
uses: coursier/cache-action@v6
- name: Check Document Generation
run: sbt docs/mdoc

test:
runs-on: ubuntu-20.04
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
java: ['adopt@1.8', 'adopt@1.11']
scala: ['2.11.12', '2.12.13', '2.13.4', "3.0.0-RC1"]
scala: ['2.11.12', '2.12.13', '2.13.5', '3.0.0-RC3']
platform: ['JVM', 'JS']
steps:
- name: Checkout current branch
Expand All @@ -43,30 +60,38 @@ jobs:
with:
java-version: ${{ matrix.java }}
- name: Cache scala dependencies
uses: coursier/cache-action@v5
uses: coursier/cache-action@v6
- name: Run tests
if: matrix.scala != '3.0.0-RC1'
if: ${{ !startsWith(matrix.scala, '3.0.') }}
run: sbt ++${{ matrix.scala }}! test${{ matrix.platform }}
- name: Run dotty tests
if: matrix.scala == '3.0.0-RC1' && matrix.platform == 'JVM'
if: ${{ startsWith(matrix.scala, '3.0.') && matrix.platform == 'JVM' }}
run: sbt ++${{ matrix.scala }}! testJVM
- name: Compile additional subprojects
if: matrix.scala != '3.0.0-RC1'
if: ${{ !startsWith(matrix.scala, '3.0.') }}
run: sbt ++${{ matrix.scala }}! examples/compile docs/compile benchmarks/compile

ci:
runs-on: ubuntu-20.04
needs: [lint, mdoc, test]
steps:
- name: Report successful build
run: echo "ci passed"

publish:
runs-on: ubuntu-20.04
needs: [lint, test]
timeout-minutes: 30
needs: [ci]
if: github.event_name != 'pull_request'
steps:
- name: Checkout current branch
uses: actions/checkout@v2.3.4
with:
fetch-depth: 0
- name: Setup Scala and Java
- name: Setup Scala and Java
uses: olafurpg/setup-scala@v10
- name: Cache scala dependencies
uses: coursier/cache-action@v5
uses: coursier/cache-action@v6
- name: Release artifacts
run: sbt ci-release
env:
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/mdoc.yml → .github/workflows/site.yml
Expand Up @@ -3,15 +3,18 @@ name: Website
on:
push:
branches: [master]
tags: ["*"]
release:
types:
- published

jobs:
publish:
runs-on: ubuntu-20.04
timeout-minutes: 30
if: github.event_name != 'pull_request'
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v10
- uses: olafurpg/setup-gpg@v3
- run: sbt docs/docusaurusPublishGhpages
env:
GIT_DEPLOY_KEY: ${{ secrets.GIT_DEPLOY_KEY }}
26 changes: 26 additions & 0 deletions .mergify.yml
@@ -0,0 +1,26 @@
pull_request_rules:
- name: assign and label scala-steward's PRs
conditions:
- author=scala-steward
actions:
assign:
users: ["@zio/zio-logging"]
label:
add: ["type: dependencies"]
- name: label scala-steward's breaking PRs
conditions:
- author=scala-steward
- "body~=(labels: library-update, semver-major)|(labels: sbt-plugin-update, semver-major)"
actions:
label:
add: ["type: breaking"]
- name: merge Scala Steward's PRs
conditions:
- base=master
- author=scala-steward
- "body~=(labels: library-update, semver-minor)|(labels: library-update, semver-patch)|(labels: sbt-plugin-update, semver-minor)|(labels: sbt-plugin-update, semver-patch)|(labels: scalafix-rule-update)|(labels: test-library-update)"
- "status-success=license/cla"
- "status-success=ci"
actions:
merge:
method: squash
2 changes: 1 addition & 1 deletion .nvmrc
@@ -1 +1 @@
v10.8.0
14.16.1
1 change: 0 additions & 1 deletion .scala-steward.conf

This file was deleted.

27 changes: 27 additions & 0 deletions .scalafix.conf
@@ -0,0 +1,27 @@
rules = [
Disable
DisableSyntax
ExplicitResultTypes
LeakingImplicitClassVal
NoAutoTupling
NoValInForComprehension
OrganizeImports
ProcedureSyntax
RemoveUnused
]

Disable {
ifSynthetic = [
"scala/Option.option2Iterable"
"scala/Predef.any2stringadd"
]
}

OrganizeImports {
# Allign with IntelliJ IDEA so that they don't fight each other
groupedImports = Merge
}

RemoveUnused {
imports = false // handled by OrganizeImports
}
2 changes: 1 addition & 1 deletion .scalafmt.conf
Expand Up @@ -11,4 +11,4 @@ spaces {
}
optIn.annotationNewlines = true

rewrite.rules = [SortImports, RedundantBraces]
rewrite.rules = [RedundantBraces]
4 changes: 2 additions & 2 deletions benchmarks/src/main/scala/zio/logging/FilterBenchmarks.scala
Expand Up @@ -38,7 +38,7 @@ class FilterBenchmarks {
(handWrittenFilteredAppender >>> Logging.make).build.useNow
}

val filterTreeFunction =
val filterTreeFunction: (LogContext, => Any) => Boolean =
filterBy(LogLevel.Debug, "a.b.c" -> LogLevel.Info, "a.b.d" -> LogLevel.Warn, "e" -> LogLevel.Info)
val filterTreeAppender: ZLayer[Any, Nothing, Appender[String]] =
LogAppender
Expand Down Expand Up @@ -69,7 +69,7 @@ class FilterBenchmarks {
} yield logging
}

val names = List(
val names: List[List[String]] = List(
List("a"),
List("a", "b"),
List("a", "b", "c"),
Expand Down

0 comments on commit 27e4d07

Please sign in to comment.