Skip to content
This repository was archived by the owner on Sep 8, 2022. It is now read-only.

Commit bad7e89

Browse files
committed
Build fixes; license; groupId = org.scala-lang.modules
The license is a standard 3-clause BSD license. We're publishing modules under org.scala-lang.modules. This signals they are "just another Scala library": - cross-versioned (cross-versioning under org.scala-lang confuses sbt) - backward binary compatible (but not forward like the core) Compile under Optimize/Deprecation/Features/Lint.
1 parent 5abf9df commit bad7e89

File tree

3 files changed

+59
-24
lines changed

3 files changed

+59
-24
lines changed

LICENSE.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
Copyright (c) 2002-2013 EPFL
2+
Copyright (c) 2011-2013 Typesafe, Inc.
3+
4+
All rights reserved.
5+
6+
Redistribution and use in source and binary forms, with or without modification,
7+
are permitted provided that the following conditions are met:
8+
9+
* Redistributions of source code must retain the above copyright notice,
10+
this list of conditions and the following disclaimer.
11+
* Redistributions in binary form must reproduce the above copyright notice,
12+
this list of conditions and the following disclaimer in the documentation
13+
and/or other materials provided with the distribution.
14+
* Neither the name of the EPFL nor the names of its contributors
15+
may be used to endorse or promote products derived from this software
16+
without specific prior written permission.
17+
18+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
22+
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
23+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
24+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
25+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
26+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
27+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
28+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

build.sbt

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,43 @@
1-
organization := "org.scala-lang"
1+
organization := "org.scala-lang.modules"
22

33
name := "scala-partest"
44

5-
version := "1.0-RC1"
5+
version := "1.0-RC2"
66

7-
scalaVersion := "2.11.0-M4"
8-
9-
scalaBinaryVersion := scalaVersion.value
107

8+
// dependencies:
119
libraryDependencies += "org.apache.ant" % "ant" % "1.8.4"
1210

1311
libraryDependencies += "com.googlecode.java-diff-utils" % "diffutils" % "1.3.0"
1412

15-
libraryDependencies += "org.scala-lang" % "scala-xml" % "2.11.0-M4"
13+
libraryDependencies += "org.scala-sbt" % "test-interface" % "1.0"
14+
15+
libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.10.1"
16+
17+
libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "1.0-RC2"
1618

1719
libraryDependencies += "org.scala-lang" % "scalap" % "2.11.0-M4"
1820

19-
libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.10.1"
2021

21-
libraryDependencies += "org.scala-sbt" % "test-interface" % "1.0"
22+
// standard stuff follows:
23+
scalaVersion := "2.11.0-M4"
2224

25+
// NOTE: not necessarily equal to scalaVersion
26+
// (e.g., during PR validation, we override scalaVersion to validate,
27+
// but don't rebuild scalacheck, so we don't want to rewire that dependency)
28+
scalaBinaryVersion := "2.11.0-M4"
2329

24-
// partest.properties
30+
// don't use for doc scope, scaladoc warnings are not to be reckoned with
31+
scalacOptions in compile ++= Seq("-optimize", "-Xfatal-warnings", "-feature", "-deprecation", "-unchecked", "-Xlint")
32+
33+
34+
// Generate $name.properties to store our version as well as the scala version used to build
35+
// TODO: why doesn't this work for scala-partest.properties?? (After updating def propCategory in Properties, of course)
2536
resourceGenerators in Compile <+= Def.task {
2637
val props = new java.util.Properties
2738
props.put("version.number", version.value)
39+
props.put("scala.version.number", scalaVersion.value)
40+
props.put("scala.binary.version.number", scalaBinaryVersion.value)
2841
val file = (resourceManaged in Compile).value / "partest.properties"
2942
IO.write(props, null, file)
3043
Seq(file)
@@ -55,24 +68,23 @@ pomExtra := (
5568
<inceptionYear>2002</inceptionYear>
5669
<licenses>
5770
<license>
58-
<name>BSD-like</name>
59-
<url>http://www.scala-lang.org/downloads/license.html
60-
</url>
61-
<distribution>repo</distribution>
71+
<distribution>repo</distribution>
72+
<name>BSD 3-Clause</name>
73+
<url>https://github.com/scala/{name.value}/blob/master/LICENSE.md</url>
6274
</license>
63-
</licenses>
75+
</licenses>
6476
<scm>
65-
<connection>scm:git:git://github.com/scala/scala-partest.git</connection>
66-
<url>https://github.com/scala/scala-partest</url>
77+
<connection>scm:git:git://github.com/scala/{name.value}.git</connection>
78+
<url>https://github.com/scala/{name.value}</url>
6779
</scm>
6880
<issueManagement>
6981
<system>JIRA</system>
7082
<url>https://issues.scala-lang.org/</url>
7183
</issueManagement>
7284
<developers>
7385
<developer>
74-
<id>lamp</id>
75-
<name>EPFL LAMP</name>
86+
<id>epfl</id>
87+
<name>EPFL</name>
7688
</developer>
7789
<developer>
7890
<id>Typesafe</id>
@@ -81,8 +93,3 @@ pomExtra := (
8193
</developers>
8294
)
8395

84-
// TODO: mima
85-
// import com.typesafe.tools.mima.plugin.MimaPlugin.mimaDefaultSettings
86-
// import com.typesafe.tools.mima.plugin.MimaKeys.previousArtifact
87-
// previousArtifact := Some("org.scala-lang" % "partest_2.11.0-M4" % "1.0")
88-

src/main/scala/scala/tools/partest/utils/Properties.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
package scala.tools.partest
1111
package utils
1212

13-
/** Loads partest.properties from the jar. */
13+
/** Loads partest.properties from the jar. TODO: standardize on scala-partest.properties */
1414
object Properties extends scala.util.PropertiesTrait {
1515
protected def propCategory = "partest"
1616
protected def pickJarBasedOn = classOf[nest.Runner]

0 commit comments

Comments
 (0)