Skip to content

Commit cc89bd7

Browse files
committed
Merge pull request scala#2122 from adriaanm/revert-pr-1403
Revert scala#1403: binary incompatibilities in scala-swing
2 parents b87e9b3 + d49532f commit cc89bd7

File tree

7 files changed

+31
-236
lines changed

7 files changed

+31
-236
lines changed

build.xml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2659,6 +2659,7 @@ Binary compatibility testing
26592659
<dependency groupId="com.typesafe" artifactId="mima-reporter_2.9.2" version="0.1.5-SNAPSHOT"/>
26602660
</artifact:dependencies>
26612661
<artifact:dependencies pathId="old.bc.classpath">
2662+
<dependency groupId="org.scala-lang" artifactId="scala-swing" version="2.10.0"/>
26622663
<dependency groupId="org.scala-lang" artifactId="scala-library" version="2.10.0"/>
26632664
<dependency groupId="org.scala-lang" artifactId="scala-reflect" version="2.10.0"/>
26642665
</artifact:dependencies>
@@ -2695,6 +2696,21 @@ Binary compatibility testing
26952696
<path refid="mima.classpath"/>
26962697
</classpath>
26972698
</java>
2699+
<java
2700+
fork="true"
2701+
failonerror="true"
2702+
classname="com.typesafe.tools.mima.cli.Main">
2703+
<arg value="--prev"/>
2704+
<arg value="${org.scala-lang:scala-swing:jar}"/>
2705+
<arg value="--curr"/>
2706+
<arg value="${build-pack.dir}/lib/scala-swing.jar"/>
2707+
<arg value="--filters"/>
2708+
<arg value="${basedir}/bincompat-backward.whitelist.conf"/>
2709+
<arg value="--generate-filters"/>
2710+
<classpath>
2711+
<path refid="mima.classpath"/>
2712+
</classpath>
2713+
</java>
26982714
<java
26992715
fork="true"
27002716
failonerror="true"
@@ -2725,6 +2741,21 @@ Binary compatibility testing
27252741
<path refid="mima.classpath"/>
27262742
</classpath>
27272743
</java>
2744+
<java
2745+
fork="true"
2746+
failonerror="true"
2747+
classname="com.typesafe.tools.mima.cli.Main">
2748+
<arg value="--curr"/>
2749+
<arg value="${org.scala-lang:scala-swing:jar}"/>
2750+
<arg value="--prev"/>
2751+
<arg value="${build-pack.dir}/lib/scala-swing.jar"/>
2752+
<arg value="--filters"/>
2753+
<arg value="${basedir}/bincompat-forward.whitelist.conf"/>
2754+
<arg value="--generate-filters"/>
2755+
<classpath>
2756+
<path refid="mima.classpath"/>
2757+
</classpath>
2758+
</java>
27282759
</target>
27292760

27302761

docs/examples/swing/ColorChooserDemo.scala

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

docs/examples/swing/PopupDemo.scala

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

src/swing/scala/swing/ColorChooser.scala

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

src/swing/scala/swing/PopupMenu.scala

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

src/swing/scala/swing/event/ColorChanged.scala

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

src/swing/scala/swing/event/PopupMenuEvent.scala

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

0 commit comments

Comments
 (0)