Updated dependencies

This commit is contained in:
Erik C. Thauvin 2022-10-01 10:16:47 -07:00
parent 86cc8b1519
commit bd315b4f0a
27 changed files with 84 additions and 68 deletions

View file

@ -30,11 +30,11 @@ defaults_gradle: &defaults_gradle
path: build/reports/ path: build/reports/
jobs: jobs:
build_gradle_jdk16: build_gradle_jdk17:
<<: *defaults <<: *defaults
docker: docker:
- image: cimg/openjdk:16.0 - image: cimg/openjdk:17.0
<<: *defaults_gradle <<: *defaults_gradle
@ -51,4 +51,4 @@ workflows:
gradle: gradle:
jobs: jobs:
- build_gradle_jdk8 - build_gradle_jdk8
- build_gradle_jdk16 - build_gradle_jdk17

View file

@ -12,7 +12,7 @@ jobs:
strategy: strategy:
matrix: matrix:
java-version: [ 1.8, 11, 16 ] java-version: [ 1.8, 11, 17 ]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

View file

@ -1,4 +1,4 @@
[![License (3-Clause BSD)](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square)](http://opensource.org/licenses/BSD-3-Clause) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=ethauvin_semver-gradle&metric=alert_status)](https://sonarcloud.io/dashboard?id=ethauvin_semver-gradle) [![GitHub CI](https://github.com/ethauvin/semver-gradle/actions/workflows/gradle.yml/badge.svg)](https://github.com/ethauvin/semver-gradle/actions/workflows/gradle.yml) [![CircleCI](https://circleci.com/gh/ethauvin/semver-gradle/tree/master.svg?style=shield)](https://circleci.com/gh/ethauvin/semver-gradle/tree/master) [![Gradle](https://img.shields.io/maven-metadata/v/https/plugins.gradle.org/m2/net/thauvin/erik/gradle/semver/maven-metadata.xml.svg?label=gradle&color=blue)](https://plugins.gradle.org/plugin/net.thauvin.erik.gradle.semver) [![License (3-Clause BSD)](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square)](https://opensource.org/licenses/BSD-3-Clause) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=ethauvin_semver-gradle&metric=alert_status)](https://sonarcloud.io/dashboard?id=ethauvin_semver-gradle) [![GitHub CI](https://github.com/ethauvin/semver-gradle/actions/workflows/gradle.yml/badge.svg)](https://github.com/ethauvin/semver-gradle/actions/workflows/gradle.yml) [![CircleCI](https://circleci.com/gh/ethauvin/semver-gradle/tree/master.svg?style=shield)](https://circleci.com/gh/ethauvin/semver-gradle/tree/master) [![Gradle](https://img.shields.io/maven-metadata/v/https/plugins.gradle.org/m2/net/thauvin/erik/gradle/semver/maven-metadata.xml.svg?label=gradle&color=blue)](https://plugins.gradle.org/plugin/net.thauvin.erik.gradle.semver)
# Semantic Version Plugin for Gradle # Semantic Version Plugin for Gradle

View file

@ -1,4 +1,4 @@
image: openjdk:8 image: maven:3-openjdk-18
pipelines: pipelines:
default: default:

View file

@ -3,16 +3,16 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import org.gradle.api.tasks.testing.logging.TestLogEvent import org.gradle.api.tasks.testing.logging.TestLogEvent
plugins { plugins {
id("com.github.ben-manes.versions") version "0.40.0" id("com.github.ben-manes.versions") version "0.42.0"
id("com.gradle.plugin-publish") version "0.19.0" id("com.gradle.plugin-publish") version "1.0.0"
id("io.gitlab.arturbosch.detekt") version "1.19.0" id("io.gitlab.arturbosch.detekt") version "1.21.0"
id("java-gradle-plugin") id("java-gradle-plugin")
id("java") id("java")
id("maven-publish") id("maven-publish")
id("org.gradle.kotlin.kotlin-dsl") version "2.1.7" id("org.gradle.kotlin.kotlin-dsl") version "2.3.3"
id("org.jetbrains.kotlinx.kover") version "0.4.4" id("org.jetbrains.kotlinx.kover") version "0.6.0"
id("org.sonarqube") version "3.3" id("org.sonarqube") version "3.4.0.2513"
// kotlin("jvm") version "1.4.31" // kotlin("jvm") version "1.6.21"
} }
version = "1.0.5" version = "1.0.5"
@ -32,7 +32,7 @@ dependencies {
implementation(platform(kotlin("bom"))) implementation(platform(kotlin("bom")))
implementation(kotlin("stdlib")) implementation(kotlin("stdlib"))
//testImplementation(gradleTestKit()) // testImplementation(gradleTestKit())
testImplementation(kotlin("test")) testImplementation(kotlin("test"))
testImplementation(kotlin("test-junit")) testImplementation(kotlin("test-junit"))
@ -66,7 +66,7 @@ tasks {
} }
detekt { detekt {
//toolVersion = "main-SNAPSHOT" // toolVersion = "main-SNAPSHOT"
baseline = project.rootDir.resolve("detekt-baseline.xml") baseline = project.rootDir.resolve("detekt-baseline.xml")
} }
@ -77,7 +77,7 @@ sonarqube {
property("sonar.organization", "ethauvin-github") property("sonar.organization", "ethauvin-github")
property("sonar.host.url", "https://sonarcloud.io") property("sonar.host.url", "https://sonarcloud.io")
property("sonar.sourceEncoding", "UTF-8") property("sonar.sourceEncoding", "UTF-8")
property("sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/kover/report.xml") property("sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/kover/xml/report.xml")
} }
} }
@ -96,8 +96,8 @@ pluginBundle {
website = github website = github
vcsUrl = github vcsUrl = github
tags = listOf("semver", "semantic", "version", "versioning", "auto-increment", "kotlin", "java") tags = listOf("semver", "semantic", "version", "versioning", "auto-increment", "kotlin", "java")
mavenCoordinates { // mavenCoordinates {
groupId = project.group.toString() // groupId = project.group.toString()
artifactId = project.name // artifactId = project.name
} // }
} }

