Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,7 @@ jobs:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- run: mvn --batch-mode --update-snapshots clean package
- run: |
export DISPLAY=:99
sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
mvn --batch-mode --update-snapshots clean package
22 changes: 0 additions & 22 deletions Readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,6 @@ http://java.sun.com/javase/downloads/index.jsp#jdk
Apache Maven
http://maven.apache.org/download.html

For some platforms, including Mac OSX with JDK version 1.6 or
later on x86_64, the Eclipse Standard Widget Toolkit (SWT) version
3.3.0 or later must also be installed manually.

Eclipse Standard Widget Toolkit
http://www.eclipse.org/swt/


USING PICCOLO2D.JAVA

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

in your pom.xml. To include the Piccolo2D core classes and the
Piccolo2D SWT classes in your project, use a dependency of

<dependency>
<groupId>org.piccolo2d</groupId>
<artifactId>piccolo2d-swt</artifactId>
<version>3.0.1</version>
</dependency>

in your pom.xml. If your project does not use maven, simply include
the relevant Piccolo2D jars in your project's classpath.

Expand All @@ -77,9 +61,3 @@ To build and run the Piccolo2D examples runnable jar
$ cd examples
$ mvn assembly:assembly
$ java -jar target/piccolo2d-examples-3.0.1-jar-with-dependencies.jar

To build and run the Piccolo2D SWT examples runnable jar

$ cd swt-examples
$ mvn assembly:assembly
$ java -jar target/piccolo2d-swt-examples-3.0.1-jar-with-dependencies.jar
4 changes: 2 additions & 2 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
<parent>
<artifactId>piccolo2d-complete</artifactId>
<groupId>org.piccolo2d</groupId>
<version>3.1-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
</parent>
<artifactId>piccolo2d-core</artifactId>
<packaging>bundle</packaging>
<packaging>jar</packaging>
<name>Piccolo2D Core</name>
</project>
4 changes: 2 additions & 2 deletions examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
<parent>
<artifactId>piccolo2d-complete</artifactId>
<groupId>org.piccolo2d</groupId>
<version>3.1-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
</parent>
<artifactId>piccolo2d-examples</artifactId>
<name>Piccolo2D Examples</name>
<packaging>bundle</packaging>
<packaging>jar</packaging>

<dependencyManagement>
<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions extras/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
<parent>
<artifactId>piccolo2d-complete</artifactId>
<groupId>org.piccolo2d</groupId>
<version>3.1-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
</parent>
<artifactId>piccolo2d-extras</artifactId>
<packaging>bundle</packaging>
<packaging>jar</packaging>
<name>Piccolo2D Extras</name>

<dependencyManagement>
Expand Down
22 changes: 4 additions & 18 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

<groupId>org.piccolo2d</groupId>
<artifactId>piccolo2d-complete</artifactId>
<version>3.1-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Piccolo2D</name>
Expand Down Expand Up @@ -195,7 +195,7 @@
</scm>

<properties>
<jdk.version>1.6</jdk.version>
<jdk.version>11</jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.targetEncoding>UTF-8</project.build.targetEncoding>
</properties>
Expand All @@ -215,8 +215,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>${maven.compile.source}</source>
<target>${maven.compile.target}</target>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -263,20 +263,8 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M1</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.5.4</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
</plugin>
</plugins>
</build>

<dependencyManagement>
Expand All @@ -300,8 +288,6 @@
<modules>
<module>core</module>
<module>extras</module>
<module>swt</module>
<module>examples</module>
<module>swt-examples</module>
</modules>
</project>
79 changes: 0 additions & 79 deletions swt-examples/pom.xml

This file was deleted.

This file was deleted.

Loading