Skip to content

Commit 1a7f145

Browse files
paulhoadleypaulhoadley
committed
Merge branch 'release-0.3'
2 parents e30fd18 + 65234e2 commit 1a7f145

Some content is hidden

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

91 files changed

+352
-135
lines changed

‎.classpath‎

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

‎.github/workflows/build.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: build
2+
on: [push]
3+
jobs:
4+
build:
5+
runs-on: ubuntu-latest
6+
7+
steps:
8+
- uses: actions/checkout@v2
9+
- name: Set up JDK 21
10+
uses: actions/setup-java@v1
11+
with:
12+
java-version: 21
13+
- name: Build with Maven
14+
run: mvn --batch-mode --update-snapshots verify

‎.gitignore‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1-
*.class
2-
*.jar
1+
.classpath
2+
.project
3+
.settings
4+
.DS_Store
5+
bin
6+
build
7+
target
38
*~

‎.project‎

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

‎.settings/org.eclipse.jdt.core.prefs‎

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

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Changelog
2+
3+
This project adheres to [Semantic
4+
Versioning](https://semver.org/spec/v2.0.0.html).
5+
6+
## Release 0.3 (2024-03-31)
7+
### Changed
8+
- Migrated to Maven for builds. This included setting up the test
9+
suite via JUnit. [#10](https://github.com/paulhoadley/pal/issues/10)
10+
- Reduced reliance on `System.exit()` (outside of `main()`), largely
11+
to facilitate
12+
testing. [#11](https://github.com/paulhoadley/pal/issues/11)

README.markdown renamed to README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
![](https://github.com/paulhoadley/pal/workflows/build/badge.svg)
2+
[![License](https://img.shields.io/badge/License-BSD-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
3+
14
The PAL Abstract Machine—An implementation in Java
25
==================================================
36

‎pom.xml‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>net.logicsquad</groupId>
5+
<artifactId>pal</artifactId>
6+
<version>0.3</version>
7+
<packaging>jar</packaging>
8+
<name>PAL</name>
9+
<description>The PAL Abstract Machine—An implementation in Java.</description>
10+
<inceptionYear>2002</inceptionYear>
11+
12+
<organization>
13+
<name>Logic Squad</name>
14+
<url>https://logicsquad.net/</url>
15+
</organization>
16+
17+
<properties>
18+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
19+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
20+
<maven.compiler.source>21</maven.compiler.source>
21+
<maven.compiler.target>21</maven.compiler.target>
22+
</properties>
23+
24+
<build>
25+
<plugins>
26+
<plugin>
27+
<groupId>org.apache.maven.plugins</groupId>
28+
<artifactId>maven-jar-plugin</artifactId>
29+
<configuration>
30+
<archive>
31+
<manifest>
32+
<addClasspath>true</addClasspath>
33+
<mainClass>net.logicsquad.pal.PAL</mainClass>
34+
</manifest>
35+
</archive>
36+
</configuration>
37+
</plugin>
38+
<plugin>
39+
<artifactId>maven-surefire-plugin</artifactId>
40+
<version>3.2.5</version>
41+
<configuration>
42+
<forkCount>1</forkCount>
43+
<reuseForks>false</reuseForks>
44+
</configuration>
45+
</plugin>
46+
<plugin>
47+
<groupId>org.apache.maven.plugins</groupId>
48+
<artifactId>maven-javadoc-plugin</artifactId>
49+
<version>3.6.3</version>
50+
<configuration>
51+
<additionalJOption>-Xdoclint:none</additionalJOption>
52+
<detectLinks />
53+
<show>private</show>
54+
</configuration>
55+
<executions>
56+
<execution>
57+
<id>build-javadocs</id>
58+
<phase>package</phase>
59+
<goals>
60+
<goal>javadoc</goal>
61+
</goals>
62+
</execution>
63+
</executions>
64+
</plugin>
65+
<plugin>
66+
<artifactId>maven-project-info-reports-plugin</artifactId>
67+
<version>3.5.0</version>
68+
</plugin>
69+
</plugins>
70+
</build>
71+
72+
<dependencyManagement>
73+
<dependencies>
74+
<dependency>
75+
<groupId>org.junit</groupId>
76+
<artifactId>junit-bom</artifactId>
77+
<version>5.10.2</version>
78+
<type>pom</type>
79+
<scope>import</scope>
80+
</dependency>
81+
</dependencies>
82+
</dependencyManagement>
83+
84+
<dependencies>
85+
<dependency>
86+
<groupId>org.apache.logging.log4j</groupId>
87+
<artifactId>log4j-slf4j2-impl</artifactId>
88+
<version>2.22.1</version>
89+
<scope>test</scope>
90+
</dependency>
91+
<dependency>
92+
<groupId>org.junit.jupiter</groupId>
93+
<artifactId>junit-jupiter</artifactId>
94+
<scope>test</scope>
95+
</dependency>
96+
</dependencies>
97+
</project>

src/net/logicsquad/pal/Code.java renamed to src/main/java/net/logicsquad/pal/Code.java

File renamed without changes.

src/net/logicsquad/pal/Data.java renamed to src/main/java/net/logicsquad/pal/Data.java

File renamed without changes.

0 commit comments

Comments
 (0)