Skip to content
This repository was archived by the owner on Feb 20, 2019. It is now read-only.

Experiment to compile to 2.12 and cross to 2.11, drop 2.10. #451

Open
wants to merge 5 commits into
base: 0.11.x
Choose a base branch
from
Open

Experiment to compile to 2.12 and cross to 2.11, drop 2.10. #451

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a10228
Experiment to compile to 2.12 and maybe cross to 2.11, drop 2.10.
ekrich Mar 24, 2017
fc7b106
Replaced references to scala.concurrent.util.Unsafe
ekrich Mar 24, 2017
26ff07b
Correct spelling of pickling package in quasiquote. Bump sbt version …
ekrich Apr 25, 2017
021e332
Update travis
ekrich Jun 6, 2017
0a8942d
Only build again jdk8
ekrich Jun 6, 2017
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
Prev Previous commit
Next Next commit
Correct spelling of pickling package in quasiquote. Bump sbt version … 
…to 0.13.15
  • Loading branch information
@ekrich
ekrich committed Apr 25, 2017
commit 26ff07be31f053f09a6724be7ddd8a0c02a6cf56
4 changes: 2 additions & 2 deletions core/src/main/scala/scala/pickling/generator/sourcegen.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ private[pickling] trait SourceGenerator extends Macro with tags.FastTypeTagMacro

def genAllocateInstance(x: AllocateInstance): c.Tree = {
val tpe = x.tpe.tpe[c.universe.type](c.universe)
q"""_root_.scala.picking.Tools.unsafe.allocateInstance(classOf[$tpe]).asInstanceOf[$tpe]"""
q"""_root_.scala.pickling.Tools.unsafe.allocateInstance(classOf[$tpe]).asInstanceOf[$tpe]"""
}

def generateUnpickleImplFromAst(unpicklerAst: UnpicklerAst): c.Tree = {
Expand Down Expand Up @@ -484,7 +484,7 @@ private[pickling] trait SourceGenerator extends Macro with tags.FastTypeTagMacro
val objectOutTpe = typeOf[scala.pickling.util.GenObjectOutput]
val fieldName = "$ext"
q"""
val $target = _root_.scala.picking.Tools.unsafe.allocateInstance(classOf[$tpe]).asInstanceOf[$tpe]
val $target = _root_.scala.pickling.Tools.unsafe.allocateInstance(classOf[$tpe]).asInstanceOf[$tpe]
val $readerName = reader.readField($fieldName)
val out = {
val up = _root_.scala.Predef.implicitly[_root_.scala.pickling.Unpickler[$objectOutTpe]]
Expand Down
2 changes: 0 additions & 2 deletions project/Util.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ import sbt._
import Keys._

object Util {
// val buildScalaVersion = System.getProperty("scala.version", "2.11.8")
// val buildScalaVersions = Seq("2.11.8", "2.10.6")
val buildScalaVersion = System.getProperty("scala.version", "2.12.1")
val buildScalaVersions = Seq("2.12.1", "2.11.8")
val javaVersion = System.getProperty("java.version")
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.13
sbt.version=0.13.15