Skip to content

Commit 70f960c

Browse files
retronymretronym
committed
Merge pull request scala#4272 from retronym/merge/2.11.x-to-2.12.x-20150129
Merge 2.11.x to 2.12.x
2 parents 8b5f2b4 + 4176653 commit 70f960c

File tree

702 files changed

+13507
-3421
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

702 files changed

+13507
-3421
lines changed

‎.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
# eclipse, intellij
4040
/.classpath
4141
/.project
42-
/src/intellij/*.iml
43-
/src/intellij/*.ipr
44-
/src/intellij/*.iws
42+
/src/intellij*/*.iml
43+
/src/intellij*/*.ipr
44+
/src/intellij*/*.iws
4545
**/.cache
4646
/.idea
4747
/.settings

‎bincompat-backward.whitelist.conf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,16 @@ filter {
207207
{
208208
matchName="scala.collection.immutable.Stream.scala$collection$immutable$Stream$$loop$4"
209209
problemName=MissingMethodProblem
210+
},
211+
// SI-8946
212+
{
213+
matchName="scala.reflect.runtime.ThreadLocalStorage#MyThreadLocalStorage.values"
214+
problemName=MissingMethodProblem
215+
},
216+
// the below method was the unused private (sic!) method but the compatibility checker was complaining about it
217+
{
218+
matchName="scala.reflect.io.ZipArchive.scala$reflect$io$ZipArchive$$walkIterator"
219+
problemName=MissingMethodProblem
210220
}
211221
]
212222
}

‎bincompat-forward.whitelist.conf

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,28 @@ filter {
389389
{
390390
matchName="scala.collection.immutable.Stream.scala$collection$immutable$Stream$$loop$2"
391391
problemName=MissingMethodProblem
392+
},
393+
// changes needed by ZipArchiveFileLookup (the flat classpath representation)
394+
{
395+
matchName="scala.reflect.io.FileZipArchive.allDirs"
396+
problemName=MissingMethodProblem
397+
},
398+
{
399+
matchName="scala.reflect.io.FileZipArchive.root"
400+
problemName=MissingMethodProblem
401+
},
402+
// introduced the harmless method (instead of the repeated code in several places)
403+
{
404+
matchName="scala.reflect.runtime.Settings#MultiStringSetting.valueSetByUser"
405+
problemName=MissingMethodProblem
406+
},
407+
{
408+
matchName="scala.reflect.runtime.Settings#BooleanSetting.valueSetByUser"
409+
problemName=MissingMethodProblem
410+
},
411+
{
412+
matchName="scala.reflect.runtime.Settings#IntSetting.valueSetByUser"
413+
problemName=MissingMethodProblem
392414
}
393415
]
394416
}

‎build.number

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ version.patch=0
55
# This is the -N part of a version. if it's 0, it's dropped from maven versions.
66
version.bnum=0
77

8-
# Note: To build a release run ant with -Dbuild.release=true
9-
# To build an RC, run ant with -Dmaven.version.suffix=-RCN
8+
# To build a release, see scripts/jobs/scala-release-2.11.x-build
9+
# (normally run by the eponymous job on scala-ci.typesafe.com).

‎build.xml

Lines changed: 49 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -272,28 +272,37 @@ TODO:
272272
</artifact:dependencies>
273273

274274
<!-- JUnit -->
275-
<property name="junit.version" value="4.10"/>
275+
<property name="junit.version" value="4.11"/>
276276
<artifact:dependencies pathId="junit.classpath" filesetId="junit.fileset">
277277
<dependency groupId="junit" artifactId="junit" version="${junit.version}"/>
278278
</artifact:dependencies>
279279
<copy-deps project="junit"/>
280280

281281
<!-- Pax runner -->
282-
<property name="pax.exam.version" value="2.6.0"/>
282+
<property name="pax.exam.version" value="3.5.0"/><!-- Last version which supports Java 6 -->
283+
<property name="osgi.felix.version" value="4.4.0"/>
284+
<property name="osgi.equinox.version" value="3.7.1"/>
283285
<artifact:dependencies pathId="pax.exam.classpath" filesetId="pax.exam.fileset">
284-
<dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-container-native" version="${pax.exam.version}"/>
286+
<dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-container-native" version="${pax.exam.version}">
287+
<exclusion groupId="org.osgi" artifactId="org.osgi.core"/><!-- Avoid dragging in a dependency which requires Java >6 -->
288+
</dependency>
285289
<dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-junit4" version="${pax.exam.version}"/>
286290
<dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-link-assembly" version="${pax.exam.version}"/>
287-
<!-- upgraded to 1.6.0 to get fix for https://ops4j1.jira.com/browse/PAXURL-217
288-
https://ops4j1.jira.com/browse/PAXURL-138 is still unresolved... -->
289-
<dependency groupId="org.ops4j.pax.url" artifactId="pax-url-aether" version="1.6.0"/>
290-
<dependency groupId="org.ops4j.pax.swissbox" artifactId="pax-swissbox-framework" version="1.5.1"/>
291-
<dependency groupId="ch.qos.logback" artifactId="logback-core" version="0.9.20"/>
292-
<dependency groupId="ch.qos.logback" artifactId="logback-classic" version="0.9.20"/>
291+
<dependency groupId="org.ops4j.pax.url" artifactId="pax-url-aether" version="2.2.0"/>
292+
<dependency groupId="org.ops4j.pax.swissbox" artifactId="pax-swissbox-tracker" version="1.8.0"/>
293+
<dependency groupId="ch.qos.logback" artifactId="logback-core" version="1.1.2"/>
294+
<dependency groupId="ch.qos.logback" artifactId="logback-classic" version="1.1.2"/>
293295
<dependency groupId="junit" artifactId="junit" version="${junit.version}"/>
294-
<dependency groupId="org.apache.felix" artifactId="org.apache.felix.framework" version="3.2.2"/>
295296
</artifact:dependencies>
297+
<copy-deps project="pax.exam"/>
296298

