Merge pull request #40 from Dwolla/bintray

update dependencies and switch from bintray/travisci to sonatype/gith…

.github/workflows/ci.yml

@@ -0,0 +1,125 @@
+# This file was automatically generated by sbt-github-actions using the
+# githubWorkflowGenerate 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 workflow description
+# to meet your needs, then regenerate this file.
+
+name: Continuous Integration
+
+on:
+  pull_request:
+    branches: ['*']
+  push:
+    branches: ['*']
+    tags: [v*]
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  build:
+    name: Build and Test
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        scala: [2.13.5, 2.12.13]
+        java: [adopt@1.8, adopt@1.11]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout current branch (full)
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Setup Java and Scala
+        uses: olafurpg/setup-scala@v10
+        with:
+          java-version: ${{ matrix.java }}
+
+      - name: Cache sbt
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.sbt
+            ~/.ivy2/cache
+            ~/.coursier/cache/v1
+            ~/.cache/coursier/v1
+            ~/AppData/Local/Coursier/Cache/v1
+            ~/Library/Caches/Coursier/v1
+          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+
+      - name: Check that workflows are up to date
+        run: sbt ++${{ matrix.scala }} githubWorkflowCheck
+
+      - name: Build project
+        run: sbt ++${{ matrix.scala }} test
+
+      - name: Compress target directories
+        run: tar cf targets.tar target dto/target client/target project/target
+
+      - name: Upload target directories
+        uses: actions/upload-artifact@v2
+        with:
+          name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }}
+          path: targets.tar
+
+  publish:
+    name: Publish Artifacts
+    needs: [build]
+    if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        scala: [2.13.5]
+        java: [adopt@1.8]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout current branch (full)
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Setup Java and Scala
+        uses: olafurpg/setup-scala@v10
+        with:
+          java-version: ${{ matrix.java }}
+
+      - name: Cache sbt
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.sbt
+            ~/.ivy2/cache
+            ~/.coursier/cache/v1
+            ~/.cache/coursier/v1
+            ~/AppData/Local/Coursier/Cache/v1
+            ~/Library/Caches/Coursier/v1
+          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+
+      - name: Download target directories (2.13.5)
+        uses: actions/download-artifact@v2
+        with:
+          name: target-${{ matrix.os }}-2.13.5-${{ matrix.java }}
+
+      - name: Inflate target directories (2.13.5)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
+      - name: Download target directories (2.12.13)
+        uses: actions/download-artifact@v2
+        with:
+          name: target-${{ matrix.os }}-2.12.13-${{ matrix.java }}
+
+      - name: Inflate target directories (2.12.13)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
+      - env:
+          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
+          PGP_SECRET: ${{ secrets.PGP_SECRET }}
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+        run: sbt ++${{ matrix.scala }} ci-release

.github/workflows/clean.yml

@@ -0,0 +1,59 @@
+# This file was automatically generated by sbt-github-actions using the
+# githubWorkflowGenerate 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 workflow description
+# to meet your needs, then regenerate this file.
+
+name: Clean
+
+on: push
+
+jobs:
+  delete-artifacts:
+    name: Delete Artifacts
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - name: Delete artifacts
+        run: |
+          # Customize those three lines with your repository and credentials:
+          REPO=${GITHUB_API_URL}/repos/${{ github.repository }}
+
+          # A shortcut to call GitHub API.
+          ghapi() { curl --silent --location --user _:$GITHUB_TOKEN "$@"; }
+
+          # A temporary file which receives HTTP response headers.
+          TMPFILE=/tmp/tmp.$$
+
+          # An associative array, key: artifact name, value: number of artifacts of that name.
+          declare -A ARTCOUNT
+
+          # Process all artifacts on this repository, loop on returned "pages".
+          URL=$REPO/actions/artifacts
+          while [[ -n "$URL" ]]; do
+
+            # Get current page, get response headers in a temporary file.
+            JSON=$(ghapi --dump-header $TMPFILE "$URL")
+
+            # Get URL of next page. Will be empty if we are at the last page.
+            URL=$(grep '^Link:' "$TMPFILE" | tr ',' '\n' | grep 'rel="next"' | head -1 | sed -e 's/.*<//' -e 's/>.*//')
+            rm -f $TMPFILE
+
+            # Number of artifacts on this page:
+            COUNT=$(( $(jq <<<$JSON -r '.artifacts | length') ))
+
+            # Loop on all artifacts on this page.
+            for ((i=0; $i < $COUNT; i++)); do
+
+              # Get name of artifact and count instances of this name.
+              name=$(jq <<<$JSON -r ".artifacts[$i].name?")
+              ARTCOUNT[$name]=$(( $(( ${ARTCOUNT[$name]} )) + 1))
+
+              id=$(jq <<<$JSON -r ".artifacts[$i].id?")
+              size=$(( $(jq <<<$JSON -r ".artifacts[$i].size_in_bytes?") ))
+              printf "Deleting '%s' #%d, %'d bytes\n" $name ${ARTCOUNT[$name]} $size
+              ghapi -X DELETE $REPO/actions/artifacts/$id
+            done
+          done

README.md

@@ -1,7 +1,6 @@
 # scala-cloudflare
 
