Updated dependencies.

This commit is contained in:
Erik C. Thauvin 2020-07-20 06:09:35 -07:00
parent 68f42777af
commit e71f4f60ee
11 changed files with 39 additions and 39 deletions

10
.idea/compiler.xml generated Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel>
<module name="ap-examples-kotlin" target="1.8" />
<module name="ap-examples-kotlin.main" target="1.8" />
<module name="ap-examples-kotlin.test" target="1.8" />
</bytecodeTargetLevel>
</component>
</project>

View file

@ -21,5 +21,10 @@
<option name="name" value="BintrayJCenter" /> <option name="name" value="BintrayJCenter" />
<option name="url" value="https://jcenter.bintray.com/" /> <option name="url" value="https://jcenter.bintray.com/" />
</remote-repository> </remote-repository>
<remote-repository>
<option name="id" value="MavenLocal" />
<option name="name" value="MavenLocal" />
<option name="url" value="file:$MAVEN_REPOSITORY$/" />
</remote-repository>
</component> </component>
</project> </project>

1
.idea/misc.xml generated
View file

@ -5,6 +5,7 @@
<file type="web" url="file://$PROJECT_DIR$/examples/annotation-processor/java" /> <file type="web" url="file://$PROJECT_DIR$/examples/annotation-processor/java" />
<file type="web" url="file://$PROJECT_DIR$/examples/annotation-processor/kotlin" /> <file type="web" url="file://$PROJECT_DIR$/examples/annotation-processor/kotlin" />
<file type="web" url="file://$PROJECT_DIR$/examples/java" /> <file type="web" url="file://$PROJECT_DIR$/examples/java" />
<file type="web" url="file://$PROJECT_DIR$/examples/kotlin" />
</component> </component>
<component name="JavaScriptSettings"> <component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" /> <option name="languageLevel" value="ES6" />

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) [![Build Status](https://travis-ci.org/ethauvin/semver-gradle.svg?branch=master)](https://travis-ci.org/ethauvin/semver-gradle) [![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)](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) [![Build Status](https://travis-ci.com/ethauvin/semver-gradle.svg?branch=master)](https://travis-ci.com/ethauvin/semver-gradle) [![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

@ -2,23 +2,21 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
`java-gradle-plugin` `java-gradle-plugin`
`kotlin-dsl`
`maven-publish` `maven-publish`
jacoco jacoco
id("com.github.ben-manes.versions") version "0.28.0" kotlin("jvm") version "1.3.72"
id("com.gradle.plugin-publish") version "0.10.1" id("com.github.ben-manes.versions") version "0.29.0"
id("io.gitlab.arturbosch.detekt") version "1.6.0" id("com.gradle.plugin-publish") version "0.12.0"
id("org.jmailen.kotlinter") version "2.3.2" id("io.gitlab.arturbosch.detekt") version "1.10.0"
id("org.sonarqube") version "2.8" id("org.gradle.kotlin.kotlin-dsl") version "1.3.6"
kotlin("jvm") version "1.3.61" id("org.sonarqube") version "3.0"
} }
version = "1.0.4" version = "1.0.4"
group = "net.thauvin.erik.gradle" group = "net.thauvin.erik.gradle"
object VersionInfo { object VersionInfo {
const val kotlin = "1.3.61" const val spek = "2.0.12"
const val spek = "2.0.10"
} }
val versions: VersionInfo by extra { VersionInfo } val versions: VersionInfo by extra { VersionInfo }
@ -32,15 +30,15 @@ repositories {
dependencies { dependencies {
implementation(gradleApi()) implementation(gradleApi())
implementation(kotlin("stdlib-jdk8", version = versions.kotlin)) implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
implementation(kotlin("stdlib"))
testImplementation(kotlin("reflect"))
testImplementation(kotlin("test"))
testImplementation(kotlin("reflect", version = versions.kotlin))
testImplementation(kotlin("test", version = versions.kotlin))
testImplementation(gradleTestKit()) testImplementation(gradleTestKit())
testImplementation("org.spekframework.spek2:spek-dsl-jvm:${versions.spek}") testImplementation("org.spekframework.spek2:spek-dsl-jvm:${versions.spek}")
testRuntimeOnly("org.spekframework.spek2:spek-runner-junit5:${versions.spek}") testRuntimeOnly("org.spekframework.spek2:spek-runner-junit5:${versions.spek}")
} }
tasks { tasks {
@ -68,29 +66,12 @@ tasks {
} }
} }
buildScan {
link("GitHub", "https://github.com/ethauvin/semver-gradle/tree/master")
if ("true" == System.getenv("CI")) {
publishOnFailure()
tag("CI")
}
termsOfServiceUrl = "https://gradle.com/terms-of-service"
termsOfServiceAgree = "yes"
}
detekt { detekt {
// input = files("src/main/kotlin", "src/test/kotlin") // input = files("src/main/kotlin", "src/test/kotlin")
// filters = ".*/resources/.*,.*/build/.*" // filters = ".*/resources/.*,.*/build/.*"
baseline = project.rootDir.resolve("detekt-baseline.xml") baseline = project.rootDir.resolve("detekt-baseline.xml")
} }
kotlinter {
ignoreFailures = false
reporters = arrayOf("html")
experimentalRules = false
disabledRules = arrayOf("import-ordering")
}
sonarqube { sonarqube {
properties { properties {
property("sonar.projectName", "semver-gradle") property("sonar.projectName", "semver-gradle")

View file

@ -1,12 +1,12 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<SmellBaseline> <SmellBaseline>
<Blacklist></Blacklist> <ManuallySuppressedIssues></ManuallySuppressedIssues>
<Whitelist> <CurrentIssues>
<ID>MagicNumber:Utils.kt$Utils$3</ID> <ID>MagicNumber:Utils.kt$Utils$3</ID>
<ID>MagicNumber:Utils.kt$Utils$4</ID> <ID>MagicNumber:Utils.kt$Utils$4</ID>
<ID>MagicNumber:Utils.kt$Utils$5</ID> <ID>MagicNumber:Utils.kt$Utils$5</ID>
<ID>NestedBlockDepth:Utils.kt$Utils$loadProperties</ID> <ID>NestedBlockDepth:Utils.kt$Utils$fun loadProperties(file: File): Properties</ID>
<ID>NestedBlockDepth:Utils.kt$Utils$parseSemVer</ID> <ID>NestedBlockDepth:Utils.kt$Utils$fun parseSemVer(input: String?, version: Version): Boolean</ID>
<ID>NestedBlockDepth:Utils.kt$Utils$saveProperties</ID> <ID>NestedBlockDepth:Utils.kt$Utils$fun saveProperties(projectDir: File, config: SemverConfig, version: Version)</ID>
</Whitelist> </CurrentIssues>
</SmellBaseline> </SmellBaseline>

Binary file not shown.

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-6.2.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

2
gradlew vendored
View file

@ -82,6 +82,7 @@ esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM. # Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@ -129,6 +130,7 @@ fi
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"` APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"` JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath # We build the pattern for arguments to be converted via cygpath

1
gradlew.bat vendored
View file

@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle @rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

View file

@ -1,5 +1,5 @@
plugins { plugins {
id("com.gradle.enterprise").version("3.1.1") id("com.gradle.enterprise").version("3.3.4")
} }
gradleEnterprise { gradleEnterprise {