Skip to content

Commit

Permalink
Merge branch 'release/1.0.2'
Browse files Browse the repository at this point in the history
Release: com.io7m.jade 1.0.2
Change: (Backwards incompatible) Require JDK 17
  • Loading branch information
io7m committed Apr 9, 2022
2 parents a8f7fbc + 4fc6214 commit 0e15529
Show file tree
Hide file tree
Showing 50 changed files with 264 additions and 111 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/main-openjdk_current-linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: main-openjdk_current-linux

on:
push:
branches: [ develop, feature/*, release/* ]
pull_request:
branches: [ develop ]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: JDK
uses: actions/setup-java@v1
with:
java-version: 17
- name: Build
run: mvn --errors clean verify site
19 changes: 19 additions & 0 deletions .github/workflows/main-openjdk_current-windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: main-openjdk_current-windows

on:
push:
branches: [ develop, feature/*, release/* ]
pull_request:
branches: [ develop ]

jobs:
build:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- name: JDK
uses: actions/setup-java@v1
with:
java-version: 17
- name: Build
run: mvn --errors clean verify site
23 changes: 23 additions & 0 deletions .github/workflows/main-openjdk_lts-linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: main-openjdk_lts-linux

on:
push:
branches: [ develop, feature/*, release/* ]
pull_request:
branches: [ develop ]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: JDK
uses: actions/setup-java@v1
with:
java-version: 17
- name: Build
run: mvn --errors clean verify site
- name: Coverage
uses: codecov/codecov-action@v1
with:
file: com.io7m.jade.tests/target/site/jacoco/jacoco.xml
2 changes: 1 addition & 1 deletion .jenkins
21 changes: 0 additions & 21 deletions .travis.yml

This file was deleted.

11 changes: 8 additions & 3 deletions README-CHANGES.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<c:changelog project="com.io7m.jade" xmlns:c="urn:com.io7m.changelog:4.0">
<c:releases>
<c:release date="2020-04-04T00:00:00+00:00" ticket-system="com.github.io7m.jade" version="1.0.0">
<c:release date="2020-04-04T00:00:00+00:00" is-open="false" ticket-system="com.github.io7m.jade" version="1.0.0">
<c:changes>
<c:change date="2020-04-04T00:00:00+00:00" summary="Initial release"/>
</c:changes>
</c:release>
<c:release date="2020-04-04T18:38:17+00:00" ticket-system="com.github.io7m.jade" version="1.0.1">
<c:release date="2020-04-04T00:00:00+00:00" is-open="false" ticket-system="com.github.io7m.jade" version="1.0.1">
<c:changes>
<c:change date="2020-04-04T18:38:17+00:00" summary="Use primogenitor 4.0.1 for reproducible builds"/>
<c:change date="2020-04-04T00:00:00+00:00" summary="Use primogenitor 4.0.1 for reproducible builds"/>
</c:changes>
</c:release>
<c:release date="2022-04-09T17:39:55+00:00" is-open="true" ticket-system="com.github.io7m.jade" version="1.0.2">
<c:changes>
<c:change date="2022-04-09T17:39:55+00:00" summary="Require JDK 17" compatible="false"/>
</c:changes>
</c:release>
</c:releases>
Expand Down
2 changes: 1 addition & 1 deletion README-LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright © 2020 Mark Raynsford <[email protected]> http://io7m.com
Copyright © 2020 Mark Raynsford <[email protected]> https://www.io7m.com

Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
Expand Down
12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
jade
===

[![Travis](https://img.shields.io/travis/io7m/jade.png?style=flat-square)](https://travis-ci.org/io7m/jade)
[![Maven Central](https://img.shields.io/maven-central/v/com.io7m.jade/com.io7m.jade.png?style=flat-square)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.io7m.jade%22)
[![Maven Central](https://img.shields.io/maven-central/v/com.io7m.jade/com.io7m.jade.svg?style=flat-square)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.io7m.jade%22)
[![Maven Central (snapshot)](https://img.shields.io/nexus/s/https/oss.sonatype.org/com.io7m.jade/com.io7m.jade.svg?style=flat-square)](https://oss.sonatype.org/content/repositories/snapshots/com/io7m/jade/)
[![Codacy grade](https://img.shields.io/codacy/grade/1cb085ef5ec44d43b9763ab8c500d927.png?style=flat-square)](https://www.codacy.com/app/github_79/jade)
[![Codecov](https://img.shields.io/codecov/c/github/io7m/jade.png?style=flat-square)](https://codecov.io/gh/io7m/jade)
[![Codecov](https://img.shields.io/codecov/c/github/io7m/jade.svg?style=flat-square)](https://codecov.io/gh/io7m/jade)

![jade](./src/site/resources/jade.jpg?raw=true)

| JVM | Platform | Status |
|-----------------|----------|--------|
| OpenJDK LTS | Linux | [![Build (OpenJDK LTS, Linux)](https://img.shields.io/github/workflow/status/io7m/jade/main-openjdk_lts-linux)](https://github.com/io7m/jade/actions?query=workflow%3Amain-openjdk_lts-linux) |
| OpenJDK Current | Linux | [![Build (OpenJDK Current, Linux)](https://img.shields.io/github/workflow/status/io7m/jade/main-openjdk_current-linux)](https://github.com/io7m/jade/actions?query=workflow%3Amain-openjdk_current-linux)
| OpenJDK Current | Windows | [![Build (OpenJDK Current, Windows)](https://img.shields.io/github/workflow/status/io7m/jade/main-openjdk_current-windows)](https://github.com/io7m/jade/actions?query=workflow%3Amain-openjdk_current-windows)

4 changes: 2 additions & 2 deletions com.io7m.jade.api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
<parent>
<artifactId>com.io7m.jade</artifactId>
<groupId>com.io7m.jade</groupId>
<version>1.0.1</version>
<version>1.0.2</version>
</parent>

<artifactId>com.io7m.jade.api</artifactId>

<name>com.io7m.jade.api</name>
<description>Java application directory etiquette (API)</description>
<url>http://github.com/io7m/jade</url>
<url>https://www.io7m.com/software/jade</url>

<dependencies>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2020 Mark Raynsford <[email protected]> http://io7m.com
* Copyright © 2020 Mark Raynsford <[email protected]> https://www.io7m.com
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2020 Mark Raynsford <[email protected]> http://io7m.com
* Copyright © 2020 Mark Raynsford <[email protected]> https://www.io7m.com
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2020 Mark Raynsford <[email protected]> http://io7m.com
* Copyright © 2020 Mark Raynsford <[email protected]> https://www.io7m.com
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2020 Mark Raynsford <[email protected]> http://io7m.com
* Copyright © 2020 Mark Raynsford <[email protected]> https://www.io7m.com
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2020 Mark Raynsford <[email protected]> http://io7m.com
* Copyright © 2020 Mark Raynsford <[email protected]> https://www.io7m.com
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
Expand All @@ -23,6 +23,10 @@
import java.nio.file.Path;
import java.util.Objects;

/**
* A set of directories that override the default selection.
*/

public final class ApplicationOverrideDirectories
implements ApplicationDirectoryProviderType
{
Expand All @@ -31,6 +35,12 @@ public final class ApplicationOverrideDirectories
private Path dataDirectory;
private Path cacheDirectory;

/**
* A set of directories that override the default selection.
*
* @param inBaseDirectory The base directory
*/

public ApplicationOverrideDirectories(
final Path inBaseDirectory)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2020 Mark Raynsford <[email protected]> http://io7m.com
* Copyright © 2020 Mark Raynsford <[email protected]> https://www.io7m.com
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
Expand All @@ -24,13 +24,21 @@
import java.nio.file.Paths;
import java.util.Objects;

/**
* A set of "portable" directories.
*/

public final class ApplicationPortableDirectories
implements ApplicationDirectoryProviderType
{
private Path configurationDirectory;
private Path dataDirectory;
private Path cacheDirectory;

/**
* A set of "portable" directories.
*/

public ApplicationPortableDirectories()
{

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2020 Mark Raynsford <[email protected]> http://io7m.com
* Copyright © 2020 Mark Raynsford <[email protected]> https://www.io7m.com
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
Expand All @@ -21,11 +21,21 @@

import java.util.Objects;

/**
* An application provider context.
*/

public final class ApplicationProviderContext
implements ApplicationProviderContextType
{
private final ApplicationDirectoryConfiguration configuration;

/**
* An application provider context.
*
* @param inConfiguration The application directory configuration
*/

public ApplicationProviderContext(
final ApplicationDirectoryConfiguration inConfiguration)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2020 Mark Raynsford <[email protected]> http://io7m.com
* Copyright © 2020 Mark Raynsford <[email protected]> https://www.io7m.com
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
Expand All @@ -25,9 +25,17 @@
import java.util.Optional;
import java.util.ServiceLoader;

/**
* An application environment based on the real system environment.
*/

public final class ApplicationRealEnvironment
implements ApplicationEnvironmentType
{
/**
* An application environment based on the real system environment.
*/

public ApplicationRealEnvironment()
{

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2020 Mark Raynsford <[email protected]> http://io7m.com
* Copyright © 2020 Mark Raynsford <[email protected]> https://www.io7m.com
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2020 Mark Raynsford <[email protected]> http://io7m.com
* Copyright © 2020 Mark Raynsford <[email protected]> https://www.io7m.com
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
Expand Down
2 changes: 1 addition & 1 deletion com.io7m.jade.api/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2020 Mark Raynsford <[email protected]> http://io7m.com
* Copyright © 2020 Mark Raynsford <[email protected]> https://www.io7m.com
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
Expand Down
4 changes: 2 additions & 2 deletions com.io7m.jade.documentation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
<parent>
<artifactId>com.io7m.jade</artifactId>
<groupId>com.io7m.jade</groupId>
<version>1.0.1</version>
<version>1.0.2</version>
</parent>

<artifactId>com.io7m.jade.documentation</artifactId>

<name>com.io7m.jade.documentation</name>
<description>Java application directory etiquette (Documentation)</description>
<url>http://github.com/io7m/jade</url>
<url>https://www.io7m.com/software/jade</url>

<properties>
<mdep.analyze.skip>true</mdep.analyze.skip>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2019 Mark Raynsford <[email protected]> http://io7m.com
* Copyright © 2019 Mark Raynsford <[email protected]> https://www.io7m.com
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2020 Mark Raynsford <[email protected]> http://io7m.com
* Copyright © 2020 Mark Raynsford <[email protected]> https://www.io7m.com
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
Expand Down
2 changes: 1 addition & 1 deletion com.io7m.jade.documentation/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright © 2020 Mark Raynsford <[email protected]> http://io7m.com
* Copyright © 2020 Mark Raynsford <[email protected]> https://www.io7m.com
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
Expand Down
4 changes: 2 additions & 2 deletions com.io7m.jade.spi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
<parent>
<artifactId>com.io7m.jade</artifactId>
<groupId>com.io7m.jade</groupId>
<version>1.0.1</version>
<version>1.0.2</version>
</parent>

<artifactId>com.io7m.jade.spi</artifactId>

<name>com.io7m.jade.spi</name>
<description>Java application directory etiquette (SPI)</description>
<url>http://github.com/io7m/jade</url>
<url>https://www.io7m.com/software/jade</url>

<dependencies>

Expand Down
Loading

0 comments on commit 0e15529

Please sign in to comment.