Skip to content

Commit 026c9d6

Browse files
committed
Drop swt and swt-examples modules.
1 parent be0d52d commit 026c9d6

Some content is hidden

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

41 files changed

+14
-8054
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,7 @@ jobs:
1717
path: ~/.m2
1818
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
1919
restore-keys: ${{ runner.os }}-m2
20-
- run: mvn --batch-mode --update-snapshots clean package
20+
- run: |
21+
export DISPLAY=:99
22+
sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
23+
mvn --batch-mode --update-snapshots clean package

Readme.txt

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,6 @@ http://java.sun.com/javase/downloads/index.jsp#jdk
2525
Apache Maven
2626
http://maven.apache.org/download.html
2727

28-
For some platforms, including Mac OSX with JDK version 1.6 or
29-
later on x86_64, the Eclipse Standard Widget Toolkit (SWT) version
30-
3.3.0 or later must also be installed manually.
31-
32-
Eclipse Standard Widget Toolkit
33-
http://www.eclipse.org/swt/
34-
3528

3629
USING PICCOLO2D.JAVA
3730

@@ -53,15 +46,6 @@ Piccolo2D extras classes in your project, use a dependency of
5346
<version>3.0.1</version>
5447
</dependency>
5548

56-
in your pom.xml. To include the Piccolo2D core classes and the
57-
Piccolo2D SWT classes in your project, use a dependency of
58-
59-
<dependency>
60-
<groupId>org.piccolo2d</groupId>
61-
<artifactId>piccolo2d-swt</artifactId>
62-
<version>3.0.1</version>
63-
</dependency>
64-
6549
in your pom.xml. If your project does not use maven, simply include
6650
the relevant Piccolo2D jars in your project's classpath.
6751

@@ -77,9 +61,3 @@ To build and run the Piccolo2D examples runnable jar
7761
$ cd examples
7862
$ mvn assembly:assembly
7963
$ java -jar target/piccolo2d-examples-3.0.1-jar-with-dependencies.jar
80-
81-
To build and run the Piccolo2D SWT examples runnable jar
82-
83-
$ cd swt-examples
84-
$ mvn assembly:assembly
85-
$ java -jar target/piccolo2d-swt-examples-3.0.1-jar-with-dependencies.jar

core/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
<parent>
3535
<artifactId>piccolo2d-complete</artifactId>
3636
<groupId>org.piccolo2d</groupId>
37-
<version>3.1-SNAPSHOT</version>
37+
<version>4.0-SNAPSHOT</version>
3838
</parent>
3939
<artifactId>piccolo2d-core</artifactId>
40-
<packaging>bundle</packaging>
40+
<packaging>jar</packaging>
4141
<name>Piccolo2D Core</name>
4242
</project>

examples/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
<parent>
3535
<artifactId>piccolo2d-complete</artifactId>
3636
<groupId>org.piccolo2d</groupId>
37-
<version>3.1-SNAPSHOT</version>
37+
<version>4.0-SNAPSHOT</version>
3838
</parent>
3939
<artifactId>piccolo2d-examples</artifactId>
4040
<name>Piccolo2D Examples</name>
41-
<packaging>bundle</packaging>
41+
<packaging>jar</packaging>
4242

4343
<dependencyManagement>
4444
<dependencies>

extras/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
<parent>
3535
<artifactId>piccolo2d-complete</artifactId>
3636
<groupId>org.piccolo2d</groupId>
37-
<version>3.1-SNAPSHOT</version>
37+
<version>4.0-SNAPSHOT</version>
3838
</parent>
3939
<artifactId>piccolo2d-extras</artifactId>
40-
<packaging>bundle</packaging>
40+
<packaging>jar</packaging>
4141
<name>Piccolo2D Extras</name>
4242

4343
<dependencyManagement>

pom.xml

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
<groupId>org.piccolo2d</groupId>
4141
<artifactId>piccolo2d-complete</artifactId>
42-
<version>3.1-SNAPSHOT</version>
42+
<version>4.0-SNAPSHOT</version>
4343
<packaging>pom</packaging>
4444

4545
<name>Piccolo2D</name>
@@ -195,7 +195,7 @@
195195
</scm>
196196

197197
<properties>
198-
<jdk.version>1.6</jdk.version>
198+
<jdk.version>11</jdk.version>
199199
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
200200
<project.build.targetEncoding>UTF-8</project.build.targetEncoding>
201201
</properties>
@@ -215,8 +215,8 @@
215215
<artifactId>maven-compiler-plugin</artifactId>
216216
<version>3.5.1</version>
217217
<configuration>
218-
<source>${maven.compile.source}</source>
219-
<target>${maven.compile.target}</target>
218+
<source>${jdk.version}</source>
219+
<target>${jdk.version}</target>
220220
</configuration>
221221
</plugin>
222222
<plugin>
@@ -263,20 +263,8 @@
263263
<artifactId>maven-surefire-plugin</artifactId>
264264
<version>3.0.0-M1</version>
265265
</plugin>
266-
<plugin>
267-
<groupId>org.apache.felix</groupId>
268-
<artifactId>maven-bundle-plugin</artifactId>
269-
<version>2.5.4</version>
270-
</plugin>
271266
</plugins>
272267
</pluginManagement>
273-
<plugins>
274-
<plugin>
275-
<groupId>org.apache.felix</groupId>
276-
<artifactId>maven-bundle-plugin</artifactId>
277-
<extensions>true</extensions>
278-
</plugin>
279-
</plugins>
280268
</build>
281269

282270
<dependencyManagement>
@@ -300,8 +288,6 @@
300288
<modules>
301289
<module>core</module>
302290
<module>extras</module>
303-
<module>swt</module>
304291
<module>examples</module>
305-
<module>swt-examples</module>
306292
</modules>
307293
</project>

swt-examples/pom.xml

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

swt-examples/src/main/java/org/piccolo2d/extras/swt/examples/FillShapeExample.java

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

0 commit comments

Comments
 (0)