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

Scala 2.12 support #60

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Scala 2.12 support #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ licenses in ThisBuild += ("Apache-2.0", url("http://www.apache.org/licenses/LICE

scalaVersion in ThisBuild := "2.11.7"

crossScalaVersions in ThisBuild := Seq("2.10.5", "2.11.7")
crossScalaVersions in ThisBuild := Seq("2.10.5", "2.11.7", "2.12.1")

shellPrompt in ThisBuild := CustomShellPrompt.customPrompt

Expand Down
6 changes: 2 additions & 4 deletions integration/src/it/scala/dynamodb/GlobalSecondaryIndexSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@

package com.github.dwhjames.awswrap.dynamodb

import org.scalatest.{FlatSpec, Matchers}

import scala.collection.JavaConverters._
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.duration._

import org.scalatest.{ FlatSpec, BeforeAndAfterAll, Matchers }

import com.amazonaws.AmazonClientException


class QueryGlobalSecondaryIndexSpec
extends FlatSpec
Expand Down
6 changes: 2 additions & 4 deletions integration/src/it/scala/dynamodb/ReadsOnHashKeyTablesSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,12 @@

package com.github.dwhjames.awswrap.dynamodb

import org.scalatest.{FlatSpec, Matchers}

import scala.collection.JavaConverters._
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.duration._

import org.scalatest.{ FlatSpec, BeforeAndAfterAll, Matchers }

import com.amazonaws.AmazonClientException


class ReadsOnHashKeyTableSpec
extends FlatSpec
Expand Down
4 changes: 0 additions & 4 deletions integration/src/it/scala/s3/FutureTransferSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,10 @@
package com.github.dwhjames.awswrap
package s3

import scala.concurrent.ExecutionContext.Implicits.global

import java.io.File

import org.scalatest.{ FlatSpec, Matchers }

import com.amazonaws.AmazonClientException


class FutureTransferSpec
extends FlatSpec
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ object Dependencies {

object IntegrationTest {

val scalaTest = "org.scalatest" %% "scalatest" % "2.2.4" % "it"
val scalaTest = "org.scalatest" %% "scalatest" % "3.0.1" % "it"
}
}
4 changes: 2 additions & 2 deletions src/main/scala/dynamodb/SingleThreadedBatchWriter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ package com.github.dwhjames.awswrap.dynamodb
import java.{util => ju}
import java.util.Random

import com.amazonaws.{AmazonClientException, AmazonServiceException, ClientConfiguration}
import com.amazonaws.auth.{AWSCredentials, AWSCredentialsProvider, BasicAWSCredentials}
import com.amazonaws.{AmazonServiceException, ClientConfiguration}
import com.amazonaws.auth.{AWSCredentials, AWSCredentialsProvider}
import com.amazonaws.internal.StaticCredentialsProvider
import com.amazonaws.retry.RetryUtils
import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/s3/s3.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ import java.io.{InputStream, File}
import java.net.URL

import scala.collection.JavaConverters._
import scala.concurrent.{ExecutionContext, Future, Promise}
import scala.concurrent.{Future, Promise}
import scala.util.Try

import java.util.concurrent.{Executors, ExecutorService, ThreadFactory}
import java.util.concurrent.atomic.AtomicLong

import com.amazonaws.{AmazonWebServiceRequest, ClientConfiguration}
import com.amazonaws.ClientConfiguration
import com.amazonaws.auth.{AWSCredentials, AWSCredentialsProvider, DefaultAWSCredentialsProviderChain}
import com.amazonaws.event.{ProgressListener, ProgressEvent, ProgressEventType}
import com.amazonaws.internal.StaticCredentialsProvider;
Expand Down