View file

@ -2,11 +2,11 @@
<SmellBaseline> <SmellBaseline>
<ManuallySuppressedIssues></ManuallySuppressedIssues> <ManuallySuppressedIssues></ManuallySuppressedIssues>
<CurrentIssues> <CurrentIssues>
<ID>MagicNumber:Utils.kt$3</ID> <ID>MagicNumber:utils.kt$3</ID>
<ID>MagicNumber:Utils.kt$4</ID> <ID>MagicNumber:utils.kt$4</ID>
<ID>MagicNumber:Utils.kt$5</ID> <ID>MagicNumber:utils.kt$5</ID>
<ID>NestedBlockDepth:Utils.kt$fun File.loadProperties(): Properties</ID> <ID>NestedBlockDepth:utils.kt$fun File.loadProperties(): Properties</ID>
<ID>NestedBlockDepth:Utils.kt$fun parseSemVer(input: String?, version: Version): Boolean</ID> <ID>NestedBlockDepth:utils.kt$fun parseSemVer(input: String?, version: Version): Boolean</ID>
<ID>NestedBlockDepth:Utils.kt$fun saveProperties(projectDir: File, config: SemverConfig, version: Version)</ID> <ID>NestedBlockDepth:utils.kt$fun saveProperties(projectDir: File, config: SemverConfig, version: Version)</ID>
</CurrentIssues> </CurrentIssues>
</SmellBaseline> </SmellBaseline>

View file

@ -2,7 +2,7 @@ plugins {
id 'java' id 'java'
id 'application' id 'application'
id 'net.thauvin.erik.gradle.semver' version '1.0.4' id 'net.thauvin.erik.gradle.semver' version '1.0.4'
id 'com.github.ben-manes.versions' version '0.39.0' id 'com.github.ben-manes.versions' version '0.42.0'
} }
// ./gradlew // ./gradlew

View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View file

