Skip to content
This repository has been archived by the owner on Aug 13, 2024. It is now read-only.

Commit

Permalink
Bump Scala to 2.12 (closes #9)
Browse files Browse the repository at this point in the history
  • Loading branch information
BenFradet authored and chuwy committed Mar 9, 2021
1 parent 6b0d6a9 commit 391a418
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: scala
scala:
- 2.11.12
- 2.12.10
jdk:
- oraclejdk8
script:
Expand All @@ -10,7 +10,7 @@ deploy:
provider: script
script: "./.travis/deploy.sh $TRAVIS_TAG"
on:
condition: '"${TRAVIS_SCALA_VERSION}" == "2.11.12"'
condition: '"${TRAVIS_SCALA_VERSION}" == "2.12.10"'
tags: true
env:
global:
Expand Down
3 changes: 2 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ lazy val root = project.in(file("."))
version := "0.1.0",
organization := "com.snowplowanalytics",
description := "ScalaCheck generators for various Iglu-compatible Schema formats",
scalaVersion := "2.11.12",
scalaVersion := "2.12.10",
licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0"))
)
.settings(BuildSettings.buildSettings)
.settings(BuildSettings.publishSettings)
.settings(
resolvers ++= Seq(
"Snowplow bintray" at "https://snowplow.bintray.com/snowplow-maven",
"Sonatype OSS Snapshots" at "http://oss.sonatype.org/content/repositories/snapshots/"
),
libraryDependencies ++= Seq(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ object IgluSchemas {
schemaKey: SchemaKey
): F[Either[String, Json]] =
resolver
.lookupSchema(schemaKey, 10)
.lookupSchema(schemaKey)
.map(_.leftMap(_.getMessage))
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ object IgluSchemasSpec {
.getOrElse(throw new RuntimeException("Invalid Iglu URI"))

val result: EitherT[IO, String, (Gen[Json], Json)] = for {
r <- EitherT.right(Resolver.init[IO](0, Registry.IgluCentral))
r <- EitherT.right(Resolver.init[IO](0, None, Registry.IgluCentral))
s <- EitherT(IgluSchemas.lookup[IO](r, schemaKey))
a <- EitherT.fromEither[IO](IgluSchemas.parseSchema(s))
} yield (JsonGenSchema.json(a), s)
Expand Down

0 comments on commit 391a418

Please sign in to comment.