Skip to content

Commit

Permalink
Move to new organization.
Browse files Browse the repository at this point in the history
  • Loading branch information
io7m committed May 1, 2024
1 parent 4854cf3 commit 8aacf23
Show file tree
Hide file tree
Showing 222 changed files with 44 additions and 104 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/main.linux.temurin.lts.yml
Expand Up @@ -25,6 +25,7 @@ jobs:
name: test-logs
path: ./com.io7m.smfj.tests/target/surefire-reports
- name: Coverage
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4.3.0
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: com.io7m.smfj.tests/target/site/jacoco-aggregate/jacoco.xml
3 changes: 0 additions & 3 deletions .gitmodules
@@ -1,3 +0,0 @@
[submodule ".jenkins"]
path = .jenkins
url = https://www.github.com/io7m/jenkinsfiles
1 change: 0 additions & 1 deletion .jenkins
Submodule .jenkins deleted from 3213e2
2 changes: 1 addition & 1 deletion README-CHANGES.xml
Expand Up @@ -251,6 +251,6 @@
</c:release>
</c:releases>
<c:ticket-systems>
<c:ticket-system default="false" id="com.github.io7m.smf" url="https://github.com/io7m/smf/issues/"/>
<c:ticket-system default="false" id="com.github.io7m.smf" url="https://www.github.com/io7m-com/smf/issues/"/>
</c:ticket-systems>
</c:changelog>
10 changes: 5 additions & 5 deletions README.md
Expand Up @@ -3,13 +3,13 @@ smfj

