Skip to content

Commit

Permalink
Merge branch 'master' into enable-jackson-afterburner
Browse files Browse the repository at this point in the history
  • Loading branch information
jimmyjames committed Sep 18, 2023
2 parents c957691 + a6fa0b4 commit 93dd7f5
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 63 deletions.
61 changes: 0 additions & 61 deletions .circleci/config.yml

This file was deleted.

27 changes: 27 additions & 0 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: auth0/java-jwt/build-and-test

on:
pull_request:
merge_group:
push:
branches: ["master", "main", "v1"]

jobs:
gradle:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
- uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c
with:
arguments: assemble apiDiff check jacocoTestReport --continue --console=plain
- uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d
with:
flags: unittests
- uses: actions/upload-artifact@v3
with:
name: Reports
path: lib/build/reports
14 changes: 14 additions & 0 deletions .github/workflows/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"

- package-ecosystem: "gradle"
directory: "lib"
schedule:
interval: "daily"
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-major"]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
![A Java implementation of JSON Web Token (JWT) - RFC 7519.](https://cdn.auth0.com/website/sdks/banners/java-jwt-banner.png)

[![CircleCI](https://img.shields.io/circleci/project/github/auth0/java-jwt.svg?style=flat-square)](https://circleci.com/gh/auth0/java-jwt/tree/master)
![Build Status](https://img.shields.io/github/checks-status/auth0/java-jwt/master)
[![Coverage Status](https://img.shields.io/codecov/c/github/auth0/java-jwt.svg?style=flat-square)](https://codecov.io/github/auth0/java-jwt)
[![License](http://img.shields.io/:license-mit-blue.svg?style=flat)](https://doge.mit-license.org/)
[![Maven Central](https://img.shields.io/maven-central/v/com.auth0/java-jwt.svg?style=flat-square)](https://mvnrepository.com/artifact/com.auth0/java-jwt)
Expand Down
2 changes: 1 addition & 1 deletion lib/src/main/java/com/auth0/jwt/JWTCreator.java
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ private static boolean isBasicType(Object value) {
}

/**
* Creates a new JWT and signs is with the given algorithm.
* Creates a new JWT and signs it with the given algorithm.
*
* @param algorithm used to sign the JWT
* @return a new JWT token
Expand Down

0 comments on commit 93dd7f5

Please sign in to comment.