Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(deps): Update dependencies 2023.09.10 #192

Merged
merged 1 commit into from
Sep 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/owner-approve.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
name: Auto approve for owner

on:
Expand Down
28 changes: 10 additions & 18 deletions .github/workflows/pages.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---

name: Pages

on:
push:
branches: [release]
workflow_call:
workflow_dispatch:


permissions:
contents: read
Expand All @@ -13,26 +13,20 @@ permissions:

concurrency:
group: pages
cancel-in-progress: true
cancel-in-progress: false

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Setup Pages
uses: actions/configure-pages@v2

- name: Build with Jekyll
uses: actions/jekyll-build-pages@v1
- uses: actions/checkout@v4
- uses: actions/configure-pages@v3
- uses: actions/jekyll-build-pages@v1
with:
source: ./
destination: ./_site
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
- uses: actions/upload-pages-artifact@v2

deploy:
environment:
Expand All @@ -42,7 +36,5 @@ jobs:
needs: build

steps:
- name: Deploy Pages
uses: actions/deploy-pages@v1

...
- uses: actions/deploy-pages@v2
id: deployment
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
19.4.0
20.6.1
222 changes: 111 additions & 111 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Large diffs are not rendered by default.

823 changes: 0 additions & 823 deletions .yarn/releases/yarn-3.3.1.cjs

This file was deleted.

874 changes: 874 additions & 0 deletions .yarn/releases/yarn-3.6.3.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"

yarnPath: .yarn/releases/yarn-3.3.1.cjs
yarnPath: .yarn/releases/yarn-3.6.3.cjs
60 changes: 27 additions & 33 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,59 +11,43 @@ plugins {
id 'maven-publish'
id 'signing'

id 'io.github.joselion.pretty-jupiter' version '2.2.1'
id 'io.github.joselion.strict-null-check' version '2.2.0'
id 'io.github.gradle-nexus.publish-plugin' version '1.3.0'
id 'io.github.joselion.pretty-jupiter' version '3.0.1'
id 'io.github.joselion.strict-null-check' version '3.0.0'
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0-rc-1'
id 'se.solrike.sonarlint' version '1.0.0-beta.15'
}

group = 'io.github.joselion'

java {
sourceCompatibility = JavaLanguageVersion.of(17)
toolchain {
languageVersion = JavaLanguageVersion.of(20)
vendor = JvmVendorSpec.ORACLE
}

withJavadocJar()
withSourcesJar()
}

javadoc {
if(JavaVersion.current().isJava9Compatible()) {
options.addBooleanOption('html5', true)
}

title = 'Maybe - Safely handle exceptions'
options {
addBooleanOption('html5', true)
addStringOption('Xwerror', '-quiet')
tags('apiNote')
}
}

jar {
from sourceSets.main.allSource
from(sourceSets.main.allSource)
manifest {
attributes(
'Implementation-Title': project.name,
'Implementation-Version': project.version
'Implementation-Version': project.version,
)
}
}

strictNullCheck {
packageJavadoc = """\
|@author Jose Luis Leon
|@since v1.0.2
|"""
.stripMargin()

versions {
eclipseAnnotations = '2.2.700'
findBugs = '3.0.2'
}
}

