scala-xerial-xerial-java-actual-code-change

This mapping has 12 multi-map groups: several pairings are equally correct there. The code view shows one arbitrary valid pairing, not the only one.

Before…lines 1–37 unchanged (37 lines)
    }
    case p => {
      sys.error("unknown xerial.profile:%s".format(p))
    }
  }
}
44
lazy val buildSettings = Defaults.defaultSettings ++ releaseSettings ++ Seq[Setting[_]](
  organization := "org.xerial.java",
  organizationName := "Xerial Project",
  organizationHomepage := Some(new URL("http://xerial.org/")),
  description := "Xerial: Data Management Utiilities",
  scalaVersion := SCALA_VERSION,
  publishMavenStyle := true,
  publishArtifact in Test := false,
  publishTo <<= version { (v) => Some(releaseResolver(v)) },
  pomIncludeRepository := {
    _ => false
  },
  parallelExecution := true,
  parallelExecution in Test := false,
  crossPaths := false,
  scalacOptions ++= Seq("-encoding", "UTF-8", "-deprecation", "-unchecked", "-target:jvm-1.6", "-feature"),
  pomExtra := {
    <url>http://xerial.org/</url>
    <licenses>
      <license>
        <name>Apache 2</name>
        <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
      </license>
    </licenses>
      <scm>
        <connection>scm:git:github.com/xerial/xerial-java.git</connection>
        <developerConnection>scm:git:git@github.com:xerial/xerial-java.git</developerConnection>
        <url>github.com/xerial/xerial-java.git</url>
      </scm>
      <properties>
        <scala.version>
          {SCALA_VERSION}
        </scala.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
      </properties>
      <developers>
        <developer>
          <id>leo</id>
          <name>Taro L. Saito</name>
…lines 84–158 unchanged (75 lines)
  )
) dependsOn (core % dependentScope)
161
object Dependencies {
  val testLib = Seq(
   "junit" % "junit" % "4.10" % "test",
    "org.scalatest" %% "scalatest" % "2.0.M5b" % "test",
    "com.novocode" % "junit-interface" % "0.10-M2" % "test"
  )
}
169
170}
171
…lines 172–179 unchanged (8 lines)

After…lines 1–37 unchanged (37 lines)
    }
    case p => {
      sys.error("unknown xerial.profile:%s".format(p))
    }
  }
}
lazy val defaultJavacOptions = Seq("-encoding", "UTF-8", "-source", "1.6")
45
lazy val buildSettings = Defaults.defaultSettings ++ releaseSettings ++ Seq[Setting[_]](
  organization := "org.xerial.java",
  organizationName := "Xerial Project",
  organizationHomepage := Some(new URL("http://xerial.org/")),
  description := "Xerial: Data Management Utiilities",
  scalaVersion := SCALA_VERSION,
  autoScalaLibrary := false,
  publishMavenStyle := true,
  publishArtifact in Test := false,
  publishTo <<= version { (v) => Some(releaseResolver(v)) },
  pomIncludeRepository := {
    _ => false
  },
  parallelExecution := true,
  parallelExecution in Test := false,
  crossPaths := false,
  javacOptions in Compile := defaultJavacOptions ++ Seq("-target", "1.6"),
  javacOptions in Compile in doc := defaultJavacOptions ++  Seq("-windowtitle", "Xerial API", "-linkoffline", "http://docs.oracle.com/javase/6/docs/api/", "http://docs.oracle.com/javase/6/docs/api/"),
  pomExtra := {
    <url>http://xerial.org/</url>
    <licenses>
      <license>
        <name>Apache 2</name>
        <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
      </license>
    </licenses>
      <scm>
        <connection>scm:git:github.com/xerial/xerial-java.git</connection>
        <developerConnection>scm:git:git@github.com:xerial/xerial-java.git</developerConnection>
        <url>github.com/xerial/xerial-java.git</url>
      </scm>
      <properties>
        <scala.version>{SCALA_VERSION}</scala.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
      </properties>
      <developers>
        <developer>
          <id>leo</id>
          <name>Taro L. Saito</name>
…lines 85–159 unchanged (75 lines)
  )
) dependsOn (core % dependentScope)
162
object Dependencies {
  val testLib = Seq(
   "junit" % "junit" % "4.10" % "test",
166//      "org.scalatest" %% "scalatest" % "2.0.M5b" % "test",
    "com.novocode" % "junit-interface" % "0.10-M2" % "test"
  )
}
170
171}
172
…lines 173–180 unchanged (8 lines)

