From f8c7550c8c081d5c8c02fd1b05efe4b7384c6508 Mon Sep 17 00:00:00 2001 From: Flavian Alexandru Date: Sat, 16 Mar 2019 10:43:31 +0000 Subject: [PATCH 01/12] Upgrading SBT version --- build.sbt | 20 ++------------------ project/Publishing.scala | 14 +++----------- project/build.properties | 2 +- project/plugins.sbt | 22 +++++++++------------- 4 files changed, 15 insertions(+), 43 deletions(-) diff --git a/build.sbt b/build.sbt index b3b4599d1..272278fb9 100644 --- a/build.sbt +++ b/build.sbt @@ -285,7 +285,7 @@ lazy val readme = (project in file("readme")) phantomFinagle, phantomStreams, phantomThrift - ).enablePlugins(TutPlugin, CrossPerProjectPlugin) + ).enablePlugins(TutPlugin) lazy val phantomDsl = (project in file("phantom-dsl")) .settings(sharedSettings: _*) @@ -315,8 +315,6 @@ lazy val phantomDsl = (project in file("phantom-dsl")) ) ).dependsOn( phantomConnectors - ).enablePlugins( - CrossPerProjectPlugin ) lazy val phantomJdk8 = (project in file("phantom-jdk8")) @@ -335,8 +333,6 @@ lazy val phantomJdk8 = (project in file("phantom-jdk8")) sharedSettings: _* ).dependsOn( phantomDsl % "compile->compile;test->test" - ).enablePlugins( - CrossPerProjectPlugin ) lazy val phantomConnectors = (project in file("phantom-connectors")) @@ -350,8 +346,6 @@ lazy val phantomConnectors = (project in file("phantom-connectors")) "com.datastax.cassandra" % "cassandra-driver-core" % Versions.datastax, "com.outworkers" %% "util-testing" % Versions.util % Test ) - ).enablePlugins( - CrossPerProjectPlugin ) lazy val phantomFinagle = (project in file("phantom-finagle")) @@ -369,8 +363,6 @@ lazy val phantomFinagle = (project in file("phantom-finagle")) ) ).dependsOn( phantomDsl % "compile->compile;test->test" - ).enablePlugins( - CrossPerProjectPlugin ) lazy val phantomThrift = (project in file("phantom-thrift")) @@ -393,8 +385,6 @@ lazy val phantomThrift = (project in file("phantom-thrift")) ).dependsOn( phantomDsl % "compile->compile;test->test;", phantomFinagle - ).enablePlugins( - CrossPerProjectPlugin ) lazy val phantomSbtPlugin = (project in file("phantom-sbt")) @@ -414,8 +404,6 @@ lazy val phantomSbtPlugin = (project in file("phantom-sbt")) ExclusionRule("org.slf4j", "slf4j-jdk14") ) ) - ).enablePlugins( - CrossPerProjectPlugin ) lazy val phantomStreams = (project in file("phantom-streams")) @@ -438,8 +426,6 @@ lazy val phantomStreams = (project in file("phantom-streams")) sharedSettings: _* ).dependsOn( phantomDsl % "compile->compile;test->test" - ).enablePlugins( - CrossPerProjectPlugin ) lazy val phantomExample = (project in file("phantom-example")) @@ -460,8 +446,6 @@ lazy val phantomExample = (project in file("phantom-example")) ).dependsOn( phantomDsl % "test->test;compile->compile;", phantomThrift - ).enablePlugins( - CrossPerProjectPlugin ) lazy val phantomMonix = (project in file("phantom-monix")) @@ -479,4 +463,4 @@ lazy val phantomExample = (project in file("phantom-example")) sharedSettings: _* ).dependsOn( phantomDsl % "compile->compile;test->test;" - ) \ No newline at end of file + ) diff --git a/project/Publishing.scala b/project/Publishing.scala index ed6ef5847..ed23db10e 100644 --- a/project/Publishing.scala +++ b/project/Publishing.scala @@ -30,12 +30,6 @@ object Publishing { val ciSkipSequence = "[ci skip]" - private def toProcessLogger(st: State): ProcessLogger = new ProcessLogger { - override def error(s: => String): Unit = st.log.error(s) - override def info(s: => String): Unit = st.log.info(s) - override def buffer[T](f: => T): T = st.log.buffer(f) - } - def vcs(state: State): Vcs = { Project.extract(state).get(releaseVcs) .getOrElse(sys.error("Aborting release. Working directory is not a repository of a recognized VCS.")) @@ -49,7 +43,6 @@ object Publishing { val logger = ConsoleLogger() logger.info(s"Found modified files: ${vcs(st).hasModifiedFiles}") - val log = toProcessLogger(st) val versionsFile = settings.get(releaseVersionFile).getCanonicalFile val docsFolder = settings.get(releaseTutFolder).getCanonicalFile @@ -76,19 +69,19 @@ object Publishing { } } - vcs(st).add(commitablePaths: _*) !! log + vcs(st).add(commitablePaths: _*) val status = (vcs(st).status !!) trim val newState = if (status.nonEmpty) { val (state, msg) = settings.runTask(releaseCommitMessage, st) - val x = vcs(state).commit(msg, sign) + val x = vcs(state).commit(msg, sign, false) state } else { // nothing to commit. this happens if the version.sbt file hasn't changed or no docs have been added. st } - vcs(newState).status !! log + vcs(newState).status newState } @@ -140,7 +133,6 @@ object Publishing { Some("releases" at nexus + "service/local/staging/deploy/maven2") } }, - externalResolvers := Resolver.withDefaultResolvers(resolvers.value, mavenCentral = true), publishArtifact in Test := false, pomIncludeRepository := { _ => true }, pomExtra := diff --git a/project/build.properties b/project/build.properties index c091b86ca..72f902892 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.16 +sbt.version=1.2.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index 30db6ec3b..2f6275e21 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -30,34 +30,30 @@ lazy val Versions = new { val scrooge = if (isCi) { if (sys.props("java.specification.version") == "1.8" && !isScala210) "4.18.0" else "4.7.0" } else { - if (sys.props("java.specification.version") == "1.8") "4.18.0" else "4.7.0" + if (sys.props("java.specification.version") == "1.8") "19.3.0" else "19.3.0" } } -addSbtPlugin("org.scoverage" %% "sbt-scoverage" % "1.5.0") +addSbtPlugin("org.scoverage" %% "sbt-scoverage" % "1.5.1") -addSbtPlugin("org.scoverage" %% "sbt-coveralls" % "1.1.0") +addSbtPlugin("org.scoverage" %% "sbt-coveralls" % "1.2.7") -addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.3") +addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M13-1") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1") -if (sys.env.get("MAVEN_PUBLISH").exists("true" ==)) { - addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3") -} else { - addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.4") -} +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.5") -addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5") +addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0") addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % Versions.scrooge) dependencyOverrides += "org.apache.thrift" % "libthrift" % "0.8.0" -addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.5.6") +addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.6.10") -addSbtPlugin("com.eed3si9n" % "sbt-doge" % "0.1.5") +// addSbtPlugin("com.eed3si9n" % "sbt-doge" % "0.1.5") libraryDependencies += "org.slf4j" % "slf4j-nop" % "1.7.22" -addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.5") +addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.11") From 8b177813118680b77b0608560f651947b94dd1ae Mon Sep 17 00:00:00 2001 From: Flavian Alexandru Date: Sat, 16 Mar 2019 13:39:55 +0000 Subject: [PATCH 02/12] Trying to fix SBT 1.2.7 setup --- build.sbt | 7 ++++--- .../scala/com/outworkers/phantom/macros/TableHelper.scala | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 272278fb9..572d188ee 100644 --- a/build.sbt +++ b/build.sbt @@ -61,7 +61,7 @@ val XLintOptions = Seq( val Scala212Options = Seq( "-Xlint:infer-any", // Warn when a type argument is inferred to be `Any`. "-Ypartial-unification", // Enable partial unification in type constructor inference, - "-Ywarn-extra-implicit", // Warn when more than one implicit parameter section is defined. + //"-Ywarn-extra-implicit", // Warn when more than one implicit parameter section is defined. "-Ywarn-unused:implicits", // Warn if an implicit parameter is unused. "-Ywarn-unused:imports", // Warn if an import selector is not referenced. "-Ywarn-unused:locals", // Warn if a local definition is unused. @@ -87,7 +87,7 @@ val scalacOptionsFn: String => Seq[String] = { s => } } -scalacOptions in Global ++= scalacOptionsFn(scalaVersion.value) +scalacOptions in ThisBuild ++= scalacOptionsFn(scalaVersion.value) lazy val Versions = new { val logback = "1.2.3" @@ -257,7 +257,8 @@ lazy val phantom = (project in file(".")) sharedSettings ++ Publishing.noPublishSettings ).settings( name := "phantom", - moduleName := "phantom" + moduleName := "phantom", + crossScalaVersions := Seq(Versions.scala210, Versions.scala211, Versions.scala212) ).aggregate( fullProjectList: _* ) diff --git a/phantom-dsl/src/main/scala/com/outworkers/phantom/macros/TableHelper.scala b/phantom-dsl/src/main/scala/com/outworkers/phantom/macros/TableHelper.scala index ef3c9958b..ebdd4fc23 100644 --- a/phantom-dsl/src/main/scala/com/outworkers/phantom/macros/TableHelper.scala +++ b/phantom-dsl/src/main/scala/com/outworkers/phantom/macros/TableHelper.scala @@ -29,8 +29,7 @@ import scala.annotation.implicitNotFound import scala.collection.immutable.ListMap import scala.reflect.macros.whitebox -@implicitNotFound( - """ +@implicitNotFound(msg = """ | Table ${T} is most likely missing a PartitionKey column. | Also check that the fields in your table match types inside ${R}. """.stripMargin From ef37e719febba6e137ad4e88b8fb1a11246635c9 Mon Sep 17 00:00:00 2001 From: Flavian Alexandru Date: Sat, 16 Mar 2019 13:41:38 +0000 Subject: [PATCH 03/12] Changing release steps --- build.sbt | 2 +- build/run_tests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 572d188ee..074e5849d 100644 --- a/build.sbt +++ b/build.sbt @@ -193,7 +193,7 @@ val releaseSettings = Seq( releaseStepTask((tut in Tut) in readme), setReleaseVersion, Publishing.commitTutFilesAndVersion, - releaseStepCommandAndRemaining("such publishSigned"), + releaseStepCommandAndRemaining("+publishSigned"), releaseStepCommandAndRemaining("sonatypeReleaseAll"), tagRelease, setNextVersion, diff --git a/build/run_tests.sh b/build/run_tests.sh index 4ab2fe816..0126f8ca7 100755 --- a/build/run_tests.sh +++ b/build/run_tests.sh @@ -27,7 +27,7 @@ function run_test_suite { fi else echo "Running tests without attempting to submit coverage reports or run tut" - sbt "plz $TRAVIS_SCALA_VERSION test" + sbt "++$TRAVIS_SCALA_VERSION test" exit $? fi } From d76443666dd012ab3d5bd915adc688961132472b Mon Sep 17 00:00:00 2001 From: Flavian Alexandru Date: Sat, 16 Mar 2019 13:42:22 +0000 Subject: [PATCH 04/12] More changes --- build/publish_develop.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/build/publish_develop.sh b/build/publish_develop.sh index 25c19813d..93460d16d 100755 --- a/build/publish_develop.sh +++ b/build/publish_develop.sh @@ -42,7 +42,7 @@ function prepare_maven_release { function publish_to_bintray { export MAVEN_PUBLISH="false" echo "Publishing new version to bintray" - sbt "such publish" + sbt "+publish" } function setup_credentials { @@ -107,12 +107,6 @@ then setup_git_credentials prepare_maven_release - #sbt "project readme" tut - #git add docs - #git commit -m "Added compiled tut documentation [ci skip]" - - # git status - sbt "release with-defaults" else From acdb9889453693428d44ce3ca914357fa01b06f9 Mon Sep 17 00:00:00 2001 From: Flavian Alexandru Date: Sat, 16 Mar 2019 20:22:19 +0000 Subject: [PATCH 05/12] Trying to remove coursier from the mix --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 2f6275e21..4d9b18c88 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -38,7 +38,7 @@ addSbtPlugin("org.scoverage" %% "sbt-scoverage" % "1.5.1") addSbtPlugin("org.scoverage" %% "sbt-coveralls" % "1.2.7") -addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M13-1") +// addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M13-1") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1") From d24db604d401029eab44fa77efa7155b9f4561b4 Mon Sep 17 00:00:00 2001 From: Flavian Alexandru Date: Wed, 20 Mar 2019 17:10:34 +0000 Subject: [PATCH 06/12] Trying to fix phantom SBT --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 074e5849d..4e744354f 100644 --- a/build.sbt +++ b/build.sbt @@ -394,10 +394,10 @@ lazy val phantomSbtPlugin = (project in file("phantom-sbt")) ).settings( name := "phantom-sbt", moduleName := "phantom-sbt", - crossScalaVersions := Seq(Versions.scala210), + crossScalaVersions := Seq(Versions.scala212), publishMavenStyle := false, sbtPlugin := true, - publishArtifact := scalaVersion.value.startsWith("2.10"), + publishArtifact := scalaVersion.value.startsWith("2.12"), libraryDependencies ++= Seq( "com.datastax.cassandra" % "cassandra-driver-core" % Versions.datastax, "org.cassandraunit" % "cassandra-unit" % Versions.cassandraUnit excludeAll ( From 145c31967a72b3f8d6de62cd28fa047d8221b19c Mon Sep 17 00:00:00 2001 From: Flavian Alexandru Date: Sat, 23 Mar 2019 15:59:12 +0200 Subject: [PATCH 07/12] Bumping scoorge v --- project/plugins.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4d9b18c88..839624754 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -28,7 +28,7 @@ lazy val isCi = sys.env.get("CI").exists("true" == ) lazy val Versions = new { val scrooge = if (isCi) { - if (sys.props("java.specification.version") == "1.8" && !isScala210) "4.18.0" else "4.7.0" + if (sys.props("java.specification.version") == "1.8" && !isScala210) "19.3.0" else "19.3.0" } else { if (sys.props("java.specification.version") == "1.8") "19.3.0" else "19.3.0" } @@ -48,7 +48,7 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0") addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % Versions.scrooge) -dependencyOverrides += "org.apache.thrift" % "libthrift" % "0.8.0" +//dependencyOverrides += "org.apache.thrift" % "libthrift" % "0.8.0" addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.6.10") From f327624c33114dabb73822efce270799032ed91a Mon Sep 17 00:00:00 2001 From: Flavian Alexandru Date: Sat, 23 Mar 2019 20:34:22 +0200 Subject: [PATCH 08/12] Removing reference to tut configuration --- build.sbt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index 4e744354f..3135e6804 100644 --- a/build.sbt +++ b/build.sbt @@ -270,13 +270,13 @@ lazy val readme = (project in file("readme")) tutSourceDirectory := sourceDirectory.value / "main" / "tut", tutTargetDirectory := phantom.base / "docs", libraryDependencies ++= Seq( - "org.typelevel" %% "macro-compat" % Versions.macrocompat % "tut", - "org.scala-lang" % "scala-compiler" % scalaVersion.value % "tut", + "org.typelevel" %% "macro-compat" % Versions.macrocompat, + "org.scala-lang" % "scala-compiler" % scalaVersion.value, compilerPlugin("org.scalamacros" % "paradise" % Versions.macrosVersion(scalaVersion.value) cross CrossVersion.full), - "com.outworkers" %% "util-samplers" % Versions.util % "tut", - "io.circe" %% "circe-parser" % Versions.circe % "tut", - "io.circe" %% "circe-generic" % Versions.circe % "tut", - "org.scalatest" %% "scalatest" % Versions.scalatest % "tut" + "com.outworkers" %% "util-samplers" % Versions.util, + "io.circe" %% "circe-parser" % Versions.circe, + "io.circe" %% "circe-generic" % Versions.circe, + "org.scalatest" %% "scalatest" % Versions.scalatest ) ).dependsOn( phantomDsl, From a37c6f0e59153e3fc3a0caff438291d8ea0b8994 Mon Sep 17 00:00:00 2001 From: Flavian Alexandru Date: Sat, 23 Mar 2019 21:18:02 +0200 Subject: [PATCH 09/12] Adding 19.1.0 scrooge to classpath --- build.sbt | 10 +++++----- project/plugins.sbt | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index 3135e6804..01874a929 100644 --- a/build.sbt +++ b/build.sbt @@ -97,7 +97,7 @@ lazy val Versions = new { val scalatest = "3.0.5" val shapeless = "2.3.3" val thrift = "0.8.0" - val finagle = "17.12.0" + val finagle = "19.1.0" val scalameter = "0.8.2" val scalacheck = "1.14.0" val slf4j = "1.7.25" @@ -128,7 +128,7 @@ lazy val Versions = new { val twitterUtil: String => String = { s => CrossVersion.partialVersion(s) match { - case Some((_, minor)) if minor >= 12 => "6.45.0" + case Some((_, minor)) if minor >= 12 => "19.1.0" case _ => "6.34.0" } } @@ -149,9 +149,9 @@ lazy val Versions = new { val scrooge: String => String = { s => CrossVersion.partialVersion(s) match { - case Some((_, minor)) if minor >= 11 && Publishing.isJdk8 => "4.18.0" - case Some((_, minor)) if minor >= 11 && !Publishing.isJdk8 => "4.7.0" - case _ => "4.7.0" + //case Some((_, minor)) if minor >= 11 && Publishing.isJdk8 => "4.18.0" + //case Some((_, minor)) if minor >= 11 && !Publishing.isJdk8 => "4.7.0" + case _ => "19.1.0" } } val play: String => String = { diff --git a/project/plugins.sbt b/project/plugins.sbt index 839624754..20db04813 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -48,7 +48,7 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0") addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % Versions.scrooge) -//dependencyOverrides += "org.apache.thrift" % "libthrift" % "0.8.0" +dependencyOverrides += "org.apache.thrift" % "libthrift" % "0.10.0" addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.6.10") From 7b11d144cde4652ac230c6bb19309613ba81731b Mon Sep 17 00:00:00 2001 From: Flavian Alexandru Date: Sat, 23 Mar 2019 21:31:47 +0200 Subject: [PATCH 10/12] Bumping Thrift libraries --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 01874a929..6a8e5818a 100644 --- a/build.sbt +++ b/build.sbt @@ -96,7 +96,7 @@ lazy val Versions = new { val datastax = "3.6.0" val scalatest = "3.0.5" val shapeless = "2.3.3" - val thrift = "0.8.0" + val thrift = "0.10.0" val finagle = "19.1.0" val scalameter = "0.8.2" val scalacheck = "1.14.0" From 8afed42469b53cfa36004df6021e55dff56fbe38 Mon Sep 17 00:00:00 2001 From: Flavian Alexandru Date: Sun, 24 Mar 2019 22:51:51 +0200 Subject: [PATCH 11/12] Trying without Scala 2.10 --- .travis.yml | 1 - build.sbt | 27 +++++++++++++++------------ version.sbt | 2 +- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index aa2675bf8..154bf4fb5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: scala sudo: required dist: trusty scala: -- 2.10.6 - 2.11.12 python: 2.7.13 cache: diff --git a/build.sbt b/build.sbt index 6a8e5818a..678da434d 100644 --- a/build.sbt +++ b/build.sbt @@ -87,8 +87,6 @@ val scalacOptionsFn: String => Seq[String] = { s => } } -scalacOptions in ThisBuild ++= scalacOptionsFn(scalaVersion.value) - lazy val Versions = new { val logback = "1.2.3" val util = "0.48.0" @@ -114,10 +112,13 @@ lazy val Versions = new { val scala211 = "2.11.12" val scala212 = "2.12.8" val monix = "2.3.3" - val scalaAll = Seq(scala210, scala211, scala212) val scala = new { - val all = Seq(scala210, scala211, scala212) + val all = Seq( + //scala210, + scala211, + scala212 + ) } val typesafeConfig: String = if (Publishing.isJdk8) { @@ -236,7 +237,9 @@ val sharedSettings: Seq[Def.Setting[_]] = Defaults.coreDefaultSettings ++ Seq( ), envVars := Map("SCALACTIC_FILL_FILE_PATHNAMES" -> "yes"), parallelExecution in ThisBuild := false -) ++ Publishing.effectiveSettings ++ releaseSettings +) ++ Publishing.effectiveSettings ++ releaseSettings ++ Seq { + scalacOptions := scalacOptionsFn((scalaVersion in ThisBuild).value) +} lazy val baseProjectList: Seq[ProjectReference] = Seq( phantomDsl, @@ -258,7 +261,7 @@ lazy val phantom = (project in file(".")) ).settings( name := "phantom", moduleName := "phantom", - crossScalaVersions := Seq(Versions.scala210, Versions.scala211, Versions.scala212) + crossScalaVersions := Versions.scala.all ).aggregate( fullProjectList: _* ) @@ -293,7 +296,7 @@ lazy val phantomDsl = (project in file("phantom-dsl")) .settings( name := "phantom-dsl", moduleName := "phantom-dsl", - crossScalaVersions := Versions.scalaAll, + crossScalaVersions := Versions.scala.all, concurrentRestrictions in Test := Seq( Tags.limit(Tags.ForkedTestGroup, defaultConcurrency) ), @@ -322,7 +325,7 @@ lazy val phantomJdk8 = (project in file("phantom-jdk8")) .settings( name := "phantom-jdk8", moduleName := "phantom-jdk8", - crossScalaVersions := Versions.scalaAll, + crossScalaVersions := Versions.scala.all, testOptions in Test += Tests.Argument("-oF"), concurrentRestrictions in Test := Seq( Tags.limit(Tags.ForkedTestGroup, defaultConcurrency) @@ -342,7 +345,7 @@ lazy val phantomConnectors = (project in file("phantom-connectors")) ).settings( name := "phantom-connectors", moduleName := "phantom-connectors", - crossScalaVersions := Versions.scalaAll, + crossScalaVersions := Versions.scala.all, libraryDependencies ++= Seq( "com.datastax.cassandra" % "cassandra-driver-core" % Versions.datastax, "com.outworkers" %% "util-testing" % Versions.util % Test @@ -354,7 +357,7 @@ lazy val phantomFinagle = (project in file("phantom-finagle")) .settings( name := "phantom-finagle", moduleName := "phantom-finagle", - crossScalaVersions := Versions.scalaAll, + crossScalaVersions := Versions.scala.all, testFrameworks in Test ++= Seq(new TestFramework("org.scalameter.ScalaMeterFramework")), libraryDependencies ++= Seq( compilerPlugin("org.scalamacros" % "paradise" % Versions.macrosVersion(scalaVersion.value) cross CrossVersion.full), @@ -411,7 +414,7 @@ lazy val phantomStreams = (project in file("phantom-streams")) .settings( name := "phantom-streams", moduleName := "phantom-streams", - crossScalaVersions := Versions.scalaAll, + crossScalaVersions := Versions.scala.all, testFrameworks in Test ++= Seq(new TestFramework("org.scalameter.ScalaMeterFramework")), libraryDependencies ++= Seq( compilerPlugin("org.scalamacros" % "paradise" % Versions.macrosVersion(scalaVersion.value) cross CrossVersion.full), @@ -452,7 +455,7 @@ lazy val phantomExample = (project in file("phantom-example")) lazy val phantomMonix = (project in file("phantom-monix")) .settings( name := "phantom-monix", - crossScalaVersions := Versions.scalaAll, + crossScalaVersions := Versions.scala.all, moduleName := "phantom-monix", libraryDependencies ++= Seq( "com.outworkers" %% "util-testing" % Versions.util % Test, diff --git a/version.sbt b/version.sbt index 2fd8bc9b8..f4285ca5a 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "2.38.0-SNAPSHOT" +version in ThisBuild := "2.38.0" From 93f110616c3eea4569fc6a7ec03ee65765deb7ae Mon Sep 17 00:00:00 2001 From: Flavian Alexandru Date: Mon, 1 Apr 2019 17:22:53 +0100 Subject: [PATCH 12/12] Fixing tut --- docs/basics/tables.md | 4 ++-- readme/src/main/tut/basics/tables.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/basics/tables.md b/docs/basics/tables.md index 62fd95c9d..85696f6ac 100644 --- a/docs/basics/tables.md +++ b/docs/basics/tables.md @@ -122,6 +122,7 @@ abstract class ExampleRecord extends Table[ExampleRecord, ExampleModel] { object name extends StringColumn object props extends MapColumn[String, String] object test extends OptionalIntColumn +} ``` @@ -339,13 +340,12 @@ So the new type of the generated store method will now be: The new table definition to store the above is: ```scala - import com.outworkers.phantom.dsl._ import com.outworkers.phantom.builder.query.InsertQuery import scala.concurrent.duration._ case class Record( - id: java.util.UUID, + id: UUID, name: String, firstName: String, email: String diff --git a/readme/src/main/tut/basics/tables.md b/readme/src/main/tut/basics/tables.md index 07576742c..033e82eb8 100644 --- a/readme/src/main/tut/basics/tables.md +++ b/readme/src/main/tut/basics/tables.md @@ -122,6 +122,7 @@ abstract class ExampleRecord extends Table[ExampleRecord, ExampleModel] { object name extends StringColumn object props extends MapColumn[String, String] object test extends OptionalIntColumn +} ``` @@ -328,7 +329,7 @@ key that would allow us to retrieve all records by both `country` and `region`. So the new type of the generated store method will now be: -```tut:silent +```scala def store( countryCode: String, region: String, @@ -339,13 +340,12 @@ So the new type of the generated store method will now be: The new table definition to store the above is: ```tut:silent - import com.outworkers.phantom.dsl._ import com.outworkers.phantom.builder.query.InsertQuery import scala.concurrent.duration._ case class Record( - id: java.util.UUID, + id: UUID, name: String, firstName: String, email: String