Merge pull request #18 from gemini-hlsw/update/sbt-lucuma-lib-0.8.1

Update sbt-lucuma-lib to 0.8.1

.github/workflows/ci.yml

@@ -17,6 +17,7 @@ on:
 env:
   PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
   SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+  SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }}
   SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
   PGP_SECRET: ${{ secrets.PGP_SECRET }}
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -36,12 +37,21 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Download Java (temurin@17)
+        id: download-java-temurin-17
+        if: matrix.java == 'temurin@17'
+        uses: typelevel/download-java@v1
+        with:
+          distribution: temurin
+          java-version: 17
+
       - name: Setup Java (temurin@17)
         if: matrix.java == 'temurin@17'
         uses: actions/setup-java@v2
         with:
-          distribution: temurin
+          distribution: jdkfile
           java-version: 17
+          jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }}
 
       - name: Cache sbt
         uses: actions/cache@v2
@@ -60,11 +70,15 @@ jobs:
 
       - name: Check headers and formatting
         if: matrix.java == 'temurin@17'
-        run: sbt '++${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck lucumaScalafmtCheck
+        run: sbt '++${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck lucumaScalafmtCheck lucumaScalafixCheck
 
       - name: Test
         run: sbt '++${{ matrix.scala }}' test
 
+      - name: Check scalafix lints
+        if: matrix.java == 'temurin@17'
+        run: sbt '++${{ matrix.scala }}' 'scalafixAll --check'
+
       - name: Check binary compatibility
         if: matrix.java == 'temurin@17'
         run: sbt '++${{ matrix.scala }}' mimaReportBinaryIssues
@@ -95,12 +109,21 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Download Java (temurin@17)
+        id: download-java-temurin-17
+        if: matrix.java == 'temurin@17'
+        uses: typelevel/download-java@v1
+        with:
+          distribution: temurin
+          java-version: 17
+
       - name: Setup Java (temurin@17)
         if: matrix.java == 'temurin@17'
         uses: actions/setup-java@v2
         with:
-          distribution: temurin
+          distribution: jdkfile
           java-version: 17
+          jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }}
 
       - name: Cache sbt
         uses: actions/cache@v2
@@ -116,12 +139,12 @@ jobs:
 
       - name: Import signing key
         if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == ''
-        run: echo $PGP_SECRET | base64 -d | gpg --import
+        run: echo $PGP_SECRET | base64 -di | gpg --import
 
       - name: Import signing key and strip passphrase
         if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE != ''
         run: |
-          echo "$PGP_SECRET" | base64 -d > /tmp/signing-key.gpg
+          echo "$PGP_SECRET" | base64 -di > /tmp/signing-key.gpg
           echo "$PGP_PASSPHRASE" | gpg --pinentry-mode loopback --passphrase-fd 0 --import /tmp/signing-key.gpg
           (echo "$PGP_PASSPHRASE"; echo; echo) | gpg --command-fd 0 --pinentry-mode loopback --change-passphrase $(gpg --list-secret-keys --with-colons 2> /dev/null | grep '^sec:' | cut --delimiter ':' --fields 5 | tail -n 1)
 

.mergify.yml

@@ -1,10 +1,17 @@
+# This file was automatically generated by sbt-typelevel-mergify using the
+# mergifyGenerate task. You should add and commit this file to
+# your git repository. It goes without saying that you shouldn't edit
+# this file by hand! Instead, if you wish to make changes, you should
+# change your sbt build configuration to revise the mergify configuration
+# to meet your needs, then regenerate this file.
 
 pull_request_rules:
-  - name: automatically merge scala-steward's PRs
-    conditions:
-      - author=geminihlswadmin
-      - body~=labels:.*semver-patch.*
-      - status-success=build
-    actions:
-      merge:
-        method: merge
+- name: merge scala-steward's PRs
+  conditions:
+  - author=lucuma-steward
+  - or:
+    - body~=labels:.*early-semver-patch
+    - body~=labels:.*early-semver-minor
+  - status-success=Build and Test (ubuntu-latest, 2.13.8, temurin@17)
+  actions:
+    merge: {}

.scalafix-common.conf

@@ -0,0 +1,9 @@
+# This file was automatically generated by sbt-lucuma using the
+# lucumaScalafixGenerate task. You should add and commit this file to
+# your git repository. It goes without saying that you shouldn't edit
+# this file by hand! Instead, if you wish to make changes, you should
+# make a PR to sbt-lucuma.
+
+rules = [
+  OrganizeImports
+]

.scalafix.conf

@@ -0,0 +1 @@
+include ".scalafix-common.conf"

.scalafmt-common.conf

@@ -4,7 +4,7 @@
 # this file by hand! Instead, if you wish to make changes, you should
 # make a PR to sbt-lucuma.
 
-version = "3.3.3"
+version = "3.4.2"
 style = default
 
 runner.dialect = scala213source3

project/plugins.sbt

@@ -2,5 +2,5 @@ resolvers += Resolver.sonatypeRepo("snapshots")
 resolvers += MavenRepository("sonatype-s01-snapshots",
                              "https://s01.oss.sonatype.org/content/repositories/snapshots"
 )
-addSbtPlugin("edu.gemini"                  % "sbt-lucuma-lib" % "0.6-cde3ac9-SNAPSHOT")
+addSbtPlugin("edu.gemini"                  % "sbt-lucuma-lib" % "0.8.1")
 addSbtPlugin("org.scalablytyped.converter" % "sbt-converter"  % "1.0.0-beta36")

src/main/scala/lucuma/mousetrap/package.scala

@@ -5,11 +5,11 @@ package lucuma
 
 import japgolly.scalajs.react._
 import japgolly.scalajs.react.vdom.html_<^._
+import lucuma.mt.mousetrap.mod.ExtendedKeyboardEvent
 import react.common._
+
 import scala.scalajs.js
-import scala.scalajs.js.annotation.JSImport
 import scala.scalajs.js.JSConverters._
-import lucuma.mt.mousetrap.mod.ExtendedKeyboardEvent
 
 package object mousetrap {