Skip to content

Use shaded asm classes provided by Kryo. #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ianoc merged 1 commit into from
Mar 10, 2014
Merged

Use shaded asm classes provided by Kryo. #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions chill-scala/src/main/scala/com/twitter/chill/ClosureCleaner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ import scala.collection.mutable.{Set => MSet, Map => MMap}

import scala.annotation.tailrec

import org.objectweb.asm.{ClassReader, MethodVisitor, Type, ClassVisitor}
import org.objectweb.asm.Opcodes._
import com.esotericsoftware.reflectasm.shaded.org.objectweb.asm.{ClassReader, MethodVisitor, Type, ClassVisitor}
import com.esotericsoftware.reflectasm.shaded.org.objectweb.asm.Opcodes._

/**
* Copied from Spark, written by Matei Zaharia ([email protected]).
Expand Down
5 changes: 1 addition & 4 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,7 @@ object ChillBuild extends Build {
settings = sharedSettings
).settings(
name := "chill",
previousArtifact := Some("com.twitter" % "chill_2.9.3" % "0.3.3"),
libraryDependencies ++= Seq(
"org.ow2.asm" % "asm-commons" % "4.0"
)
previousArtifact := Some("com.twitter" % "chill_2.9.3" % "0.3.3")
).dependsOn(chillJava)

def isScala210x(scalaVersion: String) = scalaVersion match {
Expand Down