-[![Travis](https://img.shields.io/travis/Dwolla/scala-cloudflare.svg?style=flat-square)](https://travis-ci.org/Dwolla/scala-cloudflare)
-[![Bintray](https://img.shields.io/bintray/v/dwolla/maven/cloudflare-api-client.svg?style=flat-square)](https://bintray.com/dwolla/maven/cloudflare-api-client/view)
+![Dwolla/scala-cloudflare CI](https://github.com/Dwolla/scala-cloudflare/actions/workflows/ci.yml/badge.svg)
 [![license](https://img.shields.io/github/license/Dwolla/scala-cloudflare.svg?style=flat-square)]()
 
 A Scala library for interacting with Cloudflare's API v4.

build.sbt

@@ -1,63 +1,59 @@
 import Dependencies._
 
-lazy val buildSettings = Seq(
+inThisBuild(List(
   organization := "com.dwolla",
-  homepage := Some(url("https://github.com/Dwolla/scala-cloudflare")),
   description := "Scala library for the Cloudflare v4 API",
+  homepage := Some(url("https://github.com/Dwolla/scala-cloudflare")),
   licenses += ("MIT", url("http://opensource.org/licenses/MIT")),
+  developers := List(
+    Developer(
+      "bpholt",
+      "Brian Holt",
+      "bholt+github@dwolla.com",
+      url("https://dwolla.com")
+    ),
+    Developer(
+      "coreyjonoliver",
+      "Corey Oliver",
+      "corey@dwolla.com",
+      url("https://dwolla.com")
+    ),
+  ),
+  crossScalaVersions := Seq("2.13.5", "2.12.13"),
+  scalaVersion := crossScalaVersions.value.head,
   startYear := Option(2016),
-  addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.11.0" cross CrossVersion.full),
+  addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.11.3" cross CrossVersion.full),
   addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1"),
-  resolvers += Resolver.bintrayRepo("dwolla", "maven"),
-)
 
-lazy val releaseSettings = {
-  import ReleaseTransformations._
-  import sbtrelease.Version.Bump._
-  Seq(
-    releaseVersionBump := Minor,
-    releaseCrossBuild := true,
-    releaseCommitMessage :=
-      s"""${releaseCommitMessage.value}
-         |
-         |[ci skip]""".stripMargin,
-    releaseProcess := Seq[ReleaseStep](
-      checkSnapshotDependencies,
-      inquireVersions,
-      runClean,
-      releaseStepCommandAndRemaining("testOnly -- timefactor 10"),
-      setReleaseVersion,
-      commitReleaseVersion,
-      tagRelease,
-      publishArtifacts,
-      setNextVersion,
-      commitNextVersion,
-      pushChanges
+  githubWorkflowJavaVersions := Seq("adopt@1.8", "adopt@1.11"),
+  githubWorkflowTargetTags ++= Seq("v*"),
+  githubWorkflowPublishTargetBranches :=
+    Seq(RefPredicate.StartsWith(Ref.Tag("v"))),
+  githubWorkflowPublish := Seq(
+    WorkflowStep.Sbt(
+      List("ci-release"),
+      env = Map(
+        "PGP_PASSPHRASE" -> "${{ secrets.PGP_PASSPHRASE }}",
+        "PGP_SECRET" -> "${{ secrets.PGP_SECRET }}",
+        "SONATYPE_PASSWORD" -> "${{ secrets.SONATYPE_PASSWORD }}",
+        "SONATYPE_USERNAME" -> "${{ secrets.SONATYPE_USERNAME }}"
+      )
     )
-  )
-}
-
-lazy val bintraySettings = Seq(
-  bintrayVcsUrl := homepage.value.map(_.toString),
-  publishMavenStyle := true,
-  bintrayRepository := "maven",
-  bintrayOrganization := Option("dwolla"),
-  pomIncludeRepository := { _ => false },
-)
+  ),
+))
 
 lazy val dto = (project in file("dto"))
-  .settings(buildSettings ++ bintraySettings ++ releaseSettings: _*)
   .settings(
     name := "cloudflare-api-dto",
     libraryDependencies ++= circeAll,
   )
 
 lazy val client = (project in file("client"))
-  .settings(buildSettings ++ bintraySettings ++ releaseSettings ++ documentationSettings: _*)
+  .settings(documentationSettings: _*)
   .settings(
     name := "cloudflare-api-client",
     libraryDependencies ++= {
-      val http4sVersion = "0.21.0-M5"
+      val http4sVersion = "0.21.22"
       Seq(
         "org.http4s" %% "http4s-dsl",
         "org.http4s" %% "http4s-circe",
@@ -83,7 +79,7 @@ lazy val client = (project in file("client"))
           catsEffectLaws,
         ).map(_ % Test)
     },
-    scalacOptions in Test -= {
+    Test / scalacOptions -= {
       // Getting some spurious unreachable code warnings in 2.13 (see https://github.com/scala/bug/issues/11457)
       CrossVersion.partialVersion(scalaVersion.value) match {
         case Some((2, 13)) =>
@@ -96,16 +92,9 @@ lazy val client = (project in file("client"))
   .dependsOn(dto)
 
 lazy val scalaCloudflare = (project in file("."))
-  .settings(buildSettings ++ noPublishSettings ++ releaseSettings: _*)
+  .settings(publish / skip := true)
   .aggregate(dto, client)
 
-lazy val noPublishSettings = Seq(
-  publish := {},
-  publishLocal := {},
-  publishArtifact := false,
-  Keys.`package` := file(""),
-)
-
 val documentationSettings = Seq(
   autoAPIMappings := true,
   apiMappings ++= {

client/src/main/scala/com/dwolla/circe/NullAsEmptyListCodec.scala

@@ -15,6 +15,7 @@ trait NullAsEmptyListCodec {
         else Decoder.decodeList[A].tryDecode(c)
       case c: FailedCursor =>
         if (!c.incorrectFocus) Right(List.empty) else Left(DecodingFailure("List[A]", c.history))
+      case _ => super.tryDecode(c)
     }
   }
 }