Skip to content

Commit 1f09153

Browse files
authored
Merge pull request #136 from frees-io/arf-Upgrade-Cats-1.0.1
Upgrade to cats 1.0.1
2 parents 747c784 + 290b5b5 commit 1f09153

File tree

72 files changed

+133
-107
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+133
-107
lines changed

build.sbt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ pgpPassphrase := Some(getEnvVar("PGP_PASSPHRASE").getOrElse("").toCharArray)
55
pgpPublicRing := file(s"$gpgFolder/pubring.gpg")
66
pgpSecretRing := file(s"$gpgFolder/secring.gpg")
77

8+
lazy val freesV = "0.5.1"
9+
810
lazy val commonDependencies: Seq[ModuleID] = Seq(
9-
%%("frees-async", "0.5.0"),
10-
%%("frees-async-guava", "0.5.0"),
11+
%%("frees-async",freesV),
12+
%%("frees-async-guava",freesV),
1113
%%("shapeless"),
1214
%%("classy-core"),
1315
%%("classy-config-typesafe"),

core/src/main/scala/api/ClusterAPI.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2017 47 Degrees, LLC. <http://www.47deg.com>
2+
* Copyright 2017-2018 47 Degrees, LLC. <http://www.47deg.com>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

core/src/main/scala/api/QueryModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2017 47 Degrees, LLC. <http://www.47deg.com>
2+
* Copyright 2017-2018 47 Degrees, LLC. <http://www.47deg.com>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

core/src/main/scala/api/ResultSetAPI.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2017 47 Degrees, LLC. <http://www.47deg.com>
2+
* Copyright 2017-2018 47 Degrees, LLC. <http://www.47deg.com>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

core/src/main/scala/api/SessionAPI.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2017 47 Degrees, LLC. <http://www.47deg.com>
2+
* Copyright 2017-2018 47 Degrees, LLC. <http://www.47deg.com>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

core/src/main/scala/api/StatementAPI.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2017 47 Degrees, LLC. <http://www.47deg.com>
2+
* Copyright 2017-2018 47 Degrees, LLC. <http://www.47deg.com>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

core/src/main/scala/api/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2017 47 Degrees, LLC. <http://www.47deg.com>
2+
* Copyright 2017-2018 47 Degrees, LLC. <http://www.47deg.com>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

core/src/main/scala/codecs/package.scala

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2017 47 Degrees, LLC. <http://www.47deg.com>
2+
* Copyright 2017-2018 47 Degrees, LLC. <http://www.47deg.com>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -71,22 +71,26 @@ package object codecs {
7171

7272
implicit val booleanCodec: ByteBufferCodec[Boolean] =
7373
PrimitiveByteBufferCodec[Boolean](DataType.smallint(), byteSize = 1, defaultValue = false) {
74-
byteBuffer => byteBuffer.get(byteBuffer.position()) == 1
74+
byteBuffer =>
75+
byteBuffer.get(byteBuffer.position()) == 1
7576
}
7677

7778
implicit val byteCodec: ByteBufferCodec[Byte] =
7879
PrimitiveByteBufferCodec[Byte](DataType.smallint(), byteSize = 1, defaultValue = 0) {
79-
byteBuffer => byteBuffer.get(byteBuffer.position())
80+
byteBuffer =>
81+
byteBuffer.get(byteBuffer.position())
8082
}
8183

8284
implicit val doubleCodec: ByteBufferCodec[Double] =
8385
PrimitiveByteBufferCodec[Double](DataType.cdouble(), byteSize = 8, defaultValue = 0) {
84-
byteBuffer => byteBuffer.getDouble(byteBuffer.position())
86+
byteBuffer =>
87+
byteBuffer.getDouble(byteBuffer.position())
8588
}
8689

8790
implicit val floatCodec: ByteBufferCodec[Float] =
8891
PrimitiveByteBufferCodec[Float](DataType.cfloat(), byteSize = 4, defaultValue = 0) {
89-
byteBuffer => byteBuffer.getFloat(byteBuffer.position())
92+
byteBuffer =>
93+
byteBuffer.getFloat(byteBuffer.position())
9094
}
9195

9296
implicit val intCodec: ByteBufferCodec[Int] =
@@ -96,12 +100,14 @@ package object codecs {
96100

97101
implicit val longCodec: ByteBufferCodec[Long] =
98102
PrimitiveByteBufferCodec[Long](DataType.bigint(), byteSize = 8, defaultValue = 0) {
99-
byteBuffer => byteBuffer.getLong(byteBuffer.position())
103+
byteBuffer =>
104+
byteBuffer.getLong(byteBuffer.position())
100105
}
101106

102107
implicit val shortCodec: ByteBufferCodec[Short] =
103108
PrimitiveByteBufferCodec[Short](DataType.smallint(), byteSize = 2, defaultValue = 0) {
104-
byteBuffer => byteBuffer.getShort(byteBuffer.position())
109+
byteBuffer =>
110+
byteBuffer.getShort(byteBuffer.position())
105111
}
106112

107113
implicit def byteBufferCodec[T](

core/src/main/scala/config/Decoders.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2017 47 Degrees, LLC. <http://www.47deg.com>
2+
* Copyright 2017-2018 47 Degrees, LLC. <http://www.47deg.com>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -178,7 +178,8 @@ class Decoders[Config] extends DatastaxReads[Config] {
178178
case (b, ContactPointList(l)) => b.addContactPoints(l.asJava)
179179
case (b, ContactPointWithPortList(l)) => b.addContactPointsWithPorts(l.asJava)
180180
}(contactPointListRead),
181-
customField[Credentials]("credentials") { (b, v) => b.withCredentials(v.username, v.password)
181+
customField[Credentials]("credentials") { (b, v) =>
182+
b.withCredentials(v.username, v.password)
182183
}(credentialsDecoder),
183184
flagField("allowBetaProtocolVersion", _.allowBetaProtocolVersion),
184185
flagField("enableSSL", _.withSSL),

core/src/main/scala/config/model.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2017 47 Degrees, LLC. <http://www.47deg.com>
2+
* Copyright 2017-2018 47 Degrees, LLC. <http://www.47deg.com>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)