Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit d3176e4

Browse files
Merge pull request #64 from SethTisue/issue/51
Fix #51 (replaces #61)
2 parents 6fd8694 + 38fbbbe commit d3176e4

File tree

9 files changed

+42
-17
lines changed

9 files changed

+42
-17
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ language: scala
22

33
env:
44
global:
5-
- PUBLISH_JDK=openjdk6
65
# PGP_PASSPHRASE
76
- secure: "BYC1kEnHjNrINrHYWPGEuTTJ2V340/0ByzqeihLecjoZ75yrjWdsh6MI1JEUWgv5kb+58vLzib21JfnjsPK6Yb2bSXuCFCsEtJNh6RJKgxkWlCOzfTSh5I2wl7PCjRClRL6gseX2uTSvFjL4Z//pmxwxeXlLp7voQe4QAUq1+sE="
87
# SONA_USER
@@ -14,7 +13,7 @@ script: admin/build.sh
1413

1514
jdk:
1615
- openjdk6
17-
- openjdk7
16+
- oraclejdk8
1817

1918
notifications:
2019
email: adriaan.moors@typesafe.com

‎admin/README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ To configure tag driven releases from Travis CI.
1919
Edit `.travis.yml` as prompted.
2020
4. Edit `.travis.yml` to use `./admin/build.sh` as the build script,
2121
and edit that script to use the tasks required for this project.
22-
5. Edit `.travis.yml` to select which JDK will be used for publishing.
22+
5. Edit `build.sbt` to select which JDK will be used for publishing
23+
for which Scala versions.
2324

