Merge 210bbe9 into 368459f

build.sbt

@@ -25,9 +25,11 @@ lazy val troyDriver = project
   .in(file("troy-driver"))
   .settings(name := "troy-driver")
   .settings(libraryDependencies ++= Vector(
+    Library.scalaReflect,
     Library.scalaTest % Test,
     Library.mockito % Test,
-    Library.cassandraDriverCore
+    Library.cassandraDriverCore,
+    Library.shapeless
   ))
 
 lazy val troy = project
@@ -62,17 +64,3 @@ lazy val troyMeta = project
 lazy val root = project.in(file("."))
   .settings(name := "troy-root", publishArtifact := false, publish := {}, publishLocal := {})
   .aggregate(troy, troyDriver, troySchema, cqlParser, cqlAst)
-
-initialCommands := """import java.util.UUID
-                     |import troy.Troy
-                     |import com.datastax.driver.core._
-                     |import scala.concurrent.duration.Duration
-                     |import scala.concurrent.Await
-                     |import scala.concurrent.ExecutionContext.Implicits.global
-                     |
-                     |val cluster = Cluster.builder().addContactPoint("127.0.0.1").build()
-                     |implicit val session: Session = cluster.connect()
-                     |
-                     |import Troy._
-                     |
-                     |""".stripMargin

cql-ast/src/main/scala/troy/cql/ast/CQL3.scala

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-package troy.cql.ast
+package troy
+package cql.ast
 
 trait ConsistencyLevel
 object ConsistencyLevel {

cql-ast/src/main/scala/troy/cql/ast/DataType.scala

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-package troy.cql.ast
+package troy
+package cql.ast
 
 sealed trait DataType
 

cql-ast/src/main/scala/troy/cql/ast/OptionInstruction.scala

@@ -1,4 +1,5 @@
-package troy.cql.ast
+package troy
+package cql.ast
 
 sealed trait OptionInstruction
 

cql-ast/src/main/scala/troy/cql/ast/Statements.scala

@@ -1,4 +1,5 @@
-package troy.cql.ast
+package troy
+package cql.ast
 
 import troy.cql.ast.dml._
 import troy.cql.ast.ddl._

cql-ast/src/main/scala/troy/cql/ast/Term.scala

@@ -1,4 +1,5 @@
-package troy.cql.ast
+package troy
+package cql.ast
 
 import java.util.UUID
 

cql-ast/src/main/scala/troy/cql/ast/ddl/Alter.scala

@@ -1,4 +1,5 @@
-package troy.cql.ast.ddl
+package troy
+package cql.ast.ddl
 
 import troy.cql.ast.{ DataType, OptionInstruction }
 import troy.cql.ast.Identifier

cql-ast/src/main/scala/troy/cql/ast/ddl/Field.scala

@@ -1,4 +1,5 @@
-package troy.cql.ast.ddl
+package troy
+package cql.ast.ddl
 
 import troy.cql.ast.{ DataType, Identifier }
 

cql-ast/src/main/scala/troy/cql/ast/ddl/Index.scala

@@ -1,4 +1,5 @@
-package troy.cql.ast.ddl
+package troy
+package cql.ast.ddl
 
 import troy.cql.ast.MapLiteral
 

cql-ast/src/main/scala/troy/cql/ast/ddl/Keyspace.scala

@@ -1,4 +1,5 @@
-package troy.cql.ast.ddl
+package troy
+package cql.ast.ddl
 
 object Keyspace {
   sealed trait KeyspaceOption

cql-ast/src/main/scala/troy/cql/ast/ddl/Table.scala

@@ -1,4 +1,5 @@
-package troy.cql.ast.ddl
+package troy
+package cql.ast.ddl
 
 import troy.cql.ast.DataType
 

cql-ast/src/main/scala/troy/cql/ast/dml/Condition.scala

@@ -1,4 +1,5 @@
-package troy.cql.ast.dml
+package troy
+package cql.ast.dml
 
 import troy.cql.ast.Term
 

cql-ast/src/main/scala/troy/cql/ast/dml/Insert.scala

@@ -1,4 +1,5 @@
-package troy.cql.ast.dml
+package troy
+package cql.ast.dml
 
 import troy.cql.ast._
 

cql-ast/src/main/scala/troy/cql/ast/dml/SimpleSelection.scala

@@ -1,4 +1,5 @@
-package troy.cql.ast.dml
+package troy
+package cql.ast.dml
 
 import troy.cql.ast.{ Term, _ }
 

cql-ast/src/main/scala/troy/cql/ast/dml/Update.scala

@@ -1,4 +1,5 @@
-package troy.cql.ast.dml
+package troy
+package cql.ast.dml
 
 import troy.cql.ast.{ BindMarker, Identifier, ListLiteral, Term }
 

cql-ast/src/main/scala/troy/cql/ast/dml/UpdateParam.scala

@@ -1,4 +1,5 @@
-package troy.cql.ast.dml
+package troy
+package cql.ast.dml
 
 import troy.cql.ast.BindMarker
 

cql-ast/src/main/scala/troy/cql/ast/dml/WhereClause.scala

@@ -1,4 +1,5 @@
-package troy.cql.ast.dml
+package troy
+package cql.ast.dml
 
 import troy.cql.ast.{ Identifier, Term, TupleLiteral }
 

cql-ast/src/main/scala/troy/cql/ast/package.scala

@@ -1,4 +1,5 @@
-package troy.cql
+package troy
+package cql
 
 package object ast {
   type Identifier = String

cql-parser/src/main/scala/troy/cql/parser/CqlParser.scala

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-package troy.cql.ast
+package troy
+package cql.ast
 
 import java.util.UUID
 

cql-parser/src/main/scala/troy/cql/parser/Helpers.scala

@@ -1,4 +1,5 @@
-package troy.cql.parser
+package troy
+package cql.parser
 
 import scala.util.parsing.combinator.JavaTokenParsers
 

cql-parser/src/main/scala/troy/cql/parser/TermParser.scala

@@ -1,4 +1,5 @@
-package troy.cql.parser
+package troy
+package cql.parser
 
 import troy.cql.ast.CqlParser._
 import troy.cql.ast._

cql-parser/src/main/scala/troy/cql/parser/ddl/AlterTableParser.scala

@@ -1,4 +1,5 @@
-package troy.cql.parser.ddl
+package troy
+package cql.parser.ddl
 
 import troy.cql.ast.AlterTable
 import troy.cql.ast.CqlParser._

cql-parser/src/main/scala/troy/cql/parser/ddl/CreateIndexParser.scala

@@ -1,4 +1,5 @@
-package troy.cql.parser.ddl
+package troy
+package cql.parser.ddl
 
 import troy.cql.ast.CqlParser._
 import troy.cql.ast.CreateIndex

cql-parser/src/main/scala/troy/cql/parser/ddl/CreateKeyspaceParser.scala

@@ -1,4 +1,5 @@
-package troy.cql.parser.ddl
+package troy
+package cql.parser.ddl
 
 import troy.cql.ast.CqlParser._
 import troy.cql.ast.CreateKeyspace

cql-parser/src/main/scala/troy/cql/parser/ddl/CreateTableParser.scala

@@ -1,4 +1,5 @@
-package troy.cql.parser.ddl
+package troy
+package cql.parser.ddl
 
 import troy.cql.ast.CqlParser._
 import troy.cql.ast.ddl.Table._

cql-parser/src/main/scala/troy/cql/parser/ddl/CreateTypeParser.scala

@@ -1,4 +1,5 @@
-package troy.cql.parser.ddl
+package troy
+package cql.parser.ddl
 
 import troy.cql.ast.CqlParser._
 import troy.cql.ast.CreateType

cql-parser/src/main/scala/troy/cql/parser/ddl/UseStatementParser.scala

@@ -1,4 +1,5 @@
-package troy.cql.parser.ddl
+package troy
+package cql.parser.ddl
 
 import troy.cql.ast.CqlParser._
 import troy.cql.ast.UseStatement

cql-parser/src/main/scala/troy/cql/parser/dml/DeleteStatementParser.scala

@@ -1,4 +1,5 @@
-package troy.cql.parser.dml
+package troy
+package cql.parser.dml
 
 import troy.cql.ast.CqlParser._
 import troy.cql.ast.DeleteStatement

cql-parser/src/main/scala/troy/cql/parser/dml/InsertStatementParser.scala

@@ -1,4 +1,5 @@
-package troy.cql.parser.dml
+package troy
+package cql.parser.dml
 
 import troy.cql.ast.CqlParser._
 import troy.cql.ast.InsertStatement

cql-parser/src/main/scala/troy/cql/parser/dml/SelectStatementParser.scala

@@ -1,4 +1,5 @@
-package troy.cql.parser.dml
+package troy
+package cql.parser.dml
 import troy.cql.ast.CqlParser._
 import troy.cql.ast.SelectStatement
 import troy.cql.ast.dml.Select

cql-parser/src/main/scala/troy/cql/parser/dml/UpdateStatementParser.scala

@@ -1,4 +1,5 @@
-package troy.cql.parser.dml
+package troy
+package cql.parser.dml
 
 import troy.cql.ast.CqlParser._
 import troy.cql.ast.UpdateStatement

cql-parser/src/test/scala/troy/cql/parser/CqlParserTest.scala

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-package troy.cql.parser
+package troy
+package cql.parser
 
 import org.scalatest._
 import troy.cql.ast._

cql-parser/src/test/scala/troy/cql/parser/CreateTypeParserTest.scala

@@ -1,4 +1,5 @@
-package troy.cql.parser
+package troy
+package cql.parser
 
 import org.scalatest._
 import troy.cql.ast.ddl.Field

cql-parser/src/test/scala/troy/cql/parser/ParserTestUtils.scala

@@ -1,4 +1,5 @@
-package troy.cql.parser
+package troy
+package cql.parser
 
 import org.scalatest.{ FlatSpec, Matchers }
 import troy.cql.ast._

cql-parser/src/test/scala/troy/cql/parser/ddl/AlterTableParserTest.scala

@@ -1,4 +1,5 @@
-package troy.cql.parser.ddl
+package troy
+package cql.parser.ddl
 
 import org.scalatest.{ FlatSpec, Matchers }
 import troy.cql.ast._

cql-parser/src/test/scala/troy/cql/parser/ddl/CreateIndexParserTest.scala

@@ -1,4 +1,5 @@
-package troy.cql.parser.ddl
+package troy
+package cql.parser.ddl
 
 import org.scalatest.{ FlatSpec, Matchers }
 import troy.cql.ast.ddl.Index

cql-parser/src/test/scala/troy/cql/parser/ddl/CreateKeyspaceParserTest.scala

@@ -1,4 +1,5 @@
-package troy.cql.parser.ddl
+package troy
+package cql.parser.ddl
 
 import org.scalatest._
 import troy.cql.ast.CreateKeyspace

cql-parser/src/test/scala/troy/cql/parser/ddl/CreateTableParserTest.scala

@@ -1,4 +1,5 @@
-package troy.cql.parser.ddl
+package troy
+package cql.parser.ddl
 
 import org.scalatest._
 import troy.cql.ast.ddl.Table

cql-parser/src/test/scala/troy/cql/parser/dml/DeleteStatementParserTest.scala

@@ -1,4 +1,5 @@
-package troy.cql.parser.dml
+package troy
+package cql.parser.dml
 
 import java.util.UUID
 

cql-parser/src/test/scala/troy/cql/parser/dml/InsertStatementParserTest.scala

@@ -1,4 +1,5 @@
-package troy.cql.parser.dml
+package troy
+package cql.parser.dml
 
 import org.scalatest.{ FlatSpec, Matchers }
 import troy.cql.ast.dml.{ Insert, Timestamp, Ttl, UpdateValue }

cql-parser/src/test/scala/troy/cql/parser/dml/SelectStatementParserTest.scala

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-package troy.cql.parser.dml
+package troy
+package cql.parser.dml
 
 import java.util.UUID
 

cql-parser/src/test/scala/troy/cql/parser/dml/UpdateStatementParserTest.scala

@@ -1,4 +1,5 @@
-package troy.cql.parser.dml
+package troy
+package cql.parser.dml
 
 import java.util.UUID
 

cql-parser/src/test/scala/troy/cql3_3/lexical/CaseSensitivityParsingSpec.scala

@@ -1,4 +1,5 @@
-package troy.cql3_3.lexical
+package troy
+package cql3_3.lexical
 
 import org.scalatest.{ FlatSpec, Matchers }
 import troy.cql.ast.dml.Select.{ ColumnName, SelectionClauseItem, SelectClause }

cql-parser/src/test/scala/troy/cql3_3/lexical/EscapingCharactersParsingSpec.scala

@@ -1,4 +1,5 @@
-package troy.cql3_3.lexical
+package troy
+package cql3_3.lexical
 
 import org.scalatest.{ FlatSpec, Matchers }
 import troy.cql.ast.StringConstant

cql-parser/src/test/scala/troy/cql3_3/lexical/KeywordsParsingSpec.scala

@@ -1,4 +1,5 @@
-package troy.cql3_3.lexical
+package troy
+package cql3_3.lexical
 
 import org.scalatest.{ FlatSpec, Matchers }
 import troy.cql.parser.ParserTestUtils._

cql-parser/src/test/scala/troy/cql3_4/lexical/KeywordsParsingSpec.scala

@@ -1,4 +1,5 @@
-package troy.cql3_4.lexical
+package troy
+package cql3_4.lexical
 
 import org.scalatest.{ FlatSpec, Matchers }
 import troy.cql.parser.ParserTestUtils._

project/Build.scala

@@ -18,7 +18,8 @@ object Build extends AutoPlugin {
     organization := "io.github.cassandra-scala",
     licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0")),
     scalaVersion := Version.Scala,
-    crossScalaVersions := Vector("2.11.8", "2.12.0"),
+    scalaOrganization := "org.typelevel", // FIXME: Remove once literal-types is merged into lightbend Scala
+    crossScalaVersions := Vector("2.11.8", "2.12.1"),
     scalacOptions ++= Vector(
       "-encoding", "UTF-8",
       "-target:jvm-1.8",
@@ -31,8 +32,10 @@ object Build extends AutoPlugin {
       "-Ywarn-dead-code",
       "-Ywarn-unused-import",
       "-Ywarn-unused",
-      "-Ywarn-nullary-unit"
+      "-Ywarn-nullary-unit",
+      "-Yliteral-types"
     ),
+    scalacOptions in (Compile, console) := Seq("-Yliteral-types"),
     unmanagedSourceDirectories.in(Compile) := Vector(scalaSource.in(Compile).value),
     unmanagedSourceDirectories.in(Test) := Vector(scalaSource.in(Test).value)
   )

project/Dependencies.scala

@@ -15,6 +15,7 @@ object Library {
   val scalaParserCombinators = "org.scala-lang.modules" %% "scala-parser-combinators" % Version.ScalaParserCombinators
   val cassandraDriverCore = "com.datastax.cassandra"  % "cassandra-driver-core" % "3.0.0"
   val cassandraUnit = "org.cassandraunit" % "cassandra-unit" % "3.0.0.1"
-  val scalaMeta = "org.scalameta" %% "scalameta" % "1.0.0"
+  val scalaMeta = "org.scalameta" %% "scalameta" % "1.4.0"
   val macroParadise =  "org.scalamacros" % s"paradise_${Version.Scala}" % "3.0.0-M3"
+  val shapeless = "com.chuusai" %% "shapeless" % "2.3.2"
 }

troy-driver/src/main/scala/troy/driver/CassandraDataType.scala

@@ -1,4 +1,5 @@
-package troy.driver
+package troy
+package driver
 
 /**
  * Represents Cassandra Types