From a4a46e7b23f022235661100ba55f8f35d212af8b Mon Sep 17 00:00:00 2001 From: Marios Tsekis Date: Wed, 14 Apr 2021 16:41:49 +0100 Subject: [PATCH 1/2] Update dependencies --- .../dataplug/modules/AwsSesModule.scala | 4 ++-- .../com/hubofallthings/dataplug/utils/Mailer.scala | 4 ++-- project/build.properties | 2 +- project/plugins.sbt | 14 +++++++------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dataplug/app/com/hubofallthings/dataplug/modules/AwsSesModule.scala b/dataplug/app/com/hubofallthings/dataplug/modules/AwsSesModule.scala index c7202ff6..33e9adc4 100644 --- a/dataplug/app/com/hubofallthings/dataplug/modules/AwsSesModule.scala +++ b/dataplug/app/com/hubofallthings/dataplug/modules/AwsSesModule.scala @@ -1,12 +1,12 @@ package com.hubofallthings.dataplug.modules import com.amazonaws.auth.EC2ContainerCredentialsProviderWrapper -import com.amazonaws.services.simpleemail.{AmazonSimpleEmailService, AmazonSimpleEmailServiceClientBuilder} +import com.amazonaws.services.simpleemail.{ AmazonSimpleEmailService, AmazonSimpleEmailServiceClientBuilder } import com.google.inject.Provides import net.codingwell.scalaguice.ScalaModule import play.api.Configuration -import javax.inject.{Singleton => JSingleton} +import javax.inject.{ Singleton => JSingleton } class AwsSesModule extends ScalaModule { diff --git a/dataplug/app/com/hubofallthings/dataplug/utils/Mailer.scala b/dataplug/app/com/hubofallthings/dataplug/utils/Mailer.scala index ff6a4626..5075e069 100644 --- a/dataplug/app/com/hubofallthings/dataplug/utils/Mailer.scala +++ b/dataplug/app/com/hubofallthings/dataplug/utils/Mailer.scala @@ -11,12 +11,12 @@ package com.hubofallthings.dataplug.utils import com.hubofallthings.dataplug.views import play.api.i18n.Messages import play.api.mvc.RequestHeader -import play.api.{Configuration, UsefulException} +import play.api.{ Configuration, UsefulException } import javax.inject.Inject import scala.util.Try -class Mailer @Inject()(configuration: Configuration, ms: MailService) { +class Mailer @Inject() (configuration: Configuration, ms: MailService) { private val plugName = configuration.getOptional[String]("service.name").getOrElse("MISCONFIGURED") private val adminEmails = configuration.getOptional[Seq[String]]("administrators").getOrElse(Seq()) diff --git a/project/build.properties b/project/build.properties index e1e47853..6e459e5a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -6,4 +6,4 @@ # Written by Andrius Aucinas , 10 2016 # -sbt.version=1.3.8 +sbt.version=1.3.13 diff --git a/project/plugins.sbt b/project/plugins.sbt index 0f4eb2d8..cafcd7d7 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,20 +2,20 @@ logLevel := Level.Warn addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.6.0") -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.13") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.25") // Code quality -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1") -addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.2") -addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.1") -addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.3") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") +addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7") +addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.3") +addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.4") // Web plugins addSbtPlugin("com.typesafe.sbt" % "sbt-web" % "1.4.3") -addSbtPlugin("com.typesafe.sbt" % "sbt-digest" % "1.1.3") +addSbtPlugin("com.typesafe.sbt" % "sbt-digest" % "1.1.4") addSbtPlugin("com.typesafe.sbt" % "sbt-gzip" % "1.0.2") -addSbtPlugin("org.irundaia.sbt" % "sbt-sassify" % "1.4.11") +addSbtPlugin("org.irundaia.sbt" % "sbt-sassify" % "1.4.13") addSbtPlugin("com.typesafe.sbt" % "sbt-uglify" % "2.0.0") // S3 based SBT resolver From 04f5f8b275ef901318daa44e4c1c05befed0ef61 Mon Sep 17 00:00:00 2001 From: Marios Tsekis Date: Wed, 14 Apr 2021 16:45:34 +0100 Subject: [PATCH 2/2] Update github workflows --- .github/workflows/facebook.yml | 3 ++- .github/workflows/fitbit.yml | 3 ++- .github/workflows/google-calendar.yml | 3 ++- .github/workflows/instagram.yml | 3 ++- .github/workflows/spotify.yml | 3 ++- .github/workflows/twitter.yml | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/facebook.yml b/.github/workflows/facebook.yml index 22ab72c5..8d9328c2 100644 --- a/.github/workflows/facebook.yml +++ b/.github/workflows/facebook.yml @@ -21,8 +21,9 @@ jobs: - uses: actions/checkout@v2 - name: Setup Java environment - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: 'adopt' java-version: 11 java-package: jdk architecture: x64 diff --git a/.github/workflows/fitbit.yml b/.github/workflows/fitbit.yml index acec0a01..645218b8 100644 --- a/.github/workflows/fitbit.yml +++ b/.github/workflows/fitbit.yml @@ -21,8 +21,9 @@ jobs: - uses: actions/checkout@v2 - name: Setup Java environment - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: 'adopt' java-version: 11 java-package: jdk architecture: x64 diff --git a/.github/workflows/google-calendar.yml b/.github/workflows/google-calendar.yml index c2323be9..12b3c94c 100644 --- a/.github/workflows/google-calendar.yml +++ b/.github/workflows/google-calendar.yml @@ -21,8 +21,9 @@ jobs: - uses: actions/checkout@v2 - name: Setup Java environment - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: 'adopt' java-version: 11 java-package: jdk architecture: x64 diff --git a/.github/workflows/instagram.yml b/.github/workflows/instagram.yml index 88fab007..204aac5e 100644 --- a/.github/workflows/instagram.yml +++ b/.github/workflows/instagram.yml @@ -21,8 +21,9 @@ jobs: - uses: actions/checkout@v2 - name: Setup Java environment - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: 'adopt' java-version: 11 java-package: jdk architecture: x64 diff --git a/.github/workflows/spotify.yml b/.github/workflows/spotify.yml index 7dd28a5b..8c32705c 100644 --- a/.github/workflows/spotify.yml +++ b/.github/workflows/spotify.yml @@ -21,8 +21,9 @@ jobs: - uses: actions/checkout@v2 - name: Setup Java environment - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: 'adopt' java-version: 11 java-package: jdk architecture: x64 diff --git a/.github/workflows/twitter.yml b/.github/workflows/twitter.yml index 3c643db5..56a52eeb 100644 --- a/.github/workflows/twitter.yml +++ b/.github/workflows/twitter.yml @@ -21,8 +21,9 @@ jobs: - uses: actions/checkout@v2 - name: Setup Java environment - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: 'adopt' java-version: 11 java-package: jdk architecture: x64