Before

compilation_unit

block_comment

/* "/*"

// "//"

*/ " */"

import_declaration

import "import"

identifier "java"

. "."

identifier "io"

. "."

identifier "File"

import_declaration

import "import"

identifier "sbt"

. "."

namespace_wildcard

_ "_"

import_declaration

import "import"

identifier "sbt"

. "."

identifier "Keys"

. "."

namespace_wildcard

_ "_"

import_declaration

import "import"

identifier "sbtrelease"

. "."

identifier "ReleasePlugin"

. "."

namespace_wildcard

_ "_"

import_declaration

import "import"

identifier "scala"

. "."

namespace_wildcard

_ "_"

import_declaration

import "import"

identifier "scala"

. "."

identifier "Some"

import_declaration

import "import"

identifier "xerial"

. "."

identifier "sbt"

. "."

identifier "Pack"

. "."

namespace_wildcard

_ "_"

object_definition

object "object"

identifier "XerialBuild"

extends_clause

extends "extends"

type_identifier "Build"

template_body

{ "{"

val_definition

val "val"

identifier "SCALA_VERSION"

= "="

string "\"2.10.0\""

function_definition (+107 nodes collapsed)

val_definition

modifiers

lazy "lazy"

val "val"

identifier "buildSettings"

= "="

call_expression

generic_function (+21 nodes collapsed)

arguments

( "("

infix_expression

identifier "organization"

operator_identifier ":="

string "\"org.xerial.java\""

, ","

infix_expression

identifier "organizationName"

operator_identifier ":="

string "\"Xerial Project\""

, ","

infix_expression

identifier "organizationHomepage"

operator_identifier ":="

call_expression

identifier "Some"

arguments

( "("

instance_expression

new "new"

type_identifier "URL"

arguments

( "("

string "\"http://xerial.org/\""

) ")"

, ","

infix_expression

identifier "description"

operator_identifier ":="

string "\"Xerial: Data Management Utiilities\""

, ","

infix_expression

identifier "scalaVersion"

operator_identifier ":="

identifier "SCALA_VERSION"

, ","

infix_expression

identifier "publishMavenStyle"

operator_identifier ":="

boolean_literal

true "true"

, ","

infix_expression

identifier "publishArtifact"

identifier "in"

identifier "Test"

operator_identifier ":="

boolean_literal

false "false"

, ","

infix_expression (+26 nodes collapsed)

, ","

infix_expression

identifier "pomIncludeRepository"

operator_identifier ":="

block

{ "{"

lambda_expression

wildcard

_ "_"

=> "=>"

boolean_literal

false "false"

} "}"

, ","

infix_expression

identifier "parallelExecution"

operator_identifier ":="

boolean_literal

true "true"

, ","

infix_expression

identifier "parallelExecution"

identifier "in"

identifier "Test"

operator_identifier ":="

boolean_literal

false "false"

, ","

infix_expression

identifier "crossPaths"

operator_identifier ":="

boolean_literal

false "false"

, ","

infix_expression any 1:7

identifier "scalacOptions" any 1:10

operator_identifier "++=" any 1:4

call_expression any 1:2

identifier "Seq" any 1:2

arguments any 1:2

( "(" any 1:2

string "\"-encoding\"" any 6:7

, "," any 5:5

string "\"UTF-8\"" any 6:7

, "," any 5:5

string "\"-deprecation\"" any 6:7

, "," any 5:5

string "\"-unchecked\"" any 6:7

, "," any 5:5

string "\"-target:jvm-1.6\"" any 6:7

, "," any 5:5

string "\"-feature\"" any 6:7

) ")" any 1:2

, "," any 1:2

infix_expression

identifier "pomExtra"

operator_identifier ":="

block

{ "{"

postfix_expression

infix_expression

operator_identifier "<"

identifier "url"

operator_identifier ">"

identifier "http"

operator_identifier "://"

identifier "xerial"

ERROR

. "."

identifier "org"

operator_identifier "/</"

identifier "url"

operator_identifier ">"

infix_expression

operator_identifier "<"

identifier "licenses"

operator_identifier ">"

infix_expression

operator_identifier "<"

identifier "license"

operator_identifier ">"

postfix_expression

infix_expression

operator_identifier "<"

identifier "name"

operator_identifier ">"

identifier "Apache"

integer_literal "2"

operator_identifier "</"

identifier "name"

operator_identifier ">"

postfix_expression (+32 nodes collapsed)

infix_expression

operator_identifier "</"

identifier "license"

operator_identifier ">"

infix_expression

operator_identifier "</"

identifier "licenses"

operator_identifier ">"

infix_expression

operator_identifier "<"

identifier "scm"

operator_identifier ">"

postfix_expression (+25 nodes collapsed)

postfix_expression (+26 nodes collapsed)

infix_expression

operator_identifier "</"

identifier "scm"

operator_identifier ">"

infix_expression

operator_identifier "<"

identifier "properties"

operator_identifier ">"

postfix_expression

field_expression

operator_identifier "<"

ERROR "scala" any 2:1

. "."

identifier "version"

operator_identifier ">"

block

{ "{"

identifier "SCALA_VERSION"

} "}"

postfix_expression

field_expression

operator_identifier "</"

ERROR "scala" any 2:1

. "."

identifier "version"

operator_identifier ">"

postfix_expression (+25 nodes collapsed)

infix_expression

operator_identifier "</"

identifier "properties"

operator_identifier ">"

infix_expression

operator_identifier "<"

identifier "developers"

operator_identifier ">"

infix_expression

operator_identifier "<"

identifier "developer"

operator_identifier ">"

infix_expression

operator_identifier "<"

identifier "id"

operator_identifier ">"

identifier "leo"

operator_identifier "</"

identifier "id"

operator_identifier ">"

postfix_expression

infix_expression

operator_identifier "<"

identifier "name"

operator_identifier ">"

identifier "Taro"

field_expression

identifier "L"

. "."

identifier "Saito"

operator_identifier "</"

identifier "name"

operator_identifier ">"

postfix_expression

infix_expression

operator_identifier "<"

identifier "url"

operator_identifier ">"

identifier "http"

operator_identifier "://"

identifier "xerial"

ERROR

. "."

identifier "org"

operator_identifier "/"

identifier "leo"

operator_identifier "</"

identifier "url"

operator_identifier ">"

infix_expression

operator_identifier "</"

identifier "developer"

operator_identifier ">"

infix_expression

operator_identifier "</"

identifier "developers"

operator_identifier ">"

} "}"

) ")"

import_declaration

import "import"

identifier "Dependencies"

. "."

namespace_wildcard

_ "_"

val_definition

modifiers

access_modifier

private "private"

val "val"

identifier "dependentScope"

= "="

string "\"test->test;compile->compile\""

comment

// "//"

val_definition (+79 nodes collapsed)

val_definition (+46 nodes collapsed)

val_definition (+73 nodes collapsed)

val_definition (+66 nodes collapsed)

val_definition (+84 nodes collapsed)

val_definition (+66 nodes collapsed)

object_definition

object "object"

identifier "Dependencies"

template_body

{ "{"

val_definition

val "val"

identifier "testLib"

= "="

call_expression

identifier "Seq"

arguments

( "("

infix_expression

string "\"junit\""

operator_identifier "%"

string "\"junit\""

operator_identifier "%"

string "\"4.10\""

operator_identifier "%"

string "\"test\""

, ","

infix_expression

string "\"org.scalatest\""

operator_identifier "%%"

string "\"scalatest\""

operator_identifier "%"

string "\"2.0.M5b\""

operator_identifier "%"

string "\"test\""

, ","

infix_expression

string "\"com.novocode\""

operator_identifier "%"

string "\"junit-interface\""

operator_identifier "%"

string "\"0.10-M2\""

operator_identifier "%"

string "\"test\""

) ")"

} "}"

After

compilation_unit

block_comment

/* "/*"

// "//"

*/ " */"

import_declaration

import "import"

identifier "java"

. "."

identifier "io"

. "."

identifier "File"

import_declaration

import "import"

identifier "sbt"

. "."

namespace_wildcard

_ "_"

import_declaration

import "import"

identifier "sbt"

. "."

identifier "Keys"

. "."

namespace_wildcard

_ "_"

import_declaration

import "import"

identifier "sbtrelease"

. "."

identifier "ReleasePlugin"

. "."

namespace_wildcard

_ "_"

import_declaration

import "import"

identifier "scala"

. "."

namespace_wildcard

_ "_"

import_declaration

import "import"

identifier "scala"

. "."

identifier "Some"

import_declaration

import "import"

identifier "xerial"

. "."

identifier "sbt"

. "."

identifier "Pack"

. "."

namespace_wildcard

_ "_"

object_definition

object "object"

identifier "XerialBuild"

extends_clause

extends "extends"

type_identifier "Build"

template_body

{ "{"

val_definition

val "val"

identifier "SCALA_VERSION"

= "="

string "\"2.10.0\""

function_definition (+107 nodes collapsed)

val_definition

modifiers

lazy "lazy"

val "val"

identifier "defaultJavacOptions"

= "="

call_expression

identifier "Seq"

arguments

( "("

string "\"-encoding\""

, ","

string "\"UTF-8\""

, ","

string "\"-source\""

, ","

string "\"1.6\""

) ")"

val_definition

modifiers

lazy "lazy"

val "val"

identifier "buildSettings"

= "="

call_expression

generic_function (+21 nodes collapsed)

arguments

( "("

infix_expression

identifier "organization"

operator_identifier ":="

string "\"org.xerial.java\""

, ","

infix_expression

identifier "organizationName"

operator_identifier ":="

string "\"Xerial Project\""

, ","

infix_expression

identifier "organizationHomepage"

operator_identifier ":="

call_expression

identifier "Some"

arguments

( "("

instance_expression

new "new"

type_identifier "URL"

arguments

( "("

string "\"http://xerial.org/\""

) ")"

, ","

infix_expression

identifier "description"

operator_identifier ":="

string "\"Xerial: Data Management Utiilities\""

, ","

infix_expression

identifier "scalaVersion"

operator_identifier ":="

identifier "SCALA_VERSION"

, ","

infix_expression

identifier "autoScalaLibrary"

operator_identifier ":="

boolean_literal

false "false"

, ","

infix_expression

identifier "publishMavenStyle"

operator_identifier ":="

boolean_literal

true "true"

, ","

infix_expression

identifier "publishArtifact"

identifier "in"

identifier "Test"

operator_identifier ":="

boolean_literal

false "false"

, ","

infix_expression (+26 nodes collapsed)

, ","

infix_expression

identifier "pomIncludeRepository"

operator_identifier ":="

block

{ "{"

lambda_expression

wildcard

_ "_"

=> "=>"

boolean_literal

false "false"

} "}"

, ","

infix_expression

identifier "parallelExecution"

operator_identifier ":="

boolean_literal

true "true"

, ","

infix_expression

identifier "parallelExecution"

identifier "in"

identifier "Test"

operator_identifier ":="

boolean_literal

false "false"

, ","

infix_expression

identifier "crossPaths"

operator_identifier ":="

boolean_literal

false "false"

, ","

infix_expression any 1:7

identifier "javacOptions" any 1:10

identifier "in" any 1:10

identifier "Compile" any 1:10

operator_identifier ":=" any 1:4

identifier "defaultJavacOptions" any 1:10

operator_identifier "++" any 1:4

call_expression any 1:2

identifier "Seq" any 1:2

arguments any 1:2

( "(" any 1:2

string "\"-target\"" any 6:7

, "," any 5:5

string "\"1.6\"" any 6:7

) ")" any 1:2

, "," any 1:2

infix_expression any 1:7

identifier "javacOptions" any 1:10

identifier "in" any 1:10

identifier "Compile" any 1:10

identifier "in" any 1:10

identifier "doc" any 1:10

operator_identifier ":=" any 1:4

identifier "defaultJavacOptions" any 1:10

operator_identifier "++" any 1:4

call_expression any 1:2

identifier "Seq" any 1:2

arguments any 1:2

( "(" any 1:2

string "\"-windowtitle\"" any 6:7

, "," any 5:5

string "\"Xerial API\"" any 6:7

, "," any 5:5

string "\"-linkoffline\"" any 6:7

, "," any 5:5

string "\"http://docs.oracle.com/javase/6/docs/api/\"" any 6:7

, "," any 5:5

string "\"http://docs.oracle.com/javase/6/docs/api/\"" any 6:7

) ")" any 1:2

, "," any 1:2

infix_expression

identifier "pomExtra"

operator_identifier ":="

block

{ "{"

postfix_expression

infix_expression

operator_identifier "<"

identifier "url"

operator_identifier ">"

identifier "http"

operator_identifier "://"

identifier "xerial"

ERROR

. "."

identifier "org"

operator_identifier "/</"

identifier "url"

operator_identifier ">"

infix_expression

operator_identifier "<"

identifier "licenses"

operator_identifier ">"

infix_expression

operator_identifier "<"

identifier "license"

operator_identifier ">"

postfix_expression

infix_expression

operator_identifier "<"

identifier "name"

operator_identifier ">"

identifier "Apache"

integer_literal "2"

operator_identifier "</"

identifier "name"

operator_identifier ">"

postfix_expression (+32 nodes collapsed)

infix_expression

operator_identifier "</"

identifier "license"

operator_identifier ">"

infix_expression

operator_identifier "</"

identifier "licenses"

operator_identifier ">"

infix_expression

operator_identifier "<"

identifier "scm"

operator_identifier ">"

postfix_expression (+25 nodes collapsed)

postfix_expression (+26 nodes collapsed)

infix_expression

operator_identifier "</"

identifier "scm"

operator_identifier ">"

infix_expression

operator_identifier "<"

identifier "properties"

operator_identifier ">"

postfix_expression

infix_expression

field_expression

operator_identifier "<"

ERROR "scala" any 2:1

. "."

identifier "version"

operator_identifier ">"

block

{ "{"

identifier "SCALA_VERSION"

} "}"

operator_identifier "</"

field_expression

identifier "scala"

. "."

identifier "version"

operator_identifier ">"

postfix_expression (+25 nodes collapsed)

infix_expression

operator_identifier "</"

identifier "properties"

operator_identifier ">"

infix_expression

operator_identifier "<"

identifier "developers"

operator_identifier ">"

infix_expression

operator_identifier "<"

identifier "developer"

operator_identifier ">"

infix_expression

operator_identifier "<"

identifier "id"

operator_identifier ">"

identifier "leo"

operator_identifier "</"

identifier "id"

operator_identifier ">"

postfix_expression

infix_expression

operator_identifier "<"

identifier "name"

operator_identifier ">"

identifier "Taro"

field_expression

identifier "L"

. "."

identifier "Saito"

operator_identifier "</"

identifier "name"

operator_identifier ">"

postfix_expression

infix_expression

operator_identifier "<"

identifier "url"

operator_identifier ">"

identifier "http"

operator_identifier "://"

identifier "xerial"

ERROR

. "."

identifier "org"

operator_identifier "/"

identifier "leo"

operator_identifier "</"

identifier "url"

operator_identifier ">"

infix_expression

operator_identifier "</"

identifier "developer"

operator_identifier ">"

infix_expression

operator_identifier "</"

identifier "developers"

operator_identifier ">"

} "}"

) ")"

import_declaration

import "import"

identifier "Dependencies"

. "."

namespace_wildcard

_ "_"

val_definition

modifiers

access_modifier

private "private"

val "val"

identifier "dependentScope"

= "="

string "\"test->test;compile->compile\""

comment

// "//"

val_definition (+79 nodes collapsed)

val_definition (+46 nodes collapsed)

val_definition (+73 nodes collapsed)

val_definition (+66 nodes collapsed)

val_definition (+84 nodes collapsed)

val_definition (+66 nodes collapsed)

object_definition

object "object"

identifier "Dependencies"

template_body

{ "{"

val_definition

val "val"

identifier "testLib"

= "="

call_expression

identifier "Seq"

arguments

( "("

infix_expression

string "\"junit\""

operator_identifier "%"

string "\"junit\""

operator_identifier "%"

string "\"4.10\""

operator_identifier "%"

string "\"test\""

, ","

comment

// "//"

infix_expression

string "\"com.novocode\""

operator_identifier "%"

string "\"junit-interface\""

operator_identifier "%"

string "\"0.10-M2\""

operator_identifier "%"

string "\"test\""

) ")"

} "}"