[![Maven Central](https://img.shields.io/maven-central/v/com.io7m.smfj/com.io7m.smfj.svg?style=flat-square)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.io7m.smfj%22)
[![Maven Central (snapshot)](https://img.shields.io/nexus/s/com.io7m.smfj/com.io7m.smfj?server=https%3A%2F%2Fs01.oss.sonatype.org&style=flat-square)](https://s01.oss.sonatype.org/content/repositories/snapshots/com/io7m/smfj/)
[![Codecov](https://img.shields.io/codecov/c/github/io7m/smfj.svg?style=flat-square)](https://codecov.io/gh/io7m/smfj)
[![Codecov](https://img.shields.io/codecov/c/github/io7m-com/smfj.svg?style=flat-square)](https://codecov.io/gh/io7m-com/smfj)

![com.io7m.smfj](./src/site/resources/smfj.jpg?raw=true)

| JVM | Platform | Status |
|-----|----------|--------|
| OpenJDK (Temurin) Current | Linux | [![Build (OpenJDK (Temurin) Current, Linux)](https://img.shields.io/github/actions/workflow/status/io7m/smfj/main.linux.temurin.current.yml)](https://github.com/io7m/smfj/actions?query=workflow%3Amain.linux.temurin.current)|
| OpenJDK (Temurin) LTS | Linux | [![Build (OpenJDK (Temurin) LTS, Linux)](https://img.shields.io/github/actions/workflow/status/io7m/smfj/main.linux.temurin.lts.yml)](https://github.com/io7m/smfj/actions?query=workflow%3Amain.linux.temurin.lts)|
| OpenJDK (Temurin) Current | Windows | [![Build (OpenJDK (Temurin) Current, Windows)](https://img.shields.io/github/actions/workflow/status/io7m/smfj/main.windows.temurin.current.yml)](https://github.com/io7m/smfj/actions?query=workflow%3Amain.windows.temurin.current)|
| OpenJDK (Temurin) LTS | Windows | [![Build (OpenJDK (Temurin) LTS, Windows)](https://img.shields.io/github/actions/workflow/status/io7m/smfj/main.windows.temurin.lts.yml)](https://github.com/io7m/smfj/actions?query=workflow%3Amain.windows.temurin.lts)|
| OpenJDK (Temurin) Current | Linux | [![Build (OpenJDK (Temurin) Current, Linux)](https://img.shields.io/github/actions/workflow/status/io7m-com/smfj/main.linux.temurin.current.yml)](https://www.github.com/io7m-com/smfj/actions?query=workflow%3Amain.linux.temurin.current)|
| OpenJDK (Temurin) LTS | Linux | [![Build (OpenJDK (Temurin) LTS, Linux)](https://img.shields.io/github/actions/workflow/status/io7m-com/smfj/main.linux.temurin.lts.yml)](https://www.github.com/io7m-com/smfj/actions?query=workflow%3Amain.linux.temurin.lts)|
| OpenJDK (Temurin) Current | Windows | [![Build (OpenJDK (Temurin) Current, Windows)](https://img.shields.io/github/actions/workflow/status/io7m-com/smfj/main.windows.temurin.current.yml)](https://www.github.com/io7m-com/smfj/actions?query=workflow%3Amain.windows.temurin.current)|
| OpenJDK (Temurin) LTS | Windows | [![Build (OpenJDK (Temurin) LTS, Windows)](https://img.shields.io/github/actions/workflow/status/io7m-com/smfj/main.windows.temurin.lts.yml)](https://www.github.com/io7m-com/smfj/actions?query=workflow%3Amain.windows.temurin.lts)|
2 changes: 1 addition & 1 deletion com.io7m.smfj.blender/src/main/resources/__init__.py
Expand Up @@ -23,7 +23,7 @@
"description": "Export meshes to SMF format",
"warning": "",
"wiki_url": "",
"tracker_url": "https://github.com/io7m/smf/issues",
"tracker_url": "https://www.github.com/io7m-com/smf/issues",
"category": "Import-Export"
}

Expand Down
3 changes: 3 additions & 0 deletions com.io7m.smfj.tests/pom.xml
Expand Up @@ -18,7 +18,10 @@
<url>https://www.io7m.com/software/smfj/</url>

<properties>
<bnd.baseline.skip>true</bnd.baseline.skip>
<checkstyle.skip>true</checkstyle.skip>
<mdep.analyze.skip>true</mdep.analyze.skip>
<spotbugs.skip>true</spotbugs.skip>
</properties>

<dependencies>
Expand Down
30 changes: 0 additions & 30 deletions com.io7m.smfj.tests/src/main/java/com/io7m/smfj/tests/Bug.java

This file was deleted.

This file was deleted.

Expand Up @@ -601,48 +601,39 @@ private static final class Parser implements SMFSchemaParserType
@Override
public SMFPartialLogged<SMFSchema> parseSchema()
{
try {
final List<String> lines =
List.copyOf(IOUtils.readLines(this.stream, StandardCharsets.UTF_8));
final SMFTLineReaderType reader =
SMFTLineReaderList.create(this.uri, lines, 1);
final List<String> lines =
List.copyOf(IOUtils.readLines(this.stream, StandardCharsets.UTF_8));
final SMFTLineReaderType reader =
SMFTLineReaderList.create(this.uri, lines, 1);

try {
final Optional<List<String>> line = reader.line();
if (line.isPresent()) {
final SMFPartialLogged<SMFSchemaVersion> r_version =
this.parseVersion(reader.position(), line.get());
if (r_version.isFailed()) {
return SMFPartialLogged.failed(
r_version.errors(),
r_version.warnings());
}

final SMFSchemaVersion version = r_version.get();
if (version.major() == 1) {
return new ParserV1(version, reader, this.uri).parseSchema();
}
try {
final Optional<List<String>> line = reader.line();
if (line.isPresent()) {
final SMFPartialLogged<SMFSchemaVersion> r_version =
this.parseVersion(reader.position(), line.get());
if (r_version.isFailed()) {
return SMFPartialLogged.failed(
r_version.errors(),
r_version.warnings());
}

throw new UnimplementedCodeException();
final SMFSchemaVersion version = r_version.get();
if (version.major() == 1) {
return new ParserV1(version, reader, this.uri).parseSchema();
}

final SMFParseError error =
SMFParseError.of(
reader.position(),
"Empty file: Must begin with an smf-schema version declaration",
Optional.empty());
return SMFPartialLogged.failed(error);
} catch (final IOException e) {
final SMFParseError error =
SMFParseError.of(reader.position(), "I/O error", Optional.of(e));
return SMFPartialLogged.failed(error);
throw new UnimplementedCodeException();
}
} catch (final IOException e) {

final SMFParseError error =
SMFParseError.of(
LexicalPosition.of(1, 0, Optional.of(this.uri)),
"I/O error",
Optional.of(e));
reader.position(),
"Empty file: Must begin with an smf-schema version declaration",
Optional.empty());
return SMFPartialLogged.failed(error);
} catch (final IOException e) {
final SMFParseError error =
SMFParseError.of(reader.position(), "I/O error", Optional.of(e));
return SMFPartialLogged.failed(error);
}
}
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Expand Up @@ -60,9 +60,9 @@
</licenses>

<scm>
<url>https://github.com/io7m/smfj</url>
<connection>scm:git:https://github.com/io7m/smfj</connection>
<developerConnection>scm:git:https://github.com/io7m/smfj</developerConnection>
<url>https://www.github.com/io7m-com/smfj</url>
<connection>scm:git:https://www.github.com/io7m-com/smfj</connection>
<developerConnection>scm:git:https://www.github.com/io7m-com/smfj</developerConnection>
</scm>

<developers>
Expand All @@ -75,7 +75,7 @@
</developers>

<issueManagement>
<url>http://github.com/io7m/smfj/issues</url>
<url>http://www.github.com/io7m-com/smfj/issues</url>
<system>GitHub Issues</system>
</issueManagement>

Expand All @@ -97,7 +97,7 @@

<ciManagement>
<system>GitHub Actions</system>
<url>https://github.com/io7m/smfj/actions</url>
<url>https://www.github.com/io7m-com/smfj/actions</url>
</ciManagement>

<prerequisites>
Expand Down
2 changes: 1 addition & 1 deletion src/site/resources/overview.xml
@@ -1,6 +1,6 @@
<div xmlns="http://www.w3.org/1999/xhtml">
<p class="shields">
<a href="https://github.com/io7m/smfj/actions?query=workflow%3Amain.linux.temurin.lts">
<a href="https://www.github.com/io7m-com/smfj/actions?query=workflow%3Amain.linux.temurin.lts">
<img src="https://img.shields.io/github/actions/workflow/status/io7m/smfj/main.linux.temurin.lts.yml"
alt="Build status"/>
</a>
Expand Down

0 comments on commit 8aacf23

Please sign in to comment.