Skip to content

Commit b482f26

Browse files
xSAVIKxxSAVIKx
authored
Merge pull request #21 from xSAVIKx/release/v1.4.0
Release/v1.4.0
2 parents 5915d31 + 54594e0 commit b482f26

166 files changed

Lines changed: 3165 additions & 418 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.bin/gitconfig.sh‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
#!/usr/bin/env bash
22

3+
#
4+
# Copyright 2021, Yurii Serhiichuk
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
#
19+
320
# Set colors
421
GREEN='\033[1;32m'
522
CYAN='\033[1;36m'
@@ -39,4 +56,4 @@ git config --local include.path "${GITCONFIG_PATH}"
3956
printf "${GREEN}.gitconfig path was successfully set to '${GITCONFIG_PATH}'.${NC}"
4057
echo
4158
printf "${GREEN}----${NC}"
42-
echo
59+
echo

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* text=auto
44

55
*.bat text eol=crlf
6+
*.sh text eol=lf
67

78
#
89
# The above will handle all files NOT found below

‎.github/workflows/ci.yaml‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches: [ '*' ]
6+
pull_request:
7+
branches: [ '*' ]
8+
workflow_dispatch:
9+
10+
jobs:
11+
build:
12+
name: Test on Java ${{ matrix.java }} and ${{ matrix.os }}
13+
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
java: [ 8, 11, 15 ]
18+
os: [ ubuntu-latest, windows-latest, macos-latest ]
19+
20+
runs-on: ${{ matrix.os }}
21+
22+
steps:
23+
- uses: actions/checkout@v2
24+
- name: Set up JDK ${{ matrix.java }}
25+
uses: actions/setup-java@v2
26+
with:
27+
java-version: ${{ matrix.java }}
28+
distribution: 'zulu'
29+
java-package: 'jdk'
30+
- uses: actions/cache@v2
31+
with:
32+
path: |
33+
~/.gradle/caches
34+
~/.gradle/wrapper
35+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
36+
restore-keys: |
37+
${{ runner.os }}-gradle-
38+
- name: Grant execute permission for gradlew
39+
run: chmod +x gradlew
40+
- name: Build with Gradle
41+
run: ./gradlew build --stacktrace
42+
env:
43+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44+
OPENWEATHERMAP_API_KEY: ${{ secrets.OPENWEATHERMAP_API_KEY }}
45+
- uses: codecov/codecov-action@v1
46+
deploy:
47+
name: Deploy packages
48+
runs-on: ubuntu-20.04
49+
needs: [ build ]
50+
if: contains('
51+
refs/heads/development
52+
refs/heads/master
53+
', github.ref)
54+
&& github.event_name == 'push'
55+
steps:
56+
- uses: actions/checkout@v2
57+
- name: Set up JDK 8
58+
uses: actions/setup-java@v2
59+
with:
60+
java-version: '8'
61+
distribution: 'zulu'
62+
java-package: 'jdk'
63+
- uses: actions/cache@v2
64+
with:
65+
path: |
66+
~/.gradle/caches
67+
~/.gradle/wrapper
68+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
69+
restore-keys: |
70+
${{ runner.os }}-gradle-
71+
- name: Grant execute permission for gradlew
72+
run: chmod +x gradlew
73+
- name: Publish to GitHub Packages
74+
run: ./gradlew publish --stacktrace
75+
env:
76+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
77+
OPENWEATHERMAP_API_KEY: ${{ secrets.OPENWEATHERMAP_API_KEY }}

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,4 +128,6 @@ $RECYCLE.BIN/
128128

129129
# betamax ignores
130130
littleproxy_cert
131-
*.jks
131+
*.jks
132+
133+
gradle.properties

‎.idea/copyright/profiles_settings.xml‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/copyright/xsavikx_opensource.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/vcs.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.travis.yml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎LICENSE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,15 +178,15 @@
178178
APPENDIX: How to apply the Apache License to your work.
179179

180180
To apply the Apache License to your work, attach the following
181-
boilerplate notice, with the fields enclosed by brackets "{}"
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182182
replaced with your own identifying information. (Don't include
183183
the brackets!) The text should be enclosed in the appropriate
184184
comment syntax for the file format. We also recommend that a
185185
file or class name and description of purpose be included on the
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright 2017 Yuri Sergiichuk
189+
Copyright [yyyy] [name of copyright owner]
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

‎README.md‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
openweathermap-java-api [![Build Status][ci-shield]][ci-link] [![Download][bintray-shield]][bintray-link] [![codecov][codecov-shield]][codecov-link]
1+
openweathermap-java-api
2+
[![Build Status][ci-badge]][ci-link]
3+
[![codecov][codecov-badge]][codecov-link]
24
=====
35

4-
To use the OpenweatherMap API, you need to obtain an API key. Sign up [here][openweathermap-signup].
6+
To use the OpenweatherMap API, you need to obtain an API key. Sign up [here][openweathermap-signup].
57

68

79
[openweathermap-signup]: http://home.openweathermap.org/users/sign_up
@@ -71,17 +73,17 @@ CATALAN("ca");
7173
- Metric
7274
- Imperial
7375

74-
More information about weather parameters and unit can be found [here](http://openweathermap.org/weather-data).
76+
More information about weather parameters and unit can be
77+
found [here](http://openweathermap.org/weather-data).
7578

7679
## Examples
7780

7881
Take a look at [examples module](./api-examples)
7982

80-
[ci-shield]: https://travis-ci.org/xSAVIKx/openweathermap-java-api.svg?branch=development
81-
[ci-link]: https://travis-ci.org/xSAVIKx/openweathermap-java-api
83+
[ci-badge]: https://github.com/xSAVIKx/openweathermap-java-api/actions/workflows/ci.yaml/badge.svg
8284

83-
[bintray-shield]: https://api.bintray.com/packages/xsavikx/openweathermap-java-api/api-core/images/download.svg
84-
[bintray-link]: https://bintray.com/xsavikx/openweathermap-java-api/api-core/_latestVersion
85+
[ci-link]: https://github.com/xSAVIKx/openweathermap-java-api/actions/workflows/ci.yaml
86+
87+
[codecov-badge]: https://codecov.io/gh/xSAVIKx/openweathermap-java-api/branch/development/graph/badge.svg
8588

86-
[codecov-shield]: https://codecov.io/gh/xSAVIKx/openweathermap-java-api/branch/development/graph/badge.svg
8789
[codecov-link]: https://codecov.io/gh/xSAVIKx/openweathermap-java-api

0 commit comments

Comments
 (0)