Skip to content

Commit

Permalink
Merge branch 'release'
Browse files Browse the repository at this point in the history
  • Loading branch information
ImSejin committed Oct 9, 2022
2 parents 3f37cdf + faaca7e commit ea62f94
Show file tree
Hide file tree
Showing 54 changed files with 1,182 additions and 851 deletions.
18 changes: 11 additions & 7 deletions .github/workflows/maven-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ on:
push:
branches:
- release

schedule:
- cron: "0 20 * * 6" # Runs at 05:00 Asia/Seoul on Sun.

jobs:
build:
name: Builds with java ${{ matrix.java }} on ${{ matrix.os }}

strategy:
fail-fast: true
max-parallel: 3 # Maximum: Sum of matrices.
Expand All @@ -23,19 +23,23 @@ jobs:
os: [ubuntu-latest, macos-latest, windows-latest]

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- name: Checkout sources from repository
uses: actions/checkout@v3

- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java }}
distribution: "zulu"
cache: "maven"

- name: Build with Maven
run: mvn clean package -B --file pom.xml

run: |
mvn --version
mvn clean package -B --file pom.xml
- name: Send code coverage to Codecov
uses: codecov/codecov-action@v2
with:
Expand Down
117 changes: 0 additions & 117 deletions .mvn/wrapper/MavenWrapperDownloader.java

This file was deleted.

Binary file modified .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
20 changes: 18 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,18 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
29 changes: 28 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Table of Contents

- [v0.12.0](#v0120):
- [v0.11.0](#v0110): 2022-09-12
- [v0.10.0](#v0100): 2022-08-21
- [v0.9.0](#v090): 2022-05-26
Expand Down Expand Up @@ -27,6 +28,32 @@
- [v0.1.1](#v011): 2020-09-18
- [v0.1.0](#v010): 2020-09-17

# v0.12.0

### Modification

- 🔥 Remove: utility class `PathnameUtils`
- 🔥 Remove: assertion methods `isTypeOf(Object)`, `isNotTypeOf(Object)` in `ClassAssert`
- 🚚 Rename: assertion method `predicate(Predicate)` to `is(Predicate)` in `ObjectAssert`
- 🚚 Rename: internal field from `DECIMAL_PLACE` to `ROUNDING_SCALE` in `Stopwatch`
- 🔨 Modify: pattern of return value from `getSummary`, `getStatistics()` in `Stopwatch`

### New features

- ✨ Add: assertion class `UuidAssert`
- ✨ Add: assertion methods `isNotInstanceOf(Class)`, `isNot(Predicate)` in `ObjectAssert`
- ✨ Add: method `getAverageTime()` in `Stopwatch`

### Troubleshooting

- 🐞 Fix: wrong print of `Stopwatch.getStatistics()`

### Dependencies

- ♻️ Replace: dependency `jsr305` with `jakarta.validation-api`
- ⬆️ Upgrade: test dependency `junit5` from `5.8.2` to `5.9.1`
- ⬆️ Upgrade: test dependency `spock-core` from `2.2-groovy-3.0` to `2.3-groovy-3.0`

# v0.11.0

### Modification
Expand Down Expand Up @@ -158,7 +185,7 @@
- 🔥 Remove: redundant annotation `@Nonnull` on parameter
- ♻️ Replace: methods `box` with `wrap(Object)` in `ArrayUtils`
- ♻️ Replace: methods `unbox` with `unwrap(Object)` in `ArrayUtils`
- ♻️ Replace: `assertion.DecimalNumberAssertion` with `assertion.composition.DecimalNumberAssertion`
- ♻️ Replace: `assertion.DecimalNumberAssertion` with `assertion.composition.DecimalNumberAssertable`
- ♻️ Replace: `assertion.object.AbstractObjectAssert` with `assertion.lang.ObjectAssert`
- ♻️ Replace: `assertion.chars.AbstractCharSequenceAssert` with `assertion.lang.CharSequenceAssert`
- ♻️ Replace: `assertion.time.OffsetAssertion` with `assertion.composition.OffsetAssertable`
Expand Down
16 changes: 8 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>io.github.imsejin</groupId>
<artifactId>common-utils</artifactId>
<version>0.11.0</version>
<version>0.12.0</version>
<packaging>jar</packaging>

<name>Common Utils</name>
Expand Down Expand Up @@ -57,13 +57,13 @@
<gson.version>2.9.1</gson.version>
<ini4j.version>0.5.4</ini4j.version>
<apache-common-compress.version>1.21</apache-common-compress.version>
<jsr305.version>3.0.2</jsr305.version>
<jsr380.version>3.0.2</jsr380.version>
<jetbrains-annotations.version>23.0.0</jetbrains-annotations.version>

<!-- Test dependency versions -->
<junit5.version>5.8.2</junit5.version>
<junit5.version>5.9.1</junit5.version>
<assertj.version>3.23.1</assertj.version>
<spock.version>2.2-groovy-3.0</spock.version>
<spock.version>2.3-groovy-3.0</spock.version>
<lombok.version>1.18.24</lombok.version>
<memory-file-system.version>2.3.0</memory-file-system.version>
</properties>
Expand All @@ -90,11 +90,11 @@
<version>${apache-common-compress.version}</version>
</dependency>

<!-- JSR-305 -->
<!-- JSR-380 -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>${jsr305.version}</version>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>${jsr380.version}</version>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/io/github/imsejin/common/assertion/Asserts.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import io.github.imsejin.common.assertion.util.DateAssert;
import io.github.imsejin.common.assertion.util.ListAssert;
import io.github.imsejin.common.assertion.util.MapAssert;
import io.github.imsejin.common.assertion.util.UuidAssert;
import io.github.imsejin.common.util.ArrayUtils;

import java.io.File;
Expand All @@ -69,6 +70,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.UUID;

/**
* Asserts for fluent assertion not increasing branches on code coverage.
Expand Down Expand Up @@ -297,4 +299,8 @@ public static <K, V> MapAssert<?, Map<K, V>, K, V> that(Map<K, V> map) {
return new MapAssert<>(map);
}

public static UuidAssert<?> that(UUID uuid) {
return new UuidAssert<>(uuid);
}

}
Loading

0 comments on commit ea62f94

Please sign in to comment.