2425
It is important to add comments in .travis.yml to identify the name
2526
of each environment variable encoded in a `:secure` section.
@@ -30,7 +31,6 @@ form:
3031
language: scala
3132
env:
3233
global:
33-
- PUBLISH_JDK=openjdk6
3434
# PGP_PASSPHRASE
3535
- secure: "XXXXXX"
3636
# SONA_USER
@@ -58,4 +58,3 @@ Be sure to use SBT 0.13.7 or higher to avoid [#1430](https://github.com/sbt/sbt/
5858
3. Log into https://oss.sonatype.org/ and identify the staging repository.
5959
4. Sanity check its contents
6060
5. Release staging repository to Maven and send out release announcement.
61-

‎admin/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set -e
77
# git on travis does not fetch tags, but we have TRAVIS_TAG
88
# headTag=$(git describe --exact-match ||:)
99

10-
if ["$TRAVIS_JDK_VERSION"=="$PUBLISH_JDK" ] && [[ "$TRAVIS_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)? ]]; then
10+
if [[ "$TRAVIS_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)? ]]; then
1111
echo "Going to release from tag $TRAVIS_TAG!"
1212
myVer=$(echo $TRAVIS_TAG | sed -e s/^v//)
1313
publishVersion='set every version := "'$myVer'"'

‎build.sbt‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,20 @@ version := "1.0.5-SNAPSHOT"
88

99
scalaVersion := crossScalaVersions.value.head
1010

11-
crossScalaVersions := Seq("2.11.6", "2.12.0-M1")
11+
crossScalaVersions := {
12+
val java = System.getProperty("java.version")
13+
if (java.startsWith("1.6."))
14+
Seq("2.11.7", "2.12.0-M1")
15+
else if (java.startsWith("1.8."))
16+
Seq("2.12.0-M2")
17+
else
18+
sys.error(s"don't know what Scala versions to build on $java")
19+
}
20+
21+
//reenable -Xfatal-warnings?
22+
scalacOptions ++= "-deprecation:false -feature -Xlint:-stars-align,-nullary-unit,_".split("\\s+").to[Seq]
23+
24+
scalacOptions in Test += "-Xxml:coalescing"
1225

1326
// important!! must come here (why?)
1427
scalaModuleOsgiSettings

‎src/main/scala/scala/xml/dtd/ContentModel.scala‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,21 @@ import scala.xml.dtd.impl._
1414
import scala.xml.Utility.sbToString
1515
import PartialFunction._
1616

17+
/*
18+
@deprecated("Avoidance", since="2.10")
19+
trait ContentModelLaundry extends WordExp
20+
object ContentModelLaundry extends ContentModelLaundry {
21+
}
22+
*/
23+
1724
object ContentModel extends WordExp {
25+
1826
type _labelT = ElemName
1927
type _regexpT = RegExp
2028

21-
object Translator extends WordBerrySethi {
29+
@deprecated("Avoidance", since="2.10")
30+
trait Translator extends WordBerrySethi
31+
object Translator extends Translator {
2232
override val lang: ContentModel.this.type = ContentModel.this
2333
}
2434

@@ -72,14 +82,15 @@ object ContentModel extends WordExp {
7282
case Letter(ElemName(name)) =>
7383
sb.append(name)
7484
}
75-
7685
}
7786

7887
sealed abstract class ContentModel {
7988
override def toString(): String = sbToString(buildString)
8089
def buildString(sb: StringBuilder): StringBuilder
8190
}
8291

92+
import ContentModel.RegExp
93+
8394
case object PCDATA extends ContentModel {
8495
override def buildString(sb: StringBuilder): StringBuilder = sb.append("(#PCDATA)")
8596
}
@@ -91,16 +102,16 @@ case object ANY extends ContentModel {
91102
}
92103
sealed abstract class DFAContentModel extends ContentModel {
93104
import ContentModel.{ ElemName, Translator }
94-
def r: ContentModel.RegExp
105+
def r: RegExp
95106

96107
lazy val dfa: DetWordAutom[ElemName] = {
97108
val nfa = Translator.automatonFrom(r, 1)
98109
new SubsetConstruction(nfa).determinize
99110
}
100111
}
101112

102-
case class MIXED(r: ContentModel.RegExp) extends DFAContentModel {
103-
import ContentModel.{ Alt, RegExp }
113+
case class MIXED(r: RegExp) extends DFAContentModel {
114+
import ContentModel.Alt
104115

105116
override def buildString(sb: StringBuilder): StringBuilder = {
106117
val newAlt = r match { case Alt(rs@_*) => Alt(rs drop 1: _*) }
@@ -111,7 +122,7 @@ case class MIXED(r: ContentModel.RegExp) extends DFAContentModel {
111122
}
112123
}
113124

114-
case class ELEMENTS(r: ContentModel.RegExp) extends DFAContentModel {
125+
case class ELEMENTS(r: RegExp) extends DFAContentModel {
115126
override def buildString(sb: StringBuilder): StringBuilder =
116127
ContentModel.buildString(r, sb)
117128
}

‎src/main/scala/scala/xml/dtd/impl/WordBerrySethi.scala‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import scala.collection.{ immutable, mutable }
1919
* @version 1.0
2020
*/
2121
// TODO: still used in ContentModel -- @deprecated("This class will be removed", "2.10.0")
22+
@deprecated("This class will be removed", "2.10.0")
2223
private[dtd] abstract class WordBerrySethi extends BaseBerrySethi {
2324
override val lang: WordExp
2425

‎src/main/scala/scala/xml/pull/XMLEventReader.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ trait ProducerConsumerIterator[T >: Null] extends Iterator[T] {
122122
// defaults to unbounded - override to positive Int if desired
123123
val MaxQueueSize = -1
124124

125-
def interruptibly[T](body: => T): Option[T] = try Some(body) catch {
125+
def interruptibly[A](body: => A): Option[A] = try Some(body) catch {
126126
case _: InterruptedException =>
127127
Thread.currentThread.interrupt(); None
128128
case _: ClosedChannelException => None

‎src/test/scala/scala/xml/ShouldCompile.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ class Foo {
2222
}
2323

2424
// t2281
25-
class A {
25+
class t2281A {
2626
def f(x: Boolean) = if (x) <br/><br/> else <br/>
2727
}
2828

29-
class B {
29+
class t2281B {
3030
def splitSentences(text: String): ArrayBuffer[String] = {
3131
val outarr = new ArrayBuffer[String]
3232
var outstr = new StringBuffer
@@ -92,4 +92,4 @@ object shouldCompile {
9292
case 1 => <xml:group></xml:group>
9393
case 2 => <p></p>
9494
}
95-
}
95+
}

‎src/test/scala/scala/xml/XMLTest.scala‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package scala.xml
22

3+
import language.postfixOps
4+
35
import org.junit.{Test => UnitTest}
46
import org.junit.Ignore
57
import org.junit.runner.RunWith

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /