Skip to content

Commit 9cba434

Browse files
lrytzlrytz
committed
Remove the continuations plugin module dependency
1 parent f915361 commit 9cba434

File tree

10 files changed

+7
-109
lines changed

10 files changed

+7
-109
lines changed

‎build-ant-macros.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -469,9 +469,7 @@
469469
<filter token="SCALA_COMPILER_INTERACTIVE_VERSION" value="${scala-compiler-interactive.version.number}"/>
470470
<filter token="XML_VERSION" value="${scala-xml.version.number}" />
471471
<filter token="PARSER_COMBINATORS_VERSION" value="${scala-parser-combinators.version.number}" />
472-
<filter token="CONTINUATIONS_PLUGIN_VERSION" value="${scala-continuations-plugin.version.number}" />
473-
<filter token="CONTINUATIONS_LIBRARY_VERSION" value="${scala-continuations-library.version.number}" />
474-
<filter token="SCALA_SWING_VERSION" value="${scala-swing.version.number}" />
472+
<filter token="SCALA_SWING_VERSION" value="${scala-swing.version.number}" />
475473
</filterset>
476474
</copy>
477475
<bnd classpath="${@{project}.jar}" eclipse="false" failok="false" exceptions="true" files="${build-osgi.dir}/${@{project}.name}.bnd" output="${build-osgi.dir}"/>
@@ -595,9 +593,7 @@
595593
<filter token="SCALA_FULL_VERSION" value="${scala.full.version}" />
596594
<filter token="XML_VERSION" value="${scala-xml.version.number}" />
597595
<filter token="PARSER_COMBINATORS_VERSION" value="${scala-parser-combinators.version.number}" />
598-
<filter token="CONTINUATIONS_PLUGIN_VERSION" value="${scala-continuations-plugin.version.number}" />
599-
<filter token="CONTINUATIONS_LIBRARY_VERSION" value="${scala-continuations-library.version.number}" />
600-
<filter token="SCALA_SWING_VERSION" value="${scala-swing.version.number}" />
596+
<filter token="SCALA_SWING_VERSION" value="${scala-swing.version.number}" />
601597
<filter token="RELEASE_REPOSITORY" value="${remote.release.repository}" />
602598
<filter token="SNAPSHOT_REPOSITORY" value="${remote.snapshot.repository}" />
603599
<filter token="JLINE_VERSION" value="${jline.version}" />

‎build.xml

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ TODO:
7575
<target name="nightly"><optimized name="all.done"/></target>
7676
<target name="nightly.checkall"> <antcall target="all.done"> <param name="partest.scalac_opts" value="-Ycheck:all"/></antcall></target>
7777

78-
<!-- The IDE build requires actors/swing/continuations, so need to publish them during PR validation until they are modules -->
79-
<target name="publish-opt-nodocs" description="Publishes Scala (optimized) without generating docs/testing (library/reflect/compiler/actors/swing/continuations).">
78+
<!-- The IDE build requires actors/swing, so need to publish them during PR validation until they are modules -->
79+
<target name="publish-opt-nodocs" description="Publishes Scala (optimized) without generating docs/testing (library/reflect/compiler/actors/swing).">
8080
<antcall target="publish">
8181
<param name="docs.skip" value="1"/>
8282
<param name="scalac.args.optimise" value="-optimise"/>
@@ -311,9 +311,6 @@ TODO:
311311
necessary cross suffix (usually something like "_2.11.0-M6". -->
312312
<prepareCross name="scala-xml" />
313313
<prepareCross name="scala-parser-combinators" />
314-
<property name="scala-continuations-plugin.cross.suffix" value="_${scala.full.version}"/>
315-
<prepareCross name="scala-continuations-plugin" />
316-
<prepareCross name="scala-continuations-library"/>
317314
<prepareCross name="scala-swing"/>
318315
<prepareCross name="partest"/>
319316
<prepareCross name="scalacheck"/>
@@ -347,8 +344,6 @@ TODO:
347344
<artifact:remoteRepository refid="extra-repo"/>
348345
<dependency groupId="org.scala-lang.modules" artifactId="scala-xml${scala-xml.cross}" version="${scala-xml.version.number}"/>
349346
<dependency groupId="org.scala-lang.modules" artifactId="scala-parser-combinators${scala-parser-combinators.cross}" version="${scala-parser-combinators.version.number}"/>
350-
<dependency groupId="org.scala-lang.plugins" artifactId="scala-continuations-plugin${scala-continuations-plugin.cross}" version="${scala-continuations-plugin.version.number}"/>
351-
<dependency groupId="org.scala-lang.plugins" artifactId="scala-continuations-library${scala-continuations-library.cross}" version="${scala-continuations-library.version.number}"/>
352347
<dependency groupId="org.scala-lang.modules" artifactId="scala-swing${scala-swing.cross}" version="${scala-swing.version.number}"/>
353348
</artifact:dependencies>
354349

@@ -367,8 +362,6 @@ TODO:
367362

368363
<propertyForCrossedArtifact name="scala-parser-combinators" jar="org.scala-lang.modules:scala-parser-combinators"/>
369364
<propertyForCrossedArtifact name="scala-xml" jar="org.scala-lang.modules:scala-xml"/>
370-
<propertyForCrossedArtifact name="scala-continuations-plugin" jar="org.scala-lang.plugins:scala-continuations-plugin"/>
371-
<propertyForCrossedArtifact name="scala-continuations-library" jar="org.scala-lang.plugins:scala-continuations-library"/>
372365
<propertyForCrossedArtifact name="scala-swing" jar="org.scala-lang.modules:scala-swing"/>
373366

374367
<!-- BND support -->
@@ -559,11 +552,8 @@ TODO:
559552
<echo message="Updating `versions.properties`:"/>
560553
<echo message="starr.version = ${starr.version}"/>
561554
<echo message="scala.binary.version = ${scala.binary.version}"/>
562-
<echo message="scala.full.version = ${scala.full.version}"/>
563555
<echo message="scala-xml.version.number = ${scala-xml.version.number}"/>
564556
<echo message="scala-parser-combinators.version.number = ${scala-parser-combinators.version.number}"/>
565-
<echo message="scala-continuations-plugin.version.number = ${scala-continuations-plugin.version.number}"/>
566-
<echo message="scala-continuations-library.version.number = ${scala-continuations-library.version.number}"/>
567557
<echo message="scala-swing.version.number = ${scala-swing.version.number}"/>
568558
<echo message="akka-actor.version.number = ${akka-actor.version.number}"/>
569559
<echo message="actors-migration.version.number = ${actors-migration.version.number}"/>
@@ -574,11 +564,8 @@ TODO:
574564
<propertyfile file="versions.properties">
575565
<entry key="starr.version" value="${starr.version}"/>
576566
<entry key="scala.binary.version" value="${scala.binary.version}"/>
577-
<entry key="scala.full.version" value="${scala.full.version}"/>
578567
<entry key="scala-xml.version.number" value="${scala-xml.version.number}"/>
579568
<entry key="scala-parser-combinators.version.number" value="${scala-parser-combinators.version.number}"/>
580-
<entry key="scala-continuations-plugin.version.number" value="${scala-continuations-plugin.version.number}"/>
581-
<entry key="scala-continuations-library.version.number" value="${scala-continuations-library.version.number}"/>
582569
<entry key="scala-swing.version.number" value="${scala-swing.version.number}"/>
583570
<entry key="akka-actor.version.number" value="${akka-actor.version.number}"/>
584571
<entry key="actors-migration.version.number" value="${actors-migration.version.number}"/>
@@ -627,18 +614,6 @@ TODO:
627614
<property name="swing.src" value="false"/>
628615
<property name="swing.srcjar" value="${scala-swing-sources}"/>
629616

630-
<property name="continuations-plugin.description" value="Scala Delimited Continuations Compiler Plugin"/>
631-
<property name="continuations-plugin.package" value="plugins." />
632-
<property name="continuations-plugin.jar" value="${scala-continuations-plugin}"/>
633-
<property name="continuations-plugin.src" value="false"/>
634-
<property name="continuations-plugin.srcjar" value="${scala-continuations-plugin-sources}"/>
635-
636-
<property name="continuations-library.description" value="Scala Delimited Continuations Library"/>
637-
<property name="continuations-library.package" value="plugins." />
638-
<property name="continuations-library.jar" value="${scala-continuations-library}"/>
639-
<property name="continuations-library.src" value="false"/>
640-
<property name="continuations-library.srcjar" value="${scala-continuations-library-sources}"/>
641-
642617
<property name="parser-combinators.description" value="Scala Parser Combinators Library"/>
643618
<property name="parser-combinators.package" value="modules."/>
644619
<property name="parser-combinators.jar" value="${scala-parser-combinators}"/>
@@ -659,7 +634,7 @@ TODO:
659634
<property name="partest-javaagent.description" value="Scala Compiler Testing Tool (compiler-specific java agent)"/>
660635

661636
<!-- projects without project-specific options: asm, forkjoin, manual, bin, repl -->
662-
<for list="actors,compiler,interactive,scaladoc,library,parser-combinators,partest,partest-extras,partest-javaagent,reflect,scalap,swing,xml,continuations-plugin,continuations-library" param="project">
637+
<for list="actors,compiler,interactive,scaladoc,library,parser-combinators,partest,partest-extras,partest-javaagent,reflect,scalap,swing,xml" param="project">
663638
<sequential>
664639
<!-- description is mandatory -->
665640
<init-project-prop project="@{project}" name="package" default=""/> <!-- used by mvn-package, copy-bundle, make-bundle -->
@@ -1297,8 +1272,6 @@ TODO:
12971272

12981273
<file name="${actors.jar}"/>
12991274

1300-
<file name="${continuations-plugin.jar}"/>
1301-
<file name="${continuations-library.jar}"/>
13021275
<file name="${parser-combinators.jar}"/>
13031276
<file name="${xml.jar}"/>
13041277
<file name="${swing.jar}"/>
@@ -1328,8 +1301,6 @@ TODO:
13281301
</make-bundle>
13291302

13301303

1331-
<make-bundle project="continuations-plugin"/>
1332-
<make-bundle project="continuations-library"/>
13331304
<make-bundle project="parser-combinators"/>
13341305
<make-bundle project="xml"/>
13351306
<make-bundle project="swing"/>

‎scripts/jobs/integrate/bootstrap

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ sbtBuild() {
182182
sbtResolve() {
183183
cd $baseDir/resolutionScratch_
184184
touch build.sbt
185+
# TODO lry: not needed after removing continuations
185186
cross=${4-binary} # Disabled / binary / full
186187
echo "### sbtResolve: $sbtCmd $sbtArgs " "${scalaVersionTasks[@]}" "\"$1\" % \"$2\" % \"$3\" cross CrossVersion.$cross"
187188
$sbtCmd $sbtArgs "${scalaVersionTasks[@]}" \
@@ -245,27 +246,6 @@ buildPartest() {
245246
# fi
246247
# }
247248

248-
buildContinuations() {
249-
if [ "$CONT_PLUG_BUILT" != "yes" ] && [ "$forceRebuild" != "yes" ] && ( sbtResolve "org.scala-lang.plugins" "scala-continuations-plugin" $CONTINUATIONS_VER full )
250-
then echo "Found scala-continuations-plugin $CONTINUATIONS_VER; not building."
251-
else
252-
update scala scala-continuations $CONTINUATIONS_REF && gfxd
253-
254-
$sbtCmd $sbtArgs 'project plugin' "${scalaVersionTasks[@]}" "${publishTasks[@]}" \
255-
'set version := "'$CONTINUATIONS_VER'"' $clean "compile:package" test "${buildTasks[@]}" # https://github.com/scala/scala-continuations/pull/4
256-
CONT_PLUG_BUILT="yes"
257-
fi
258-
259-
if [ "$CONT_LIB_BUILT" != "yes" ] && [ "$forceRebuild" != "yes" ] && ( sbtResolve "org.scala-lang.plugins" "scala-continuations-library" $CONTINUATIONS_VER )
260-
then echo "Found scala-continuations-library $CONTINUATIONS_VER; not building."
261-
else
262-
update scala scala-continuations $CONTINUATIONS_REF && gfxd
263-
$sbtCmd $sbtArgs 'project library' "${scalaVersionTasks[@]}" "${publishTasks[@]}" \
264-
'set version := "'$CONTINUATIONS_VER'"' $clean test "${buildTasks[@]}"
265-
CONT_LIB_BUILT="yes"
266-
fi
267-
}
268-
269249
buildSwing() {
270250
if [ "$SWING_BUILT" != "yes" ] && [ "$forceRebuild" != "yes" ] && ( sbtResolve "org.scala-lang.modules" "scala-swing" $SWING_VER )
271251
then echo "Found scala-swing $SWING_VER; not building."
@@ -283,7 +263,7 @@ buildActorsMigration(){
283263
update scala actors-migration "$ACTORS_MIGRATION_REF" && gfxd
284264
# not running tests because
285265
# [error] Test scala.actors.migration.NestedReact.testNestedReactAkka failed: java.util.concurrent.TimeoutException: Futures timed out after [20 seconds]
286-
sbtBuild 'set version := "'$ACTORS_MIGRATION_VER'"' 'set VersionKeys.continuationsVersion := "'$CONTINUATIONS_VER'"' $clean "${buildTasks[@]}"
266+
sbtBuild 'set version := "'$ACTORS_MIGRATION_VER'"' $clean "${buildTasks[@]}"
287267
ACTORS_MIGRATION_BUILT="yes"
288268
fi
289269
}
@@ -302,7 +282,6 @@ buildScalacheck(){
302282
buildModules() {
303283
buildXML
304284
buildParsers
305-
buildContinuations
306285
buildSwing
307286
buildActorsMigration
308287
buildScalacheck
@@ -385,7 +364,6 @@ deriveModuleVersions() {
385364
# use versions.properties as defaults when no version specified on command line
386365
XML_VER=${XML_VER-$scala_xml_version_number}
387366
PARSERS_VER=${PARSERS_VER-$scala_parser_combinators_version_number}
388-
CONTINUATIONS_VER=${CONTINUATIONS_VER-$scala_continuations_plugin_version_number}
389367
SWING_VER=${SWING_VER-$scala_swing_version_number}
390368
ACTORS_MIGRATION_VER=${ACTORS_MIGRATION_VER-$actors_migration_version_number}
391369
PARTEST_VER=${PARTEST_VER-$partest_version_number}
@@ -394,7 +372,6 @@ deriveModuleVersions() {
394372
# If a _VER was not specified, the corresponding _REF will be non-empty by now (as specified, or HEAD)
395373
XML_REF=${XML_REF-"v$XML_VER"}
396374
PARSERS_REF=${PARSERS_REF-"v$PARSERS_VER"}
397-
CONTINUATIONS_REF=${CONTINUATIONS_REF-"v$CONTINUATIONS_VER"}
398375
SWING_REF=${SWING_REF-"v$SWING_VER"}
399376
ACTORS_MIGRATION_REF=${ACTORS_MIGRATION_REF-"v$ACTORS_MIGRATION_VER"}
400377
PARTEST_REF=${PARTEST_REF-"v$PARTEST_VER"}
@@ -403,15 +380,13 @@ deriveModuleVersions() {
403380
else
404381
XML_VER=${XML_VER-$(deriveVersion scala scala-xml "$XML_REF")}
405382
PARSERS_VER=${PARSERS_VER-$(deriveVersion scala scala-parser-combinators "$PARSERS_REF")}
406-
CONTINUATIONS_VER=${CONTINUATIONS_VER-$(deriveVersion scala scala-continuations "$CONTINUATIONS_REF")}
407383
SWING_VER=${SWING_VER-$(deriveVersion scala scala-swing "$SWING_REF")}
408384
ACTORS_MIGRATION_VER=${ACTORS_MIGRATION_VER-$(deriveVersion scala actors-migration "$ACTORS_MIGRATION_REF")}
409385
PARTEST_VER=${PARTEST_VER-$(deriveVersion scala scala-partest "$PARTEST_REF")}
410386
SCALACHECK_VER=${SCALACHECK_VER-$(deriveVersionAnyTag rickynils scalacheck "$SCALACHECK_REF")}
411387

412388
XML_REF=${XML_REF-"HEAD"}
413389
PARSERS_REF=${PARSERS_REF-"HEAD"}
414-
CONTINUATIONS_REF=${CONTINUATIONS_REF-"HEAD"}
415390
SWING_REF=${SWING_REF-"HEAD"}
416391
ACTORS_MIGRATION_REF=${ACTORS_MIGRATION_REF-"HEAD"}
417392
PARTEST_REF=${PARTEST_REF-"HEAD"}
@@ -421,7 +396,6 @@ deriveModuleVersions() {
421396

422397
echo "Module versions (versioning strategy: $moduleVersioning):"
423398
echo "ACTORS_MIGRATION = $ACTORS_MIGRATION_VER at $ACTORS_MIGRATION_REF"
424-
echo "CONTINUATIONS = $CONTINUATIONS_VER at $CONTINUATIONS_REF"
425399
echo "PARSERS = $PARSERS_VER at $PARSERS_REF"
426400
echo "PARTEST = $PARTEST_VER at $PARTEST_REF"
427401
echo "SCALACHECK = $SCALACHECK_VER at $SCALACHECK_REF"
@@ -438,8 +412,6 @@ constructUpdatedModuleVersions() {
438412
# either because the variables (XML_VER) were provided, or because we're building the modules from HEAD.
439413
# in the common case, the values are the same as in versions.properties.
440414
updatedModuleVersions=("${updatedModuleVersions[@]}" "-Dactors-migration.version.number=$ACTORS_MIGRATION_VER")
441-
updatedModuleVersions=("${updatedModuleVersions[@]}" "-Dscala-continuations-library.version.number=$CONTINUATIONS_VER")
442-
updatedModuleVersions=("${updatedModuleVersions[@]}" "-Dscala-continuations-plugin.version.number=$CONTINUATIONS_VER")
443415
updatedModuleVersions=("${updatedModuleVersions[@]}" "-Dscala-parser-combinators.version.number=$PARSERS_VER")
444416
updatedModuleVersions=("${updatedModuleVersions[@]}" "-Dscala-swing.version.number=$SWING_VER")
445417
updatedModuleVersions=("${updatedModuleVersions[@]}" "-Dscala-xml.version.number=$XML_VER")
@@ -506,10 +478,7 @@ bootstrap() {
506478
cd $baseDir
507479
rm -rf build/ # must leave everything else in $baseDir for downstream jobs
508480

509-
# scala.full.version determines the dependency of scala-dist on the continuations plugin,
510-
# which is fully cross-versioned (for $SCALA_VER, the version we're releasing)
511481
ant -Dstarr.version=$SCALA_VER\
512-
-Dscala.full.version=$SCALA_VER\
513482
-Dextra.repo.url=$releaseTempRepoUrl\
514483
-Dmaven.version.suffix=$SCALA_VER_SUFFIX\
515484
${updatedModuleVersions[@]} \

‎src/build/bnd/scala-continuations-library.bnd

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

‎src/build/bnd/scala-continuations-plugin.bnd

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

‎src/build/maven/scala-dist-pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,6 @@
4444
<artifactId>scalap</artifactId>
4545
<version>@VERSION@</version>
4646
</dependency>
47-
<dependency>
48-
<groupId>org.scala-lang.plugins</groupId>
49-
<!-- 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 -->
50-
<artifactId>scala-continuations-plugin_@SCALA_FULL_VERSION@</artifactId>
51-
<version>@CONTINUATIONS_PLUGIN_VERSION@</version>
52-
</dependency>
5347
<!-- duplicated from scala-compiler, where it's optional,
5448
so that resolving scala-dist's transitive dependencies does not include jline,
5549
even though we need to include it in the dist, but macros depending on the compiler

‎src/build/maven/scala-library-all-pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,6 @@
4949
<artifactId>scala-parser-combinators_@SCALA_BINARY_VERSION@</artifactId>
5050
<version>@PARSER_COMBINATORS_VERSION@</version>
5151
</dependency>
52-
<!--
53-
the continuations plugin is a dependency of scala-dist, as scala-library-all should be
54-
a drop-in replacement for scala-library, and as such should not (indirectly)
55-
depend on plugins/the compiler.
56-
-->
57-
<dependency>
58-
<groupId>org.scala-lang.plugins</groupId>
59-
<artifactId>scala-continuations-library_@SCALA_BINARY_VERSION@</artifactId>
60-
<version>@CONTINUATIONS_LIBRARY_VERSION@</version>
61-
</dependency>
6252
<dependency>
6353
<groupId>org.scala-lang.modules</groupId>
6454
<artifactId>scala-swing_@SCALA_BINARY_VERSION@</artifactId>

‎src/library/rootdoc.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ Additional parts of the standard library are shipped as separate libraries. Thes
4444
- [[scala.reflect `scala.reflect`]] - Scala's reflection API (scala-reflect.jar)
4545
- [[scala.xml `scala.xml`]] - XML parsing, manipulation, and serialization (scala-xml.jar)
4646
- [[scala.swing `scala.swing`]] - A convenient wrapper around Java's GUI framework called Swing (scala-swing.jar)
47-
- [[scala.util.continuations `scala.util.continuations`]] - Delimited continuations using continuation-passing-style
48-
(scala-continuations-library.jar, scala-continuations-plugin.jar)
4947
- [[scala.util.parsing `scala.util.parsing`]] - [[scala.util.parsing.combinator Parser combinators]], including an
5048
example implementation of a [[scala.util.parsing.json JSON parser]] (scala-parser-combinators.jar)
5149
- [[scala.actors `scala.actors`]] - Actor-based concurrency (deprecated and replaced by Akka actors,

‎src/reflect/scala/reflect/internal/pickling/UnPickler.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ abstract class UnPickler {
239239
if (missing.startsWith("scala.xml")) Some(("org.scala-lang.modules", "scala-xml"))
240240
else if (missing.startsWith("scala.util.parsing")) Some(("org.scala-lang.modules", "scala-parser-combinators"))
241241
else if (missing.startsWith("scala.swing")) Some(("org.scala-lang.modules", "scala-swing"))
242-
else if (missing.startsWith("scala.util.continuations")) Some(("org.scala-lang.plugins", "scala-continuations-library"))
243242
else None
244243

245244
(module map { case (group, art) =>

0 commit comments

Comments
 (0)