Update to the latest standard (#528)

.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'

.github/renovate.json

@@ -0,0 +1,13 @@
+{
+  "automerge": true,
+  "rebaseWhen": "conflicted",
+  "labels": ["type: dependencies"],
+  "packageRules": [
+    {
+      "matchManagers": [
+        "sbt"
+      ],
+      "enabled": false
+    }
+  ]
+}

.github/workflows/auto-approve.yml

@@ -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 }}"

.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:
@@ -22,7 +26,7 @@ jobs:
       - name: Cache scala dependencies
         uses: coursier/cache-action@v6
       - name: Lint code
-        run: sbt checkAll
+        run: sbt check
 
   mdoc:
     runs-on: ubuntu-20.04
@@ -44,7 +48,8 @@ jobs:
       fail-fast: false
       matrix:
         java: ['[email protected]', '[email protected]']
-        scala: ['2.11.12', '2.12.13', '2.13.2', '3.0.0-RC1']
+        scala: ['2.11.12', '2.12.13', '2.13.5', '3.0.0-RC3']
+        platform: ['JVM']
     steps:
       - name: Checkout current branch
         uses: actions/[email protected]
@@ -56,18 +61,15 @@ jobs:
           java-version: ${{ matrix.java }}
       - name: Cache scala dependencies
         uses: coursier/cache-action@v6
-      - name: Run tests (2.11)
-        if: ${{ startsWith(matrix.scala, '2.11') }}
-        run: sbt ++${{ matrix.scala }}! root2-11/test
-      - name: Run tests (2.12)
-        if: ${{ startsWith(matrix.scala, '2.12') }}
-        run: sbt ++${{ matrix.scala }}! root2-12/test
-      - name: Run tests (2.13)
-        if: ${{ startsWith(matrix.scala, '2.13') }}
-        run: sbt ++${{ matrix.scala }}! root2-13/test
-      - name: Run tests (3.x)
-        if: ${{ startsWith(matrix.scala, '3') }}
-        run: sbt ++${{ matrix.scala }}! root3/test
+      - name: Run tests
+        if: ${{ !startsWith(matrix.scala, '3.0.') && !startsWith(matrix.scala, '2.11.') }}
+        run: sbt ++${{ matrix.scala }}! test${{ matrix.platform }}
+      - name: Run 2.11 tests
+        if: ${{ startsWith(matrix.scala, '2.11.') }}
+        run: sbt ++${{ matrix.scala }}! test${{ matrix.platform }}211
+      - name: Run dotty tests
+        if: ${{ startsWith(matrix.scala, '3.0.') && matrix.platform == 'JVM' }}
+        run: sbt ++${{ matrix.scala }}! testDotty
 
   ci:
     runs-on: ubuntu-20.04

.github/workflows/site.yml

@@ -17,4 +17,4 @@ jobs:
       - uses: olafurpg/setup-scala@v10
       - run: sbt docs/docusaurusPublishGhpages
         env:
-          GIT_DEPLOY_KEY: ${{ secrets.GIT_DEPLOY_KEY }}
+          GIT_DEPLOY_KEY: ${{ secrets.GIT_DEPLOY_KEY }}

.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-config"]
+      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

.nvmrc

@@ -1 +1 @@
-v10.8.0
+14.16.1

.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
+}

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = "2.2.1"
+version = "2.7.5"
 maxColumn = 120
 align = most
 continuationIndent.defnSite = 2
@@ -7,12 +7,9 @@ docstrings = JavaDoc
 lineEndings = preserve
 includeCurlyBraceInSelectChains = false
 danglingParentheses = true
-spaces {
-  inImportCurlyBraces = true
-}
 optIn.annotationNewlines = true
 
-rewrite.rules = [SortImports, RedundantBraces]
+rewrite.rules = [RedundantBraces]
 project.excludeFilters = [
   "core/src/main/scala/zio/config/ProductBuilder.scala",
   "core/src/test/scala/zio/config/ProductBuilderTest.scala"