diff options
Diffstat (limited to 'src/build')
22 files changed, 27 insertions, 649 deletions
diff --git a/src/build/bnd/scala-actors.bnd b/src/build/bnd/scala-actors.bnd deleted file mode 100644 index 69885fc2bf..0000000000 --- a/src/build/bnd/scala-actors.bnd +++ /dev/null @@ -1,7 +0,0 @@ -Bundle-Name: Scala Actors -Bundle-SymbolicName: org.scala-lang.scala-actors -ver: @VERSION@ -Bundle-Version: ${ver} -Export-Package: *;version=${ver} -Import-Package: scala.*;version="${range;[==,=+);${ver}}",* -Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7 diff --git a/src/build/bnd/scala-compiler-doc.bnd b/src/build/bnd/scala-compiler-doc.bnd deleted file mode 100644 index 9d6d0304d1..0000000000 --- a/src/build/bnd/scala-compiler-doc.bnd +++ /dev/null @@ -1,7 +0,0 @@ -Bundle-Name: Scala Documentation Generator -Bundle-SymbolicName: org.scala-lang.modules.scala-compiler-doc_@SCALA_BINARY_VERSION@ -ver: @SCALA_COMPILER_DOC_VERSION@ -Bundle-Version: ${ver} -Export-Package: *;version=${ver} -Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",* -Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7 diff --git a/src/build/bnd/scala-compiler-interactive.bnd b/src/build/bnd/scala-compiler-interactive.bnd deleted file mode 100644 index 07e3de35b0..0000000000 --- a/src/build/bnd/scala-compiler-interactive.bnd +++ /dev/null @@ -1,7 +0,0 @@ -Bundle-Name: Scala Interactive Compiler -Bundle-SymbolicName: org.scala-lang.modules.scala-compiler-interactive_@SCALA_BINARY_VERSION@ -ver: @SCALA_COMPILER_INTERACTIVE_VERSION@ -Bundle-Version: ${ver} -Export-Package: *;version=${ver} -Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",* -Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7 diff --git a/src/build/bnd/scala-compiler.bnd b/src/build/bnd/scala-compiler.bnd deleted file mode 100644 index 2bd24d780d..0000000000 --- a/src/build/bnd/scala-compiler.bnd +++ /dev/null @@ -1,12 +0,0 @@ -Bundle-Name: Scala Compiler -Bundle-SymbolicName: org.scala-lang.scala-compiler -ver: @VERSION@ -Bundle-Version: ${ver} -Export-Package: *;version=${ver} -Import-Package: jline.*;resolution:=optional, \ - org.apache.tools.ant.*;resolution:=optional, \ - scala.util.parsing.*;version="${range;[====,====];@PARSER_COMBINATORS_VERSION@}";resolution:=optional, \ - scala.xml.*;version="${range;[====,====];@XML_VERSION@}";resolution:=optional, \ - scala.*;version="${range;[==,=+);${ver}}", \ - * -Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7 diff --git a/src/build/bnd/scala-continuations-library.bnd b/src/build/bnd/scala-continuations-library.bnd deleted file mode 100644 index b36718cc5b..0000000000 --- a/src/build/bnd/scala-continuations-library.bnd +++ /dev/null @@ -1,7 +0,0 @@ -Bundle-Name: Scala Delimited Continuations Library -Bundle-SymbolicName: org.scala-lang.plugins.scala-continuations-library -ver: @CONTINUATIONS_LIBRARY_VERSION@ -Bundle-Version: ${ver} -Export-Package: *;version=${ver} -Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",* -Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7 diff --git a/src/build/bnd/scala-continuations-plugin.bnd b/src/build/bnd/scala-continuations-plugin.bnd deleted file mode 100644 index 2f2464b452..0000000000 --- a/src/build/bnd/scala-continuations-plugin.bnd +++ /dev/null @@ -1,7 +0,0 @@ -Bundle-Name: Scala Delimited Continuations Compiler Plugin -Bundle-SymbolicName: org.scala-lang.plugins.scala-continuations-plugin -ver: @CONTINUATIONS_PLUGIN_VERSION@ -Bundle-Version: ${ver} -Export-Package: *;version=${ver} -Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",* -Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7 diff --git a/src/build/bnd/scala-library.bnd b/src/build/bnd/scala-library.bnd deleted file mode 100644 index 7eb4fa4b2a..0000000000 --- a/src/build/bnd/scala-library.bnd +++ /dev/null @@ -1,7 +0,0 @@ -Bundle-Name: Scala Standard Library -Bundle-SymbolicName: org.scala-lang.scala-library -ver: @VERSION@ -Bundle-Version: ${ver} -Export-Package: *;version=${ver} -Import-Package: sun.misc;resolution:=optional, * -Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7 diff --git a/src/build/bnd/scala-parser-combinators.bnd b/src/build/bnd/scala-parser-combinators.bnd deleted file mode 100644 index ef8646cbd0..0000000000 --- a/src/build/bnd/scala-parser-combinators.bnd +++ /dev/null @@ -1,7 +0,0 @@ -Bundle-Name: Scala Parser Combinators Library -Bundle-SymbolicName: org.scala-lang.modules.scala-parser-combinators -ver: @PARSER_COMBINATORS_VERSION@ -Bundle-Version: ${ver} -Export-Package: *;version=${ver} -Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",* -Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7 diff --git a/src/build/bnd/scala-reflect.bnd b/src/build/bnd/scala-reflect.bnd deleted file mode 100644 index e4bc54e52e..0000000000 --- a/src/build/bnd/scala-reflect.bnd +++ /dev/null @@ -1,9 +0,0 @@ -Bundle-Name: Scala Reflect -Bundle-SymbolicName: org.scala-lang.scala-reflect -ver: @VERSION@ -Bundle-Version: ${ver} -Export-Package: *;version=${ver} -Import-Package: scala.*;version="${range;[==,=+);${ver}}", \ - scala.tools.nsc;resolution:=optional;version="${range;[==,=+);${ver}}", \ - * -Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7 diff --git a/src/build/bnd/scala-swing.bnd b/src/build/bnd/scala-swing.bnd deleted file mode 100644 index f8b50baa91..0000000000 --- a/src/build/bnd/scala-swing.bnd +++ /dev/null @@ -1,7 +0,0 @@ -Bundle-Name: Scala Swing -Bundle-SymbolicName: org.scala-lang.modules.scala-swing -ver: @SCALA_SWING_VERSION@ -Bundle-Version: ${ver} -Export-Package: *;version=${ver} -Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",* -Bundle-RequiredExecutionEnvironment: JavaSE-1.6,JavaSE-1.7 diff --git a/src/build/bnd/scala-xml.bnd b/src/build/bnd/scala-xml.bnd deleted file mode 100644 index 01bf0144eb..0000000000 --- a/src/build/bnd/scala-xml.bnd +++ /dev/null @@ -1,7 +0,0 @@ -Bundle-Name: Scala XML Library -Bundle-SymbolicName: org.scala-lang.modules.scala-xml -ver: @XML_VERSION@ -Bundle-Version: ${ver} -Export-Package: *;version=${ver} -Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",* -Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7 diff --git a/src/build/dbuild-meta-json-gen.scala b/src/build/dbuild-meta-json-gen.scala index d1d4c12b3f..6405650d88 100644 --- a/src/build/dbuild-meta-json-gen.scala +++ b/src/build/dbuild-meta-json-gen.scala @@ -1,25 +1,29 @@ -// use this script to generate dbuild-meta.json -// make sure the version is specified correctly, -// update the dependency structure and -// check out distributed-build and run `sbt console`: -// TODO: also generate build.xml and eclipse config from a similar data-structure +// Use this script to generate dbuild-meta.json -import distributed.project.model._ +// To generate the file: +// - check out https://github.com/typesafehub/dbuild +// - run `sbt metadata/console` +// - paste the code below + +// The `version` field is required for the ProjMeta data structure. However, dbuild will +// overwrite the version specified here with the version number found in the build.number +// file, so the actual value doesn't matter, see ScalaBuildSystem: +// https://github.com/typesafehub/dbuild/blob/25b087759cc52876712c594ea4172148beea1310/support/src/main/scala/com/typesafe/dbuild/support/scala/ScalaBuildSystem.scala#L351 + +import com.typesafe.dbuild.model._ val meta = - ExtractedBuildMeta("2.11.0", Seq( + ProjMeta(version = "2.12.0", projects = Seq( Project("scala-library", "org.scala-lang", Seq(ProjectRef("scala-library", "org.scala-lang")), - Seq.empty), // TODO: forkjoin + Seq.empty), Project("scala-reflect", "org.scala-lang", Seq(ProjectRef("scala-reflect", "org.scala-lang")), Seq(ProjectRef("scala-library", "org.scala-lang"))), Project("scala-compiler", "org.scala-lang", Seq(ProjectRef("scala-compiler", "org.scala-lang")), Seq(ProjectRef("scala-reflect", "org.scala-lang"), - ProjectRef("scala-xml", "org.scala-lang.modules"), - ProjectRef("scala-parser-combinators", "org.scala-lang.modules") - // asm + ProjectRef("scala-xml", "org.scala-lang.modules") )), // Project("scala-repl", "org.scala-lang", @@ -30,13 +34,9 @@ val meta = // Seq(ProjectRef("scala-interactive", "org.scala-lang")), // Seq(ProjectRef("scala-compiler", "org.scala-lang"), ProjectRef("scaladoc", "org.scala-lang"))), - Project("scala-actors", "org.scala-lang", - Seq(ProjectRef("scala-actors", "org.scala-lang")), - Seq(ProjectRef("scala-library", "org.scala-lang"))), - // Project("scaladoc", "org.scala-lang", // Seq(ProjectRef("scaladoc", "org.scala-lang")), - // Seq(ProjectRef("scala-compiler", "org.scala-lang"),ProjectRef("scala-partest", "org.scala-lang"), ProjectRef("scala-xml", "org.scala-lang"), ProjectRef("scala-parser-combinators", "org.scala-lang"))), + // Seq(ProjectRef("scala-compiler", "org.scala-lang"),ProjectRef("scala-partest", "org.scala-lang"), ProjectRef("scala-xml", "org.scala-lang"))), Project("scalap", "org.scala-lang", Seq(ProjectRef("scalap", "org.scala-lang")), @@ -44,4 +44,4 @@ val meta = )) -println(Utils.writeValue(meta)) +println(Utils.writeValueFormatted(meta)) diff --git a/src/build/genprod.scala b/src/build/genprod.scala index f85a151ae5..a45dc752cc 100644 --- a/src/build/genprod.scala +++ b/src/build/genprod.scala @@ -1,15 +1,13 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2013, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2016, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ -import scala.language.postfixOps - /** This program generates the ProductN, TupleN, FunctionN, - * and AbstractFunctionN, where 0 <= N <= MAX_ARITY. + * and AbstractFunctionN, where 0 <= N <= MaxArity. * * Usage: scala genprod <directory> * where the argument is the desired output directory @@ -17,8 +15,8 @@ import scala.language.postfixOps * @author Burak Emir, Stephane Micheloud, Geoffrey Washburn, Paul Phillips */ object genprod extends App { - val MAX_ARITY = 22 - def arities = (1 to MAX_ARITY).toList + final val MaxArity = 22 + def arities = (1 to MaxArity).toList class Group(val name: String) { def className(i: Int) = name + i @@ -220,7 +218,7 @@ class Function(val i: Int) extends Group("Function") with Arity { """ /** Creates a curried version of this function. * * @return a function `f` such that `f%s == apply%s` - */""".format(xdefs map ("(" + _ + ")") mkString, commaXs) + */""".format(xdefs.map("(" + _ + ")").mkString, commaXs) } def tupleMethod = { @@ -299,7 +297,7 @@ class Tuple(val i: Int) extends Group("Tuple") with Arity { // prettifies it a little if it's overlong def mkToString() = { def str(xs: List[String]) = xs.mkString(""" + "," + """) - if (i <= MAX_ARITY / 2) str(mdefs) + if (i <= MaxArity / 2) str(mdefs) else { val s1 = str(mdefs take (i / 2)) val s2 = str(mdefs drop (i / 2)) @@ -315,8 +313,7 @@ class Tuple(val i: Int) extends Group("Tuple") with Arity { * @constructor Create a new tuple with {i} elements.{idiomatic} {params} */ -@deprecatedInheritance("Tuples will be made final in a future version.", "2.11.0") -case class {className}{covariantArgs}({fields}) +final case class {className}{covariantArgs}({fields}) extends {Product.className(i)}{invariantArgs} {{ override def toString() = "(" + {mkToString} + ")" @@ -364,7 +361,7 @@ class Product(val i: Int) extends Group("Product") with Arity { def cases = { val xs = for ((x, i) <- mdefs.zipWithIndex) yield "case %d => %s".format(i, x) val default = "case _ => throw new IndexOutOfBoundsException(n.toString())" - "\n" + ((xs ::: List(default)) map (" " + _ + "\n") mkString) + "\n" + ((xs ::: List(default)).map(" " + _ + "\n").mkString) } def proj = { (mdefs,targs).zipped.map( (_,_) ).zipWithIndex.map { case ((method,typeName),index) => @@ -373,7 +370,7 @@ class Product(val i: Int) extends Group("Product") with Arity { | */ | def %s: %s |""".stripMargin.format(index + 1, index + 1, method, typeName) - } mkString + }.mkString } def apply() = { @@ -383,7 +380,7 @@ object {className} {{ Some(x) }} -/** {className} is a cartesian product of {i} component{s}. +/** {className} is a Cartesian product of {i} component{s}. * @since 2.3 */ trait {className}{covariantArgs} extends Any with Product {{ diff --git a/src/build/maven/scala-actors-pom.xml b/src/build/maven/scala-actors-pom.xml deleted file mode 100644 index 37500bf9ae..0000000000 --- a/src/build/maven/scala-actors-pom.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0"?> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.scala-lang</groupId> - <artifactId>scala-actors</artifactId> - <packaging>jar</packaging> - <version>@VERSION@</version> - <name>Scala Actors library</name> - <description>Deprecated Actors Library for Scala</description> - <url>http://www.scala-lang.org/</url> - <inceptionYear>2006</inceptionYear> - <organization> - <name>LAMP/EPFL</name> - <url>http://lamp.epfl.ch/</url> - </organization> - <licenses> - <license> - <name>BSD 3-Clause</name> - <url>http://www.scala-lang.org/license.html</url> - <distribution>repo</distribution> - </license> - </licenses> - <scm> - <connection>scm:git:git://github.com/scala/scala.git</connection> - <url>https://github.com/scala/scala.git</url> - </scm> - <issueManagement> - <system>JIRA</system> - <url>https://issues.scala-lang.org/</url> - </issueManagement> - <properties> - <info.apiURL>http://www.scala-lang.org/api/@VERSION@/</info.apiURL> - </properties> - <dependencies> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - <version>@VERSION@</version> - </dependency> - </dependencies> - <developers> - <developer> - <id>lamp</id> - <name>EPFL LAMP</name> - </developer> - <developer> - <id>Lightbend</id> - <name>Lightbend, Inc.</name> - </developer> - </developers> -</project> diff --git a/src/build/maven/scala-compiler-doc-pom.xml b/src/build/maven/scala-compiler-doc-pom.xml deleted file mode 100644 index 0c33d23d61..0000000000 --- a/src/build/maven/scala-compiler-doc-pom.xml +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0"?> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.scala-lang.modules</groupId> - <artifactId>scala-compiler-doc_@SCALA_BINARY_VERSION@</artifactId> - <packaging>jar</packaging> - <version>@SCALA_COMPILER_DOC_VERSION@</version> - <name>Scala Documentation Generator</name> - <description>Documentation generator for the Scala Programming Language</description> - <url>http://www.scala-lang.org/</url> - <inceptionYear>2002</inceptionYear> - <organization> - <name>LAMP/EPFL</name> - <url>http://lamp.epfl.ch/</url> - </organization> - <licenses> - <license> - <name>BSD 3-Clause</name> - <url>http://www.scala-lang.org/license.html</url> - <distribution>repo</distribution> - </license> - </licenses> - <scm> - <connection>scm:git:git://github.com/scala/scala.git</connection> - <url>https://github.com/scala/scala.git</url> - </scm> - <issueManagement> - <system>JIRA</system> - <url>https://issues.scala-lang.org/</url> - </issueManagement> - <dependencies> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-compiler</artifactId> - <version>@VERSION@</version> - </dependency> - <dependency> - <groupId>org.scala-lang.modules</groupId> - <artifactId>scala-xml_@SCALA_BINARY_VERSION@</artifactId> - <version>@XML_VERSION@</version> - </dependency> - <dependency> - <groupId>org.scala-lang.modules</groupId> - <artifactId>scala-parser-combinators_@SCALA_BINARY_VERSION@</artifactId> - <version>@PARSER_COMBINATORS_VERSION@</version> - </dependency> - </dependencies> - <developers> - <developer> - <id>lamp</id> - <name>EPFL LAMP</name> - </developer> - <developer> - <id>Lightbend</id> - <name>Lightbend, Inc.</name> - </developer> - </developers> -</project> diff --git a/src/build/maven/scala-compiler-interactive-pom.xml b/src/build/maven/scala-compiler-interactive-pom.xml deleted file mode 100644 index d3e5e0b834..0000000000 --- a/src/build/maven/scala-compiler-interactive-pom.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0"?> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.scala-lang.modules</groupId> - <artifactId>scala-compiler-interactive_@SCALA_BINARY_VERSION@</artifactId> - <packaging>jar</packaging> - <version>@SCALA_COMPILER_INTERACTIVE_VERSION@</version> - <name>Scala Interactive Compiler</name> - <description>Interactive Compiler for the Scala Programming Language</description> - <url>http://www.scala-lang.org/</url> - <inceptionYear>2002</inceptionYear> - <organization> - <name>LAMP/EPFL</name> - <url>http://lamp.epfl.ch/</url> - </organization> - <licenses> - <license> - <name>BSD 3-Clause</name> - <url>http://www.scala-lang.org/license.html</url> - <distribution>repo</distribution> - </license> - </licenses> - <scm> - <connection>scm:git:git://github.com/scala/scala.git</connection> - <url>https://github.com/scala/scala.git</url> - </scm> - <issueManagement> - <system>JIRA</system> - <url>https://issues.scala-lang.org/</url> - </issueManagement> - <dependencies> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-compiler</artifactId> - <version>@VERSION@</version> - </dependency> - </dependencies> - <developers> - <developer> - <id>lamp</id> - <name>EPFL LAMP</name> - </developer> - <developer> - <id>Lightbend</id> - <name>Lightbend, Inc.</name> - </developer> - </developers> -</project> diff --git a/src/build/maven/scala-compiler-pom.xml b/src/build/maven/scala-compiler-pom.xml deleted file mode 100644 index 15546109c8..0000000000 --- a/src/build/maven/scala-compiler-pom.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0"?> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.scala-lang</groupId> - <artifactId>scala-compiler</artifactId> - <packaging>jar</packaging> - <version>@VERSION@</version> - <name>Scala Compiler</name> - <description>Compiler for the Scala Programming Language</description> - <url>http://www.scala-lang.org/</url> - <inceptionYear>2002</inceptionYear> - <organization> - <name>LAMP/EPFL</name> - <url>http://lamp.epfl.ch/</url> - </organization> - <licenses> - <license> - <name>BSD 3-Clause</name> - <url>http://www.scala-lang.org/license.html</url> - <distribution>repo</distribution> - </license> - </licenses> - <scm> - <connection>scm:git:git://github.com/scala/scala.git</connection> - <url>https://github.com/scala/scala.git</url> - </scm> - <issueManagement> - <system>JIRA</system> - <url>https://issues.scala-lang.org/</url> - </issueManagement> - <dependencies> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - <version>@VERSION@</version> - </dependency> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-reflect</artifactId> - <version>@VERSION@</version> - </dependency> - <!-- TODO modularize compiler: these dependencies will disappear when the compiler is modularized --> - <dependency> <!-- for scala-compiler-doc --> - <groupId>org.scala-lang.modules</groupId> - <artifactId>scala-xml_@SCALA_BINARY_VERSION@</artifactId> - <version>@XML_VERSION@</version> - </dependency> - <dependency> <!-- for scala-compiler-doc --> - <groupId>org.scala-lang.modules</groupId> - <artifactId>scala-parser-combinators_@SCALA_BINARY_VERSION@</artifactId> - <version>@PARSER_COMBINATORS_VERSION@</version> - </dependency> - <dependency> <!-- for scala-compiler-repl; once it moves there, make it required --> - <groupId>jline</groupId> - <artifactId>jline</artifactId> - <version>@JLINE_VERSION@</version> - <optional>true</optional> - </dependency> - </dependencies> - <developers> - <developer> - <id>lamp</id> - <name>EPFL LAMP</name> - </developer> - <developer> - <id>Lightbend</id> - <name>Lightbend, Inc.</name> - </developer> - </developers> -</project> diff --git a/src/build/maven/scala-dist-pom.xml b/src/build/maven/scala-dist-pom.xml deleted file mode 100644 index 6788ff0106..0000000000 --- a/src/build/maven/scala-dist-pom.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0"?> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.scala-lang</groupId> - <artifactId>scala-dist</artifactId> - <packaging>jar</packaging> - <version>@VERSION@</version> - <name>Scala Distribution Artifacts</name> - <description>The Artifacts Distributed with Scala</description> - <url>http://www.scala-lang.org/</url> - <inceptionYear>2002</inceptionYear> - <organization> - <name>LAMP/EPFL</name> - <url>http://lamp.epfl.ch/</url> - </organization> - <licenses> - <license> - <name>BSD 3-Clause</name> - <url>http://www.scala-lang.org/license.html</url> - <distribution>repo</distribution> - </license> - </licenses> - <scm> - <connection>scm:git:git://github.com/scala/scala.git</connection> - <url>https://github.com/scala/scala.git</url> - </scm> - <issueManagement> - <system>JIRA</system> - <url>https://issues.scala-lang.org/</url> - </issueManagement> - <dependencies> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library-all</artifactId> - <version>@VERSION@</version> - </dependency> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-compiler</artifactId> - <version>@VERSION@</version> - </dependency> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scalap</artifactId> - <version>@VERSION@</version> - </dependency> - <dependency> - <groupId>org.scala-lang.plugins</groupId> - <!-- plugins are fully cross-versioned. But, we don't publish with 2.11.0-SNAPSHOT, instead use full version of the last non-snapshot version --> - <artifactId>scala-continuations-plugin_@SCALA_FULL_VERSION@</artifactId> - <version>@CONTINUATIONS_PLUGIN_VERSION@</version> - </dependency> - <!-- duplicated from scala-compiler, where it's optional, - so that resolving scala-dist's transitive dependencies does not include jline, - even though we need to include it in the dist, but macros depending on the compiler - shouldn't have to require jline... - another reason to modularize and move the dependency to scala-compiler-repl - TODO: remove duplication once we have the scala-compiler-repl module --> - <dependency> - <groupId>jline</groupId> - <artifactId>jline</artifactId> - <version>@JLINE_VERSION@</version> - </dependency> - </dependencies> - <developers> - <developer> - <id>lamp</id> - <name>EPFL LAMP</name> - </developer> - <developer> - <id>Lightbend</id> - <name>Lightbend, Inc.</name> - </developer> - </developers> -</project> diff --git a/src/build/maven/scala-library-all-pom.xml b/src/build/maven/scala-library-all-pom.xml deleted file mode 100644 index 1991bae131..0000000000 --- a/src/build/maven/scala-library-all-pom.xml +++ /dev/null @@ -1,88 +0,0 @@ -<?xml version="1.0"?> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library-all</artifactId> - <packaging>pom</packaging> - <version>@VERSION@</version> - <name>Scala Library Powerpack</name> - <description>The Scala Standard Library and Official Modules</description> - <url>http://www.scala-lang.org/</url> - <inceptionYear>2002</inceptionYear> - <organization> - <name>LAMP/EPFL</name> - <url>http://lamp.epfl.ch/</url> - </organization> - <licenses> - <license> - <name>BSD 3-Clause</name> - <url>http://www.scala-lang.org/license.html</url> - <distribution>repo</distribution> - </license> - </licenses> - <scm> - <connection>scm:git:git://github.com/scala/scala.git</connection> - <url>https://github.com/scala/scala.git</url> - </scm> - <issueManagement> - <system>JIRA</system> - <url>https://issues.scala-lang.org/</url> - </issueManagement> - <dependencies> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - <version>@VERSION@</version> - </dependency> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-reflect</artifactId> - <version>@VERSION@</version> - </dependency> - <dependency> - <groupId>org.scala-lang.modules</groupId> - <artifactId>scala-xml_@SCALA_BINARY_VERSION@</artifactId> - <version>@XML_VERSION@</version> - </dependency> - <dependency> - <groupId>org.scala-lang.modules</groupId> - <artifactId>scala-parser-combinators_@SCALA_BINARY_VERSION@</artifactId> - <version>@PARSER_COMBINATORS_VERSION@</version> - </dependency> - <!-- - the continuations plugin is a dependency of scala-dist, as scala-library-all should be - a drop-in replacement for scala-library, and as such should not (indirectly) - depend on plugins/the compiler. - --> - <dependency> - <groupId>org.scala-lang.plugins</groupId> - <artifactId>scala-continuations-library_@SCALA_BINARY_VERSION@</artifactId> - <version>@CONTINUATIONS_LIBRARY_VERSION@</version> - </dependency> - <dependency> - <groupId>org.scala-lang.modules</groupId> - <artifactId>scala-swing_@SCALA_BINARY_VERSION@</artifactId> - <version>@SCALA_SWING_VERSION@</version> - </dependency> - <dependency> - <groupId>com.typesafe.akka</groupId> - <artifactId>akka-actor_@SCALA_BINARY_VERSION@</artifactId> - <version>@AKKA_ACTOR_VERSION@</version> - </dependency> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-actors-migration_@SCALA_BINARY_VERSION@</artifactId> - <version>@ACTORS_MIGRATION_VERSION@</version> - </dependency> - </dependencies> - <developers> - <developer> - <id>lamp</id> - <name>EPFL LAMP</name> - </developer> - <developer> - <id>Lightbend</id> - <name>Lightbend, Inc.</name> - </developer> - </developers> -</project> diff --git a/src/build/maven/scala-library-pom.xml b/src/build/maven/scala-library-pom.xml deleted file mode 100644 index e27f8fb12f..0000000000 --- a/src/build/maven/scala-library-pom.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0"?> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - <packaging>jar</packaging> - <version>@VERSION@</version> - <name>Scala Library</name> - <description>Standard library for the Scala Programming Language</description> - <url>http://www.scala-lang.org/</url> - <inceptionYear>2002</inceptionYear> - <organization> - <name>LAMP/EPFL</name> - <url>http://lamp.epfl.ch/</url> - </organization> - <licenses> - <license> - <name>BSD 3-Clause</name> - <url>http://www.scala-lang.org/license.html</url> - <distribution>repo</distribution> - </license> - </licenses> - <scm> - <connection>scm:git:git://github.com/scala/scala.git</connection> - <url>https://github.com/scala/scala.git</url> - </scm> - <issueManagement> - <system>JIRA</system> - <url>https://issues.scala-lang.org/</url> - </issueManagement> - <properties> - <info.apiURL>http://www.scala-lang.org/api/@VERSION@/</info.apiURL> - </properties> - <dependencies> - </dependencies> - <developers> - <developer> - <id>lamp</id> - <name>EPFL LAMP</name> - </developer> - <developer> - <id>Lightbend</id> - <name>Lightbend, Inc.</name> - </developer> - </developers> -</project> diff --git a/src/build/maven/scala-reflect-pom.xml b/src/build/maven/scala-reflect-pom.xml deleted file mode 100644 index f7f3c8bc08..0000000000 --- a/src/build/maven/scala-reflect-pom.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0"?> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.scala-lang</groupId> - <artifactId>scala-reflect</artifactId> - <packaging>jar</packaging> - <version>@VERSION@</version> - <name>Scala Compiler</name> - <description>Compiler for the Scala Programming Language</description> - <url>http://www.scala-lang.org/</url> - <inceptionYear>2002</inceptionYear> - <organization> - <name>LAMP/EPFL</name> - <url>http://lamp.epfl.ch/</url> - </organization> - <licenses> - <license> - <name>BSD 3-Clause</name> - <url>http://www.scala-lang.org/license.html</url> - <distribution>repo</distribution> - </license> - </licenses> - <scm> - <connection>scm:git:git://github.com/scala/scala.git</connection> - <url>https://github.com/scala/scala.git</url> - </scm> - <issueManagement> - <system>JIRA</system> - <url>https://issues.scala-lang.org/</url> - </issueManagement> - <properties> - <info.apiURL>http://www.scala-lang.org/api/@VERSION@/</info.apiURL> - </properties> - <dependencies> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - <version>@VERSION@</version> - </dependency> - </dependencies> - <developers> - <developer> - <id>lamp</id> - <name>EPFL LAMP</name> - </developer> - <developer> - <id>Lightbend</id> - <name>Lightbend, Inc.</name> - </developer> - </developers> -</project> diff --git a/src/build/maven/scalap-pom.xml b/src/build/maven/scalap-pom.xml deleted file mode 100644 index acdd44f19b..0000000000 --- a/src/build/maven/scalap-pom.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0"?> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.scala-lang</groupId> - <artifactId>scalap</artifactId> - <packaging>jar</packaging> - <version>@VERSION@</version> - <name>Scalap</name> - <description>bytecode analysis tool</description> - <url>http://www.scala-lang.org/</url> - <inceptionYear>2002</inceptionYear> - <organization> - <name>LAMP/EPFL</name> - <url>http://lamp.epfl.ch/</url> - </organization> - <licenses> - <license> - <name>BSD 3-Clause</name> - <url>http://www.scala-lang.org/license.html</url> - <distribution>repo</distribution> - </license> - </licenses> - <scm> - <connection>scm:git:git://github.com/scala/scala.git</connection> - <url>https://github.com/scala/scala.git</url> - </scm> - <issueManagement> - <system>JIRA</system> - <url>https://issues.scala-lang.org/</url> - </issueManagement> - <dependencies> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-compiler</artifactId> - <version>@VERSION@</version> - </dependency> - </dependencies> - <developers> - <developer> - <id>lamp</id> - <name>EPFL LAMP</name> - </developer> - <developer> - <id>Lightbend</id> - <name>Lightbend, Inc.</name> - </developer> - </developers> -</project> |