@ -205,6 +205,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \ org.gradle.wrapper.GradleWrapperMain \
"$@" "$@"
# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi
# Use "xargs" to parse quoted args. # Use "xargs" to parse quoted args.
# #
# With -n1 it outputs one arg per line, with the quotes and backslashes removed. # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

View file

@ -14,7 +14,7 @@
@rem limitations under the License. @rem limitations under the License.
@rem @rem
@if "%DEBUG%" == "" @echo off @if "%DEBUG%"=="" @echo off
@rem ########################################################################## @rem ##########################################################################
@rem @rem
@rem Gradle startup script for Windows @rem Gradle startup script for Windows
@ -25,7 +25,7 @@
if "%OS%"=="Windows_NT" setlocal if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0 set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=. if "%DIRNAME%"=="" set DIRNAME=.
set APP_BASE_NAME=%~n0 set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%
@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute if %ERRORLEVEL% equ 0 goto execute
echo. echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
:end :end
@rem End local scope for the variables with windows NT shell @rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd if %ERRORLEVEL% equ 0 goto mainEnd
:fail :fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code! rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 set EXIT_CODE=%ERRORLEVEL%
exit /b 1 if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd :mainEnd
if "%OS%"=="Windows_NT" endlocal if "%OS%"=="Windows_NT" endlocal

View file

