summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2014-02-26 19:10:35 +0100
committerAdriaan Moors <adriaan.moors@typesafe.com>2014-02-26 15:07:34 -0800
commit7bb1f41cd152b4e4930a1d8f769ddc2304cf6877 (patch)
tree7712f01830be391f64c0110629e8bf4e6d48c6eb /build.xml
parent0e08d4984a3cdf67e7532aafb205fd852f57a56e (diff)
downloadscala-7bb1f41cd152b4e4930a1d8f769ddc2304cf6877.tar.gz
scala-7bb1f41cd152b4e4930a1d8f769ddc2304cf6877.tar.bz2
scala-7bb1f41cd152b4e4930a1d8f769ddc2304cf6877.zip
Revert "SI-7624 Fix -feature warnings in scala/tools/scalap"
This reverts commit f2de2c4ec43180351ef1f306bcc5f24643ba5477 because it broke both lift-json and json4s libraries that depend on scalap's APIs. Arguably, those libraries shouldn't depend on unofficial APIs but they do because they had no better alternative at the time (no Scala reflection). The cost of breaking them is not worth minor change of the package. The f2de2c4ec43180351ef1f306bcc5f24643ba5477 mixed two things: 1. Fixing feature warnings 2. Changing package name When reverting (and resolving conflicts) I tried to keep 1. and revert just 2. However, there were also some questionable changes related to 1. that got reverted. In particular, a package object with implicit members that enable language features is an anti-pattern because members of package object are visible both _within_ and _outside_ of the package. Therefore, user could use wildcard import for importing everything from scalap package and enabled postfixOps language feature unknowingly. I went for just adding imports in just those few files where they were needed. Amended by Adriaan: To allow faster turn around, I re-enabled resolving partest from sonatype, as its version needs to be bumped and I don't want to wait for maven central synch. Conflicts: src/partest/scala/tools/partest/nest/Runner.scala src/scalap/scala/tools/scalap/scalax/rules/Memoisable.scala src/scalap/scala/tools/scalap/scalax/rules/Rule.scala src/scalap/scala/tools/scalap/scalax/rules/Rules.scala src/scalap/scala/tools/scalap/scalax/rules/scalasig/ClassFileParser.scala src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala
Diffstat (limited to 'build.xml')
-rwxr-xr-xbuild.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/build.xml b/build.xml
index 4979ec26e7..ffac3faaa5 100755
--- a/build.xml
+++ b/build.xml
@@ -274,6 +274,7 @@ TODO:
</artifact:dependencies>
+ <artifact:remoteRepository id="sonatype-release" url="https://oss.sonatype.org/content/repositories/releases"/>
<artifact:remoteRepository id="extra-repo" url="${extra.repo.url}"/>
<!-- prepare, for each of the names below, the property "@{name}.cross", set to the
@@ -293,6 +294,7 @@ TODO:
<!-- so we don't have to wait for artifacts to synch to maven central
(we don't distribute partest with Scala, so the risk of sonatype and maven being out of synch is irrelevant):
-->
+ <artifact:remoteRepository refid="sonatype-release"/>
<artifact:remoteRepository refid="extra-repo"/>
<dependency groupId="org.scala-lang.modules" artifactId="scala-partest${partest.cross}" version="${partest.version.number}" />
</artifact:dependencies>