sonarlint {
excludeRules = [
'java:S107', // Allow constructors with more than 7 parameters
Expand All @@ -75,13 +59,19 @@ sonarlint {
]
}

checkstyle {
toolVersion = '10.12.0'
sourceSets = sourceSets
strictNullCheck {
packageInfo {
useEclipse()
javadoc = """\
@author Jose Luis Leon
@since v1.0.2
""".stripIndent()
}
source.addEclipse()
}

jacoco {
toolVersion = '0.8.10'
checkstyle {
setToolVersion('10.12.3')
}

dependencyLocking {
Expand All @@ -96,13 +86,13 @@ dependencies {
sonarlintPlugins('org.sonarsource.java:sonar-java-plugin:7.20.0.31692')

testImplementation('org.assertj:assertj-core:3.24.2')
testImplementation('org.mockito:mockito-inline:5.2.0')
testImplementation('org.mockito:mockito-core:5.5.0')
}

testing {
suites {
test {
useJUnitJupiter('5.9.3')
useJUnitJupiter('5.10.0')
}
}
}
Expand All @@ -111,6 +101,10 @@ prettyJupiter {
duration.threshold = 150
}

jacoco {
toolVersion('0.8.10')
}

jacocoTestReport {
reports {
xml.required = true
Expand All @@ -121,7 +115,7 @@ jacocoTestReport {
publishing {
publications {
mavenJava(MavenPublication) {
from components.java
from(components.java)

pom {
name = 'maybe'
Expand Down Expand Up @@ -168,8 +162,8 @@ signing {
nexusPublishing {
repositories {
sonatype {
nexusUrl.set(uri('https://s01.oss.sonatype.org/service/local/'))
snapshotRepositoryUrl.set(uri('https://s01.oss.sonatype.org/content/repositories/snapshots/'))
nexusUrl = uri('https://s01.oss.sonatype.org/service/local/')
snapshotRepositoryUrl = uri('https://s01.oss.sonatype.org/content/repositories/snapshots/')
}
}
}
13 changes: 7 additions & 6 deletions buildscript-gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
io.github.furstenheim:copy_down:1.1=classpath
io.github.gradle-nexus.publish-plugin:io.github.gradle-nexus.publish-plugin.gradle.plugin:1.3.0=classpath
io.github.gradle-nexus:publish-plugin:1.3.0=classpath
io.github.joselion.pretty-jupiter:io.github.joselion.pretty-jupiter.gradle.plugin:2.2.1=classpath
io.github.joselion.strict-null-check:io.github.joselion.strict-null-check.gradle.plugin:2.2.0=classpath
io.github.joselion:pretty-jupiter:2.2.1=classpath
io.github.joselion:strict-null-check:2.2.0=classpath
io.github.gradle-nexus.publish-plugin:io.github.gradle-nexus.publish-plugin.gradle.plugin:2.0.0-rc-1=classpath
io.github.gradle-nexus:publish-plugin:2.0.0-rc-1=classpath
io.github.joselion.pretty-jupiter:io.github.joselion.pretty-jupiter.gradle.plugin:3.0.1=classpath
io.github.joselion.strict-null-check:io.github.joselion.strict-null-check.gradle.plugin:3.0.0=classpath
io.github.joselion:maybe:3.2.0=classpath
io.github.joselion:pretty-jupiter:3.0.1=classpath
io.github.joselion:strict-null-check:3.0.0=classpath
org.apache.commons:commons-lang3:3.11=classpath
org.apache.commons:commons-text:1.9=classpath
org.jsoup:jsoup:1.15.2=classpath
Expand Down
57 changes: 35 additions & 22 deletions gradle.lockfile
Original file line number Diff line number Diff line change
@@ -1,49 +1,62 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.google.code.findbugs:jsr305:3.0.2=checkstyle,compileClasspath
com.google.errorprone:error_prone_annotations:2.11.0=checkstyle
com.google.code.findbugs:jsr305:3.0.2=checkstyle
com.google.collections:google-collections:1.0=checkstyle
com.google.errorprone:error_prone_annotations:2.18.0=checkstyle
com.google.guava:failureaccess:1.0.1=checkstyle
com.google.guava:guava:31.1-jre=checkstyle
com.google.guava:guava:32.0.1-jre=checkstyle
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle
com.google.j2objc:j2objc-annotations:1.3=checkstyle
com.puppycrawl.tools:checkstyle:10.12.0=checkstyle
com.google.j2objc:j2objc-annotations:2.8=checkstyle
com.puppycrawl.tools:checkstyle:10.12.3=checkstyle
commons-beanutils:commons-beanutils:1.9.4=checkstyle
commons-codec:commons-codec:1.15=checkstyle
commons-collections:commons-collections:3.2.2=checkstyle
info.picocli:picocli:4.7.3=checkstyle
net.bytebuddy:byte-buddy-agent:1.14.1=testCompileClasspath,testRuntimeClasspath
net.bytebuddy:byte-buddy:1.14.1=testCompileClasspath,testRuntimeClasspath
net.sf.saxon:Saxon-HE:12.2=checkstyle
info.picocli:picocli:4.7.4=checkstyle
net.bytebuddy:byte-buddy-agent:1.14.6=testCompileClasspath,testRuntimeClasspath
net.bytebuddy:byte-buddy:1.14.6=testCompileClasspath,testRuntimeClasspath
net.sf.saxon:Saxon-HE:12.3=checkstyle
org.antlr:antlr4-runtime:4.11.1=checkstyle
org.apache.commons:commons-lang3:3.8.1=checkstyle
org.apache.commons:commons-text:1.3=checkstyle
org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle
org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle
org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle
org.apache.httpcomponents:httpclient:4.5.13=checkstyle
org.apache.httpcomponents:httpcore:4.4.14=checkstyle
org.apache.maven.doxia:doxia-core:1.12.0=checkstyle
org.apache.maven.doxia:doxia-logging-api:1.12.0=checkstyle
org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle
org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle
org.apache.xbean:xbean-reflect:3.7=checkstyle
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
org.assertj:assertj-core:3.24.2=testCompileClasspath,testRuntimeClasspath
org.checkerframework:checker-qual:3.27.0=checkstyle
org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.600=compileClasspath
org.codehaus.plexus:plexus-classworlds:2.6.0=checkstyle
org.codehaus.plexus:plexus-component-annotations:2.1.0=checkstyle
org.codehaus.plexus:plexus-container-default:2.1.0=checkstyle
org.codehaus.plexus:plexus-utils:3.3.0=checkstyle
org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.700=compileClasspath,testCompileClasspath
org.jacoco:org.jacoco.agent:0.8.10=jacocoAgent,jacocoAnt
org.jacoco:org.jacoco.ant:0.8.10=jacocoAnt
org.jacoco:org.jacoco.core:0.8.10=jacocoAnt
org.jacoco:org.jacoco.report:0.8.10=jacocoAnt
org.javassist:javassist:3.28.0-GA=checkstyle
org.junit.jupiter:junit-jupiter-api:5.9.3=testCompileClasspath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter-engine:5.9.3=testRuntimeClasspath
org.junit.jupiter:junit-jupiter-params:5.9.3=testCompileClasspath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter:5.9.3=testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-commons:1.9.3=testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-engine:1.9.3=testRuntimeClasspath
org.junit.platform:junit-platform-launcher:1.9.3=testRuntimeClasspath
org.junit:junit-bom:5.9.3=testCompileClasspath,testRuntimeClasspath
org.mockito:mockito-core:5.2.0=testCompileClasspath,testRuntimeClasspath
org.mockito:mockito-inline:5.2.0=testCompileClasspath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter-engine:5.10.0=testRuntimeClasspath
org.junit.jupiter:junit-jupiter-params:5.10.0=testCompileClasspath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter:5.10.0=testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-commons:1.10.0=testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-engine:1.10.0=testRuntimeClasspath
org.junit.platform:junit-platform-launcher:1.10.0=testRuntimeClasspath
org.junit:junit-bom:5.10.0=testCompileClasspath,testRuntimeClasspath
org.mockito:mockito-core:5.5.0=testCompileClasspath,testRuntimeClasspath
org.objenesis:objenesis:3.3=testRuntimeClasspath
org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath
org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
org.ow2.asm:asm-commons:9.5=jacocoAnt
org.ow2.asm:asm-tree:9.5=jacocoAnt
org.ow2.asm:asm:9.5=jacocoAnt
org.reflections:reflections:0.10.2=checkstyle
org.sonarsource.java:sonar-java-plugin:7.20.0.31692=sonarlintPlugins
org.xmlresolver:xmlresolver:5.1.2=checkstyle
org.xmlresolver:xmlresolver:5.2.0=checkstyle
empty=annotationProcessor,runtimeClasspath,signatures,sonarlint,testAnnotationProcessor
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
8 changes: 6 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -130,10 +131,13 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"repository": "git@github.com:JoseLion/maybe.git",
"author": "JoseLion <joseluis5000l@gmail.com>",
"license": "MIT",
"packageManager": "yarn@3.3.1",
"packageManager": "yarn@3.6.3",
"scripts": {
"release": "semantic-release"
},
"devDependencies": {
"gradle-semantic-release-plugin": "^1.7.6",
"semantic-release": "^20.0.2"
"gradle-semantic-release-plugin": "^1.7.7",
"semantic-release": "^21.1.1"
}
}
4 changes: 4 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
plugins {
id('org.gradle.toolchains.foojay-resolver-convention') version '0.7.0'
}

rootProject.name = 'maybe'
Loading