Skip to content

Commit

Permalink
Merge pull request #21 from Siroshun09/ver/4.0.0
Browse files Browse the repository at this point in the history
Version 4.0.0
  • Loading branch information
Siroshun09 authored Jul 2, 2021
2 parents b0fe800 + 2d1f868 commit 5235190
Show file tree
Hide file tree
Showing 43 changed files with 2,230 additions and 1,278 deletions.
21 changes: 10 additions & 11 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
name: Java CI
on: [push]
on: [ push ]

jobs:
build:
runs-on: ubuntu-latest
if: "! contains(github.event.head_commit.message, '[CI-SKIP]')"
steps:
- uses: actions/[email protected]
- name: Set up JDK 8
uses: actions/setup-java@v2
- name: Set up JDK 11
uses: actions/setup-java@v2.1.0
with:
distribution: 'adopt'
java-version: 8
- uses: actions/[email protected].5
java-version: 11
- uses: actions/[email protected].6
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand All @@ -23,9 +22,9 @@ jobs:
- name: Move built jars
run: |
mkdir staging
cp -r common/target staging/common
cp -r target staging/configapi
- uses: actions/upload-artifact@v2
mv api/target staging/api
mv yaml/target staging/yaml
- uses: actions/upload-artifact@v2.2.4
with:
name: Package
path: staging
name: Artifacts
path: staging
5 changes: 2 additions & 3 deletions .github/workflows/update-javadoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@ on:
jobs:
build:
runs-on: ubuntu-latest
if: "! contains(github.event.head_commit.message, '[CI-SKIP]')"
steps:
- uses: actions/[email protected]
- name: Set up JDK 11
uses: actions/setup-java@v2
uses: actions/setup-java@v2.1.0
with:
distribution: 'adopt'
java-version: 11
- uses: actions/[email protected].5
- uses: actions/[email protected].6
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@ buildNumber.properties
/.idea
/jars
*.iml

# ignore files for test
test.*
23 changes: 17 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ A configuration library for Java.

## Requirements

- Java 8+
- Java 11+

## Usage (Maven)

Javadoc is [here](https://siroshun09.github.io/ConfigAPI/)

### Common
### API

```xml
<dependency>
<groupId>com.github.siroshun09.configapi</groupId>
<artifactId>common</artifactId>
<version>3.1.1</version>
<artifactId>api</artifactId>
<version>4.0.0</version>
<scope>compile</scope>
</dependency>
```
Expand All @@ -32,7 +32,18 @@ Javadoc is [here](https://siroshun09.github.io/ConfigAPI/)
<dependency>
<groupId>com.github.siroshun09.configapi</groupId>
<artifactId>yaml</artifactId>
<version>3.1.1</version>
<version>4.0.0</version>
<scope>compile</scope>
</dependency>
```

If necessary, add the snakeYaml dependency as follows:

```xml
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.29</version>
<scope>compile</scope>
</dependency>
```
Expand All @@ -41,4 +52,4 @@ Javadoc is [here](https://siroshun09.github.io/ConfigAPI/)

This project is under the Apache License version 2.0. Please see [LICENSE](LICENSE) for more info.

Copyright © 2020-2021, Siroshun09
Copyright © 2020-2021, Siroshun09
11 changes: 3 additions & 8 deletions file/pom.xml → api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>configapi</artifactId>
<groupId>com.github.siroshun09.configapi</groupId>
<version>3.1.1</version>
<version>4.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>file</artifactId>
<packaging>pom</packaging>
<artifactId>api</artifactId>

<modules>
<module>yaml</module>
</modules>
</project>
Loading

0 comments on commit 5235190

Please sign in to comment.