Compare commits

..

No commits in common. "ffe3860e12a42e15d16cb982bdbe636beb188479" and "7a875731f83bd9d1d6881ccd9a68f09f0e003b4b" have entirely different histories.

5 changed files with 12 additions and 23 deletions

View file

@ -3,12 +3,12 @@
<servers> <servers>
<server> <server>
<id>sonatype-nexus-snapshots</id> <id>sonatype-nexus-snapshots</id>
<username>kemitix</username> <username>${env.NEXUS_USERNAME}</username>
<password>${env.NEXUS_PASSWORD}</password> <password>${env.NEXUS_PASSWORD}</password>
</server> </server>
<server> <server>
<id>sonatype-nexus-staging</id> <id>sonatype-nexus-staging</id>
<username>kemitix</username> <username>${env.NEXUS_USERNAME}</username>
<password>${env.NEXUS_PASSWORD}</password> <password>${env.NEXUS_PASSWORD}</password>
</server> </server>
</servers> </servers>

View file

@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
java: [ 17 ] java: [ 11, 15 ]
steps: steps:
- uses: kamiazya/setup-graphviz@v1 - uses: kamiazya/setup-graphviz@v1
- uses: actions/checkout@v2 - uses: actions/checkout@v2

View file

@ -14,7 +14,7 @@ jobs:
- name: Set up JDK - name: Set up JDK
uses: actions/setup-java@v1 uses: actions/setup-java@v1
with: with:
java-version: 17 java-version: 11
- name: Build with Maven - name: Build with Maven
run: mvn -B install run: mvn -B install
- name: Nexus Repo Publish - name: Nexus Repo Publish
@ -34,6 +34,7 @@ jobs:
-B \ -B \
deploy deploy
env: env:
NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
GPG_KEYNAME: ${{ secrets.GPG_KEYNAME }} GPG_KEYNAME: ${{ secrets.GPG_KEYNAME }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

14
pom.xml
View file

@ -12,15 +12,15 @@
</parent> </parent>
<artifactId>fontface</artifactId> <artifactId>fontface</artifactId>
<version>1.1.0</version> <version>1.0.0</version>
<properties> <properties>
<tiles-maven-plugin.version>2.25</tiles-maven-plugin.version> <tiles-maven-plugin.version>2.20</tiles-maven-plugin.version>
<kemitix-tiles.version>2.10.0</kemitix-tiles.version> <kemitix-tiles.version>2.10.0</kemitix-tiles.version>
<lombok.version>1.18.22</lombok.version> <lombok.version>1.18.20</lombok.version>
<junit-jupiter.version>5.8.2</junit-jupiter.version> <junit-jupiter.version>5.7.1</junit-jupiter.version>
<mockito-junit-jupiter.version>4.2.0</mockito-junit-jupiter.version> <mockito-junit-jupiter.version>3.8.0</mockito-junit-jupiter.version>
<assertj-core.version>3.21.0</assertj-core.version> <assertj-core.version>3.19.0</assertj-core.version>
</properties> </properties>
<dependencies> <dependencies>
@ -72,4 +72,4 @@
</plugins> </plugins>
</build> </build>
</project> </project>

View file

@ -17,18 +17,6 @@ public class FontFace {
private int shadowOffsetX; private int shadowOffsetX;
private int shadowOffsetY; private int shadowOffsetY;
public static FontFace of(
URI fontUri,
int size,
String colour,
String shadowColour,
int shadowOffsetX,
int shadowOffsetY
) {
return new FontFace(fontUri, size, colour,
shadowColour, shadowOffsetX, shadowOffsetY);
}
public static FontFace of( public static FontFace of(
URI fontUri, URI fontUri,
int size, int size,