Skip to content

Commit

Permalink
Merge branch 'release/0.2.0' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
arcticicestudio committed Dec 3, 2016
2 parents 0c032ca + c650dd7 commit 605caf0
Show file tree
Hide file tree
Showing 9 changed files with 48 additions and 21 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
# title Travis CI Build Configuration +
# project nord-java +
# version 0.1.0 +
# repository https://github.com/arcticicestudio/nord-java +
# author Arctic Ice Studio +
# email development@arcticicestudio.com +
Expand Down
30 changes: 30 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,36 @@

---

# 0.2.0 (2016-12-03)
## Improvements
### Public API
The public API method `getVersion() : String` is now static and returns the `String` constant `VERSION` to adapt to the SonarQube minor rule [squid:S3400](https://sonarqube.com/coding_rules#q=squid%3AS3400).
The associated unit test has been refactored to test against the [ArcVer](https://github.com/arcticicestudio/arcver) library [arcver-java](https://github.com/arcticicestudio/arcver). (@arcticicestudio, #8, 7efc44cc)

The attribute
```java
private final Color COLOR;
```
conflicted with the SonarQube rule [squid:S00116](https://sonarqube.com/coding_rules#q=squid%3AS00116) and has been adapted to the Arctic Ice Studio Java code style. (@arcticicestudio, #9, 8eb03e63)

### Toolbox
Fixed the deprecated POM variable `${inceptionYear}` and replaced it with `${project.inceptionYear}`. (@arcticicestudio, #3, 1a02e6d2)

Added POM profiles for [JFrog Bintray](https://bintray.com) to deploy Maven artifacts to the [jCenter](https://bintray.com/bintray/jcenter) and snapshots to the [OSS JFrog](https://oss.jfrog.org) repository. (@arcticicestudio, #4, f74c7a57)

### Public API Documentation
Adapted the documentation style of the Nord color palette project to the JavaDoc. (@arcticicestudio, #7, 9eab5800)

## Bug Fixes
### Public API Documentation
Fixed malformed JavaDoc to prevent compilation errors caused by the new JavaDoc linter rules introduced JDK 8u92 by adding the `summary` attribute to `table` tags. (@arcticicestudio, #3, 1a02e6d2)

## Tasks
### Toolbox
Created a `circle.yml` configuration file to add [Circle CI](https://circleci.com) build integration. (@arcticicestudio, #6, f241e8de)

Added the `maven-assembly-plugin` as `assemble` POM profile (@arcticicestudio, #5, 9f6e438d)

# 0.1.0 (2016-09-26)
## Features
Implemented the public API (@arcticicestudio, #1, 8949a9baa7adf73be66b7ac8e15dfa2b57b0ac92)
Expand Down
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p align="center"><img src="https://cdn.rawgit.com/arcticicestudio/nord-java/develop/src/main/assets/nord-java-banner.svg"/></p>

<p align="center"><img src="https://cdn.travis-ci.org/images/favicon-c566132d45ab1a9bcae64d8d90e4378a.svg" width=24 height=24/> <a href="https://travis-ci.org/arcticicestudio/nord-java"><img src="https://img.shields.io/travis/arcticicestudio/nord-java/develop.svg"/></a> <img src="https://circleci.com/favicon.ico" width=24 height=24/> <a href="https://circleci.com/gh/arcticicestudio/nord-java"><img src="https://circleci.com/gh/arcticicestudio/nord-java.svg?style=shield&circle-token=d2d78e04b95f505e0c6a870913f96ee9912bb4c0"/></a> <img src="https://codecov.io/favicon.ico" width=24 height=24/> <a href="https://codecov.io/gh/arcticicestudio/nord-java"><img src="https://codecov.io/gh/arcticicestudio/nord-java/branch/develop/graph/badge.svg"/></a> <img src="https://assets-cdn.github.com/favicon.ico" width=24 height=24/> <a href="https://github.com/arcticicestudio/nord-java/releases/latest"><img src="https://img.shields.io/github/release/arcticicestudio/nord-java.svg"/></a> <a href="https://github.com/arcticicestudio/nord-java/releases/latest"><img src="https://img.shields.io/badge/pre--release---_-blue.svg"/></a> <a href="https://github.com/arcticicestudio/nord/releases/tag/v0.2.0"><img src="https://img.shields.io/badge/Nord-0.2.0-blue.svg"/></a> <img src="http://central.sonatype.org/favicon.ico" width=24 height=24/> <a href="http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.arcticicestudio%22%20AND%20a%3A%22nord-java%22"><img src="https://img.shields.io/maven-central/v/com.arcticicestudio/nord-java.svg"/></a> <img src="https://oss.sonatype.org/favicon.ico"/> <a href="https://oss.sonatype.org/content/repositories/snapshots/com/arcticicestudio/nord-java"><img src="https://img.shields.io/badge/snapshot-0.2.0--SNAPSHOT-blue.svg"/></a> <img src="https://bintray.com/favicon.ico" width=24 height=24/> <a href='https://bintray.com/arcticicestudio/Nord/nord-java/_latestVersion'><img src='https://api.bintray.com/packages/arcticicestudio/Nord/nord-java/images/download.svg'></a> <img src="https://oss.jfrog.org/webapp/images/favicon.40285.ico" width=24 height=24/> <a href="https://oss.jfrog.org/webapp/#/artifacts/browse/tree/General/oss-snapshot-local/com/arcticicestudio/nord-java"><img src="https://img.shields.io/badge/artifactory-0.2.0--SNAPSHOT-green.svg"/></a></p>
<p align="center"><img src="https://cdn.travis-ci.org/images/favicon-c566132d45ab1a9bcae64d8d90e4378a.svg" width=24 height=24/> <a href="https://travis-ci.org/arcticicestudio/nord-java"><img src="https://img.shields.io/travis/arcticicestudio/nord-java/develop.svg"/></a> <img src="https://circleci.com/favicon.ico" width=24 height=24/> <a href="https://circleci.com/gh/arcticicestudio/nord-java"><img src="https://circleci.com/gh/arcticicestudio/nord-java.svg?style=shield&circle-token=d2d78e04b95f505e0c6a870913f96ee9912bb4c0"/></a> <img src="https://codecov.io/favicon.ico" width=24 height=24/> <a href="https://codecov.io/gh/arcticicestudio/nord-java"><img src="https://codecov.io/gh/arcticicestudio/nord-java/branch/develop/graph/badge.svg"/></a> <img src="https://assets-cdn.github.com/favicon.ico" width=24 height=24/> <a href="https://github.com/arcticicestudio/nord-java/releases/latest"><img src="https://img.shields.io/github/release/arcticicestudio/nord-java.svg"/></a> <a href="https://github.com/arcticicestudio/nord-java/releases/latest"><img src="https://img.shields.io/badge/pre--release---_-blue.svg"/></a> <a href="https://github.com/arcticicestudio/nord/releases/tag/v0.2.0"><img src="https://img.shields.io/badge/Nord-0.2.0-blue.svg"/></a> <img src="http://central.sonatype.org/favicon.ico" width=24 height=24/> <a href="http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.arcticicestudio%22%20AND%20a%3A%22nord-java%22"><img src="https://img.shields.io/maven-central/v/com.arcticicestudio/nord-java.svg"/></a> <img src="https://oss.sonatype.org/favicon.ico"/> <a href="https://oss.sonatype.org/content/repositories/snapshots/com/arcticicestudio/nord-java"><img src="https://img.shields.io/badge/snapshot---_-blue.svg"/></a> <img src="https://bintray.com/favicon.ico" width=24 height=24/> <a href='https://bintray.com/arcticicestudio/Nord/nord-java/_latestVersion'><img src='https://api.bintray.com/packages/arcticicestudio/Nord/nord-java/images/download.svg'></a> <img src="https://oss.jfrog.org/webapp/images/favicon.40285.ico" width=24 height=24/> <a href="https://oss.jfrog.org/webapp/#/artifacts/browse/tree/General/oss-snapshot-local/com/arcticicestudio/nord-java"><img src="https://img.shields.io/badge/artifactory---_-green.svg"/></a></p>

<p align="center">A arctic, north-bluish color palette Java library.<br>
Implementation of the <a href="https://github.com/arcticicestudio/nord">Nord</a> project.</p>
Expand All @@ -17,18 +17,18 @@ You can get it from the <img src="http://central.sonatype.org/favicon.ico" width
<dependency>
<groupId>com.arcticicestudio</groupId>
<artifactId>nord-java</artifactId>
<version>0.1.0</version>
<version>0.2.0</version>
</dependency>
```

<img src="https://gradle.org/wp-content/uploads/fbrfg/favicon.ico" width=16 height=16/> <a href="https://gradle.org">Gradle</a>
```java
compile(group: 'com.arcticicestudio', name: 'nord-java', version: '0.1.0')
compile(group: 'com.arcticicestudio', name: 'nord-java', version: '0.2.0')
```

<img src="http://apache.org/favicons/favicon.ico" width=16 height=16/> <a href="https://ant.apache.org/ivy">Apache Ivy</a>
```xml
<dependency org="com.arcticicestudio" name="nord-java" rev="0.1.0" />
<dependency org="com.arcticicestudio" name="nord-java" rev="0.2.0" />
```

Development snapshots are available via [OSS Sonatype](https://oss.sonatype.org/content/repositories/snapshots/com/arcticicestudio/nord-java) and [JFrog Artifactory](https://oss.jfrog.org/webapp/#/artifacts/browse/tree/General/oss-snapshot-local/com/arcticicestudio/nord-java).
Expand All @@ -51,25 +51,25 @@ This is a basic guide to show the common usage of the nord-java API.
The API documentation can be found in the JavaDoc.

The class `Nord` is the entrypoint to the nord-java API, use it to generate the HEX and RGB color codes.
- [Generate color code strings](#generate-color-code-strings)
- [Obtaining the Public API version](#obtaining-the-public-api-version)
1. [Generate color code strings](#generate-color-code-strings)
2. [Obtaining the Public API version](#obtaining-the-public-api-version)

### Generate color code strings
You can generate color code strings from all `Nord` enum variables by using the with the static methods `hex(Color)` and `rgb(Color)`.
Color code strings can be generated from all `Nord` enum constants by using the static methods `hex(Color)` and `rgb(Color)`.
The `Color` object can be obtained from a `Nord` enum variable via the `get()` method.
```java
String hex = Nord.hex(Nord.NORD0.get()); // ""#2E3440"
String rgb = Nord.rgb(Nord.NORD8.get()); // "rgb(136, 192, 208)""
String hex = Nord.hex(Nord.NORD0.get()); // "#2E3440"
String rgb = Nord.rgb(Nord.NORD8.get()); // "rgb(136, 192, 208)"
```

### Obtaining the Public API version
The method `getVersion()` returns the version of the public API as string.
The `getVersion()` method returns the [ArcVer](https://github.com/arcticicestudio/arcver) version of the public API.
```java
String version = Nord.NORD0.getVersion(); // "0.1.0"
String version = Nord.getVersion(); // "0.2.0"
```

## Development
[![](https://img.shields.io/badge/Changelog-0.1.0-blue.svg)](https://github.com/arcticicestudio/nord-java/blob/v0.1.0/CHANGELOG.md) [![](https://img.shields.io/badge/Workflow-gitflow_Branching_Model-blue.svg)](http://nvie.com/posts/a-successful-git-branching-model) [![](https://img.shields.io/badge/Versioning-ArcVer_0.8.0-blue.svg)](https://github.com/arcticicestudio/arcver)
[![](https://img.shields.io/badge/Changelog-0.2.0-blue.svg)](https://github.com/arcticicestudio/nord-java/blob/v0.2.0/CHANGELOG.md) [![](https://img.shields.io/badge/Workflow-gitflow_Branching_Model-blue.svg)](http://nvie.com/posts/a-successful-git-branching-model) [![](https://img.shields.io/badge/Versioning-ArcVer_0.8.0-blue.svg)](https://github.com/arcticicestudio/arcver)

### Contribution
Please report issues/bugs, feature requests and suggestions for improvements to the [issue tracker](https://github.com/arcticicestudio/nord-java/issues).
Expand Down
1 change: 0 additions & 1 deletion circle.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
# title Circle CI Build Configuration +
# project nord-java +
# version +
# repository https://github.com/arcticicestudio/nord-java +
# author Arctic Ice Studio +
# email development@arcticicestudio.com +
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ JFrog

<groupId>com.arcticicestudio</groupId>
<artifactId>nord-java</artifactId>
<version>0.2.0-SNAPSHOT</version>
<version>0.2.0</version>
<packaging>jar</packaging>

<name>nord-java</name>
Expand Down
1 change: 0 additions & 1 deletion src/main/assets/assembly-bin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
title Binary Assembly Descriptor +
project nord-java +
version +
repository https://github.com/arcticicestudio/nord-java +
author Arctic Ice Studio +
email development@arcticicestudio.com +
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/arcticicestudio/nord/Nord.java
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ copyright Copyright (C) 2016 +
* </div>
*
* @author Arctic Ice Studio &lt;development@arcticicestudio.com&gt;
* @version 0.1.0
* @version 0.2.0
* @since 0.1.0
*/
public enum Nord {
Expand Down Expand Up @@ -204,7 +204,7 @@ public enum Nord {
/**
* The <a href="https://github.com/arcticicestudio/arcver">ArcVer</a> version of the public API.
*/
private static final String VERSION = "0.1.0";
private static final String VERSION = "0.2.0";

/**
* Constructs a new color object.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/arcticicestudio/nord/package-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ copyright Copyright (C) 2016 +
* The public API entry point is the {@link com.arcticicestudio.nord.Nord} enum.
*
* @author Arctic Ice Studio &lt;development@arcticicestudio.com&gt;
* @version 0.1.0
* @version 0.2.0
* @since 0.1.0
*/
package com.arcticicestudio.nord;
package com.arcticicestudio.nord;
2 changes: 1 addition & 1 deletion src/test/java/com/arcticicestudio/nord/NordTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ public void shouldReturnTheCorrectRGBColorCode() {

@Test
public void shouldReturnTheCorrectVersionString() {
assertTrue(Version.valueOf(Nord.getVersion()).satisfies("0.1.0"));
assertTrue(Version.valueOf(Nord.getVersion()).satisfies("0.2.0"));
}
}

0 comments on commit 605caf0

Please sign in to comment.