Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #98

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+24 −18
Open

Update dependencies #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4a46e7
Update dependencies
whiteshadow-gr Apr 14, 2021
04f5f8b
Update github workflows
whiteshadow-gr Apr 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/facebook.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/fitbit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/google-calendar.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/instagram.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/spotify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/twitter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions dataplug/app/com/hubofallthings/dataplug/modules/AwsSesModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions dataplug/app/com/hubofallthings/dataplug/utils/Mailer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
# Written by Andrius Aucinas <[email protected]>, 10 2016
#

sbt.version=1.3.8
sbt.version=1.3.13
14 changes: 7 additions & 7 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably not now, but getting off of scalariform, and on to scalafmt and scalafix should happen.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth a ticket though.

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
Expand Down