update dependencies

.github/workflows/ci.yml

@@ -0,0 +1,41 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        scala:
+          - 2.13.5
+          - 2.12.13
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: coursier/cache-action@v5
+
+      - name: scala
+        uses: olafurpg/setup-scala@v10
+        with:
+          java-version: openjdk@1.11
+
+      - name: build ${{ matrix.scala }}
+        run: sbt ++${{ matrix.scala }} clean coverage test
+
+      - name: test coverage
+        if: success()
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+        run: sbt ++${{ matrix.scala }} coverageReport coverageAggregate coveralls
+
+      - name: slack
+        uses: homoluctus/slatify@master
+        if: failure() && github.ref == 'refs/heads/master'
+        with:
+          type: ${{ job.status }}
+          job_name: Build
+          url: ${{ secrets.SLACK_WEBHOOK }}

.gitignore

@@ -11,6 +11,7 @@ lib_managed/
 src_managed/
 project/boot/
 project/plugins/project/
+.bsp
 
 # Scala-IDE specific
 .scala_dependencies

README.md

@@ -1,4 +1,9 @@
-# Future Helper [![Build Status](https://travis-ci.org/evolution-gaming/future-helper.svg)](https://travis-ci.org/evolution-gaming/future-helper) [![Coverage Status](https://coveralls.io/repos/evolution-gaming/future-helper/badge.svg)](https://coveralls.io/r/evolution-gaming/future-helper) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/65bfcb6aeeb84f6b9ab01287e171acbd)](https://www.codacy.com/app/evolution-gaming/future-helper?utm_source=github.com&utm_medium=referral&utm_content=evolution-gaming/future-helper&utm_campaign=Badge_Grade) [ ![version](https://api.bintray.com/packages/evolutiongaming/maven/future-helper/images/download.svg) ](https://bintray.com/evolutiongaming/maven/future-helper/_latestVersion) [![License: MIT](https://img.shields.io/badge/License-MIT-yellowgreen.svg)](https://opensource.org/licenses/MIT)
+# Future Helper
+[![Build Status](https://github.com/evolution-gaming/future-helper/workflows/CI/badge.svg)](https://github.com/evolution-gaming/future-helper/actions?query=workflow%3ACI)
+[![Coverage Status](https://coveralls.io/repos/github/evolution-gaming/future-helper/badge.svg?branch=master)](https://coveralls.io/github/evolution-gaming/future-helper?branch=master)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/65bfcb6aeeb84f6b9ab01287e171acbd)](https://www.codacy.com/app/evolution-gaming/future-helper?utm_source=github.com&utm_medium=referral&utm_content=evolution-gaming/future-helper&utm_campaign=Badge_Grade)
+[![Version](https://img.shields.io/badge/version-click-blue)](https://evolution.jfrog.io/artifactory/api/search/latestVersion?g=com.evolutiongaming&a=future-helper_2.13&repos=public)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellowgreen.svg)](https://opensource.org/licenses/MIT)
 
 ### Single class library
 
@@ -7,7 +12,7 @@ See [FutureHelper.scala](src/main/scala/com/evolutiongaming/concurrent/FutureHel
 ## Setup
 
 ```scala
-resolvers += Resolver.bintrayRepo("evolutiongaming", "maven")
+addSbtPlugin("com.evolution" % "sbt-artifactory-plugin" % "0.0.2")
 
-libraryDependencies += "com.evolutiongaming" %% "future-helper" % "1.0.5"
+libraryDependencies += "com.evolutiongaming" %% "future-helper" % "1.0.7"
 ```

build.sbt

@@ -6,17 +6,15 @@ homepage := Some(new URL("http://github.com/evolution-gaming/future-helper"))
 
 startYear := Some(2018)
 
-organizationName := "Evolution Gaming"
+organizationName := "Evolution"
 
 organizationHomepage := Some(url("http://evolutiongaming.com"))
 
-bintrayOrganization := Some("evolutiongaming")
-
 scalaVersion := crossScalaVersions.value.head
 
-crossScalaVersions := Seq("2.13.1", "2.12.10")
+crossScalaVersions := Seq("2.13.5", "2.12.13")
 
-resolvers += Resolver.bintrayRepo("evolutiongaming", "maven")
+publishTo := Some(Resolver.evolutionReleases)
 
 libraryDependencies ++= Seq(
   "com.evolutiongaming" %% "executor-tools" % "1.0.2",

project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.12
+sbt.version=1.5.1

project/plugins.sbt

@@ -1,11 +1,9 @@
-externalResolvers += Resolver.bintrayIvyRepo("evolutiongaming", "sbt-plugins")
-
-addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.6.0")
-
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.7.1")
 
 addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7")
 
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
+addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15")
+
+addSbtPlugin("com.evolution" % "sbt-scalac-opts-plugin" % "0.0.9")
 
-addSbtPlugin("com.evolutiongaming" % "sbt-scalac-opts-plugin" % "0.0.4")
+addSbtPlugin("com.evolution" % "sbt-artifactory-plugin" % "0.0.2")

src/main/scala-2.12/com/evolutiongaming/concurrent/FutureHelper.scala

@@ -95,7 +95,7 @@ object FutureHelper {
           prev <- prev
           next <- f(next)
         } yield prev += next
-      } map { builder => builder.result }
+      }.map { builder => builder.result() }
     }
   }
 }

src/main/scala-2.13/com/evolutiongaming/concurrent/FutureHelper.scala

@@ -3,7 +3,6 @@ package com.evolutiongaming.concurrent
 import scala.collection.{BuildFrom, immutable}
 import scala.collection.immutable.Seq
 import scala.concurrent.{ExecutionContext, Future, Promise}
-import scala.language.higherKinds
 import scala.util.control.NonFatal
 import scala.util.{Failure, Try}
 
@@ -94,7 +93,7 @@ object FutureHelper {
           prev <- prev
           next <- f(next)
         } yield prev += next
-      } map { builder => builder.result }
+      }.map { builder => builder.result() }
     }
   }
 }

version.sbt

@@ -1 +1 @@
-version in ThisBuild := "1.0.7-SNAPSHOT"
+ThisBuild / version := "1.0.7-SNAPSHOT"