299+
<artifact:dependencies pathId="osgi.framework.felix">
300+
<dependency groupId="org.apache.felix" artifactId="org.apache.felix.framework" version="${osgi.felix.version}"/>
301+
</artifact:dependencies>
302+
303+
<artifact:dependencies pathId="osgi.framework.equinox">
304+
<dependency groupId="org.eclipse.osgi" artifactId="org.eclipse.osgi" version="${osgi.equinox.version}"/>
305+
</artifact:dependencies>
297306

298307
<artifact:remoteRepository id="sonatype-release" url="https://oss.sonatype.org/content/repositories/releases"/>
299308
<artifact:remoteRepository id="extra-repo" url="${extra.repo.url}"/>
@@ -840,8 +849,7 @@ TODO:
840849
-->
841850

842851
<path id="pack.reflect.files"> <fileset dir="${build-quick.dir}/classes/reflect"/> </path>
843-
<path id="pack.scalap.files"> <fileset dir="${build-quick.dir}/classes/scalap"/>
844-
<fileset file="${src.dir}/scalap/decoder.properties"/> </path>
852+
<path id="pack.scalap.files"> <fileset dir="${build-quick.dir}/classes/scalap"/> </path>
845853

846854
<path id="pack.partest-extras.files"> <fileset dir="${build-quick.dir}/classes/partest-extras"/> </path>
847855
<path id="pack.partest-javaagent.files"> <fileset dir="${build-quick.dir}/classes/partest-javaagent"/> </path>
@@ -984,6 +992,16 @@ TODO:
984992
<path refid="forkjoin.classpath"/>
985993
</path>
986994

995+
<path id="test.osgi.compiler.build.path.felix">
996+
<path refid="test.osgi.compiler.build.path"/>
997+
<path refid="osgi.framework.felix"/>
998+
</path>
999+
1000+
<path id="test.osgi.compiler.build.path.equinox">
1001+
<path refid="test.osgi.compiler.build.path"/>
1002+
<path refid="osgi.framework.equinox"/>
1003+
</path>
1004+
9871005
<path id="test.positions.sub.build.path" path="${build-quick.dir}/classes/library"/>
9881006

9891007
<!-- TODO: consolidate *.includes -->
@@ -1351,22 +1369,36 @@ TODO:
13511369
srcdir="${test.osgi.src}"
13521370
jvmargs="${scalacfork.jvmargs}">
13531371
<include name="**/*.scala"/>
1354-
<compilationpath refid="test.osgi.compiler.build.path"/>
1372+
<compilationpath refid="test.osgi.compiler.build.path.felix"/>
13551373
</scalacfork>
13561374
<touch file="${build-osgi.dir}/test-compile.complete" verbose="no"/>
13571375
<stopwatch name="test.osgi.compiler.timer" action="total"/>
13581376
</target>
13591377

13601378
<target name="test.osgi" depends="test.osgi.comp">
1361-
<if><isset property="has.java8"/><then>
1362-
<echo message="Skipping OSGi JUnit tests on Java 8. See SI-8642"/>
1379+
<if><isset property="test.osgi.skip"/><then>
1380+
<echo message="Skipping OSGi JUnit tests"/>
13631381
</then><else>
13641382
<echo message="Running OSGi JUnit tests. Output in ${build-osgi.dir}"/>
13651383
<stopwatch name="test.osgi.timer"/>
13661384
<mkdir dir="${test.osgi.classes}"/>
13671385

1386+
<echo message="Test pass 1 of 2 using Apache Felix ${osgi.felix.version}"/>
1387+
<junit fork="yes" haltonfailure="yes">
1388+
<classpath refid="test.osgi.compiler.build.path.felix"/>
1389+
<jvmarg value="-Duser.home=${user.home}"/>
1390+
<batchtest fork="yes" todir="${build-osgi.dir}">
1391+
<fileset dir="${test.osgi.classes}">
1392+
<include name="**/*Test.class"/>
1393+
</fileset>
1394+
</batchtest>
1395+
<formatter type="xml" />
1396+
</junit>
1397+
1398+
<echo message="Test pass 2 of 2 using Eclipse Equinox ${osgi.equinox.version}"/>
13681399
<junit fork="yes" haltonfailure="yes">
1369-
<classpath refid="test.osgi.compiler.build.path"/>
1400+
<classpath refid="test.osgi.compiler.build.path.equinox"/>
1401+
<jvmarg value="-Duser.home=${user.home}"/>
13701402
<batchtest fork="yes" todir="${build-osgi.dir}">
13711403
<fileset dir="${test.osgi.classes}">
13721404
<include name="**/*Test.class"/>
@@ -1437,7 +1469,7 @@ TODO:
14371469
<stopwatch name="test.junit.compiler.timer" action="total"/>
14381470
</target>
14391471

1440-
<target name="test.junit" depends="test.junit.comp">
1472+
<target name="test.junit" depends="test.junit.comp, test.junit.init">
14411473
<stopwatch name="test.junit.timer"/>
14421474
<mkdir dir="${test.junit.classes}"/>
14431475
<echo message="Note: details of failed tests will be output to ${build-junit.dir}"/>

‎docs/development/scala.tools.nsc/zipfile-bug.txt

Lines changed: 0 additions & 93 deletions
This file was deleted.

0 commit comments

Comments
 (0)