Merge pull request #29 from retronym/topic/bump

Support Scala 2.13, Java 10+

build.sbt

@@ -3,7 +3,7 @@ val buildName = "jardiff"
 inThisBuild(Seq[Setting[_]](
   version := "1.0-SNAPSHOT",
   organization := "org.scala-lang",
-  scalaVersion := "2.12.2",
+  scalaVersion := "2.12.6",
   licenses := List(("Scala license", url("https://github.com/scala/jardiff/blob/master/LICENSE"))),
   homepage := Some(url("http://github.com/scala/jardiff")),
   scalacOptions := Seq("-feature", "-deprecation", "-Xlint")
@@ -41,23 +41,31 @@ lazy val root = (
   aggregate(core)
   settings(
     name := buildName,
-    publish := (),
-    publishLocal := ()
+    publish := {()},
+    publishLocal := {()}
   )
 )
 
 lazy val core = (
   project.
-  settings(libraryDependencies ++= Seq(
-    "commons-cli" % "commons-cli" % "1.4",
-    "org.scala-lang.modules" % "scala-asm" % "5.1.0-scala-2",
-    "org.scala-lang" % "scalap" % System.getProperty("scalap.version", scalaVersion.value),
-    "org.eclipse.jgit" % "org.eclipse.jgit" % "4.6.0.201612231935-r",
-    "org.slf4j" % "slf4j-api" % "1.7.25",
-    "org.slf4j" % "log4j-over-slf4j" % "1.7.25", // for any java classes looking for this
-    "ch.qos.logback" % "logback-classic" % "1.2.3"
-  ),
-  name := buildName + "-core")
-  settings(sonatypePublishSettings:_*)
+  settings(
+    scalaVersion := "2.13.0-M4",
+    libraryDependencies ++= Seq(
+      "commons-cli" % "commons-cli" % "1.4",
+      "org.ow2.asm" % "asm" % "6.2",
+      "org.ow2.asm" % "asm-util" % "6.2",
+      "org.scala-lang" % "scalap" % System.getProperty("scalap.version", scalaVersion.value),
+      "org.eclipse.jgit" % "org.eclipse.jgit" % "4.6.0.201612231935-r",
+      "org.slf4j" % "slf4j-api" % "1.7.25",
+      "org.slf4j" % "log4j-over-slf4j" % "1.7.25", // for any java classes looking for this
+      "ch.qos.logback" % "logback-classic" % "1.2.3"
+    ),
+    name := buildName + "-core",
+    assemblyMergeStrategy in assembly := {
+      case "module-info.class" => MergeStrategy.discard
+      case "rootdoc.txt" => MergeStrategy.discard
+      case x => (assemblyMergeStrategy in assembly).value(x)
+    }
+  ).settings(sonatypePublishSettings:_*)
 )
 

core/src/main/scala/scala/tools/jardiff/AsmTextifyRenderer.scala

@@ -8,9 +8,9 @@ import java.io.PrintWriter
 import java.nio.file.{Files, Path}
 
 import scala.collection.JavaConverters._
-import scala.tools.asm.{ClassReader, Opcodes}
-import scala.tools.asm.tree.{ClassNode, FieldNode, InnerClassNode, MethodNode}
-import scala.tools.asm.util.TraceClassVisitor
+import org.objectweb.asm.{ClassReader, Opcodes}
+import org.objectweb.asm.tree.{ClassNode, FieldNode, InnerClassNode, MethodNode}
+import org.objectweb.asm.util.TraceClassVisitor
 
 class AsmTextifyRenderer(code: Boolean, raw: Boolean, privates: Boolean) extends FileRenderer {
   def outFileExtension: String = ".asm"

project/build.properties

@@ -1 +1,2 @@
-sbt.version=0.13.15
+sbt.version=1.1.6
+

project/plugins.sbt

@@ -1,5 +1,3 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.4")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.7")
 
-addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.4.0")
-
-libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value
+addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.4")