diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..a4f170c
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index f587a3e..98b5537 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,5 +21,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 939314b..692822a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,6 +5,7 @@
+
diff --git a/README.md b/README.md
index 3ab8853..51b8757 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[](http://opensource.org/licenses/BSD-3-Clause) [](https://sonarcloud.io/dashboard?id=ethauvin_semver-gradle) [](https://travis-ci.org/ethauvin/semver-gradle) [](https://circleci.com/gh/ethauvin/semver-gradle/tree/master) [](https://plugins.gradle.org/plugin/net.thauvin.erik.gradle.semver)
+[](http://opensource.org/licenses/BSD-3-Clause) [](https://sonarcloud.io/dashboard?id=ethauvin_semver-gradle) [](https://travis-ci.com/ethauvin/semver-gradle) [](https://circleci.com/gh/ethauvin/semver-gradle/tree/master) [](https://plugins.gradle.org/plugin/net.thauvin.erik.gradle.semver)
# Semantic Version Plugin for Gradle
diff --git a/build.gradle.kts b/build.gradle.kts
index 7f3ab4f..49fa5a9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,23 +2,21 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
`java-gradle-plugin`
- `kotlin-dsl`
`maven-publish`
jacoco
- id("com.github.ben-manes.versions") version "0.28.0"
- id("com.gradle.plugin-publish") version "0.10.1"
- id("io.gitlab.arturbosch.detekt") version "1.6.0"
- id("org.jmailen.kotlinter") version "2.3.2"
- id("org.sonarqube") version "2.8"
- kotlin("jvm") version "1.3.61"
+ kotlin("jvm") version "1.3.72"
+ id("com.github.ben-manes.versions") version "0.29.0"
+ id("com.gradle.plugin-publish") version "0.12.0"
+ id("io.gitlab.arturbosch.detekt") version "1.10.0"
+ id("org.gradle.kotlin.kotlin-dsl") version "1.3.6"
+ id("org.sonarqube") version "3.0"
}
version = "1.0.4"
group = "net.thauvin.erik.gradle"
object VersionInfo {
- const val kotlin = "1.3.61"
- const val spek = "2.0.10"
+ const val spek = "2.0.12"
}
val versions: VersionInfo by extra { VersionInfo }
@@ -32,15 +30,15 @@ repositories {
dependencies {
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("org.spekframework.spek2:spek-dsl-jvm:${versions.spek}")
testRuntimeOnly("org.spekframework.spek2:spek-runner-junit5:${versions.spek}")
-
}
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 {
// input = files("src/main/kotlin", "src/test/kotlin")
// filters = ".*/resources/.*,.*/build/.*"
baseline = project.rootDir.resolve("detekt-baseline.xml")
}
-kotlinter {
- ignoreFailures = false
- reporters = arrayOf("html")
- experimentalRules = false
- disabledRules = arrayOf("import-ordering")
-}
-
sonarqube {
properties {
property("sonar.projectName", "semver-gradle")
diff --git a/detekt-baseline.xml b/detekt-baseline.xml
index 237d320..52cc674 100644
--- a/detekt-baseline.xml
+++ b/detekt-baseline.xml
@@ -1,12 +1,12 @@
-
-
+
+
MagicNumber:Utils.kt$Utils$3
MagicNumber:Utils.kt$Utils$4
MagicNumber:Utils.kt$Utils$5
- NestedBlockDepth:Utils.kt$Utils$loadProperties
- NestedBlockDepth:Utils.kt$Utils$parseSemVer
- NestedBlockDepth:Utils.kt$Utils$saveProperties
-
+ NestedBlockDepth:Utils.kt$Utils$fun loadProperties(file: File): Properties
+ NestedBlockDepth:Utils.kt$Utils$fun parseSemVer(input: String?, version: Version): Boolean
+ NestedBlockDepth:Utils.kt$Utils$fun saveProperties(projectDir: File, config: SemverConfig, version: Version)
+
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index f3d88b1..62d4c05 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a2bf131..bb8b2fc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
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
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 2fe81a7..fbd7c51 100755
--- a/gradlew
+++ b/gradlew
@@ -82,6 +82,7 @@ esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
diff --git a/gradlew.bat b/gradlew.bat
index 62bd9b9..5093609 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
@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%
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c10950f..e9b895f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,5 +1,5 @@
plugins {
- id("com.gradle.enterprise").version("3.1.1")
+ id("com.gradle.enterprise").version("3.3.4")
}
gradleEnterprise {