@ -14,16 +14,16 @@ import java.util.Date;
*/ */
public final class GeneratedVersion { public final class GeneratedVersion {
public static final String PROJECT = "Java Example"; public static final String PROJECT = "Java Example";
public static final Date BUILDDATE = new Date(1620791725025L); public static final Date BUILDDATE = new Date(1651261557743L);
public static final int MAJOR = 2; public static final int MAJOR = 2;
public static final int MINOR = 10; public static final int MINOR = 11;
public static final int PATCH = 0; public static final int PATCH = 0;
public static final String PRERELEASE = ""; public static final String PRERELEASE = "";
public static final String PRERELEASE_PREFIX = "-"; public static final String PRERELEASE_PREFIX = "-";
public static final String BUILDMETA = ""; public static final String BUILDMETA = "";
public static final String BUILDMETA_PREFIX = "+"; public static final String BUILDMETA_PREFIX = "+";
public static final String SEPARATOR = "."; public static final String SEPARATOR = ".";
public static final String VERSION = "2.10.0"; public static final String VERSION = "2.11.0";
/** /**
* Disables the default constructor. * Disables the default constructor.

View file

@ -1,9 +1,9 @@
#Generated by the Semver Plugin for Gradle #Generated by the Semver Plugin for Gradle
#Wed Jul 24 21:06:09 PDT 2019 #Fri Apr 29 12:45:57 PDT 2022
version.buildmeta= version.buildmeta=
version.major=2 version.major=2
version.minor=10 version.minor=11
version.patch=0 version.patch=0
version.prerelease= version.prerelease=
version.project=Java Example version.project=Java Example
version.semver=2.10.0 version.semver=2.11.0

View file

@ -1,9 +1,9 @@
plugins { plugins {
id("application") id("application")
id("com.github.ben-manes.versions") version "0.39.0" id("com.github.ben-manes.versions") version "0.42.0"
id("net.thauvin.erik.gradle.semver") version "1.0.4" id("net.thauvin.erik.gradle.semver") version "1.0.4"
kotlin("jvm") version "1.5.30" kotlin("jvm") version "1.7.20"
kotlin("kapt") version "1.5.30" kotlin("kapt") version "1.7.20"
} }
// ./gradlew // ./gradlew

View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View file

@ -205,6 +205,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \ org.gradle.wrapper.GradleWrapperMain \
"$@" "$@"
# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi
# Use "xargs" to parse quoted args. # Use "xargs" to parse quoted args.
# #
# With -n1 it outputs one arg per line, with the quotes and backslashes removed. # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

View file

@ -14,7 +14,7 @@
@rem limitations under the License. @rem limitations under the License.
@rem @rem
@if "%DEBUG%" == "" @echo off @if "%DEBUG%"=="" @echo off
@rem ########################################################################## @rem ##########################################################################
@rem @rem
@rem Gradle startup script for Windows @rem Gradle startup script for Windows
@ -25,7 +25,7 @@
if "%OS%"=="Windows_NT" setlocal if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0 set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=. if "%DIRNAME%"=="" set DIRNAME=.
set APP_BASE_NAME=%~n0 set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%
@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute if %ERRORLEVEL% equ 0 goto execute
echo. echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
:end :end
@rem End local scope for the variables with windows NT shell @rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd if %ERRORLEVEL% equ 0 goto mainEnd
:fail :fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code! rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 set EXIT_CODE=%ERRORLEVEL%
exit /b 1 if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd :mainEnd
if "%OS%"=="Windows_NT" endlocal if "%OS%"=="Windows_NT" endlocal

View file

@ -1,9 +1,9 @@
#Generated by the Semver Plugin for Gradle #Generated by the Semver Plugin for Gradle
#Wed Jul 24 21:06:46 PDT 2019 #Fri Apr 29 12:46:38 PDT 2022
version.buildmeta= version.buildmeta=
version.major=14 version.major=14
version.minor=3 version.minor=4
version.patch=0 version.patch=0
version.prerelease= version.prerelease=
version.project=Kotlin Example version.project=Kotlin Example
version.semver=14.3.0 version.semver=14.4.0

View file

@ -2,7 +2,7 @@ plugins {
id 'java' id 'java'
id 'application' id 'application'
id 'net.thauvin.erik.gradle.semver' version '1.0.4' id 'net.thauvin.erik.gradle.semver' version '1.0.4'
id 'com.github.ben-manes.versions' version '0.40.0' id 'com.github.ben-manes.versions' version '0.42.0'
} }
// ./gradlew // ./gradlew
@ -17,7 +17,7 @@ defaultTasks 'run'
mainClassName = 'App' mainClassName = 'App'
dependencies { dependencies {
testImplementation platform('org.junit:junit-bom:5.8.0-RC1') testImplementation platform('org.junit:junit-bom:5.9.1')
testImplementation 'org.junit.jupiter:junit-jupiter' testImplementation 'org.junit.jupiter:junit-jupiter'
} }

View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View file

@ -1,8 +1,8 @@
#Generated by the Semver Plugin for Gradle #Generated by the Semver Plugin for Gradle
#Fri Sep 25 17:38:33 PDT 2020 #Fri Apr 29 12:45:29 PDT 2022
version.buildmeta=20200925173833 version.buildmeta=20220429124529
version.major=1 version.major=1
version.minor=0 version.minor=0
version.patch=0 version.patch=0
version.prerelease= version.prerelease=
version.semver=1.0.0+20200925173833 version.semver=1.0.0+20220429124529

View file

@ -5,9 +5,9 @@ import java.time.format.DateTimeFormatter
plugins { plugins {
id("application") id("application")
id("com.github.ben-manes.versions") version "0.40.0" id("com.github.ben-manes.versions") version "0.42.0"
id("net.thauvin.erik.gradle.semver") version "1.0.4" id("net.thauvin.erik.gradle.semver") version "1.0.4"
kotlin("jvm") version "1.6.10" kotlin("jvm") version "1.7.20"
} }
// ./gradlew // ./gradlew
@ -20,7 +20,7 @@ defaultTasks(ApplicationPlugin.TASK_RUN_NAME)
dependencies { dependencies {
implementation(kotlin("stdlib")) implementation(kotlin("stdlib"))
testImplementation("org.testng:testng:7.4.0") testImplementation("org.testng:testng:7.6.1")
} }
repositories { repositories {

View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View file

@ -1,8 +1,8 @@
#Generated by the Semver Plugin for Gradle #Generated by the Semver Plugin for Gradle
#Mon Nov 09 21:24:16 PST 2020 #Fri Apr 29 12:45:44 PDT 2022
version.buildmeta=20201109212416 version.buildmeta=20220429124544
version.major=1 version.major=1
version.minor=2 version.minor=2
version.patch=4 version.patch=4
version.prerelease=beta version.prerelease=beta
version.semver=1.2.4-beta+20201109212416 version.semver=1.2.4-beta+20220429124544

View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists