Updated dependencies.
This commit is contained in:
parent
ebc5b66fac
commit
17b5ceaaf6
10 changed files with 56 additions and 36 deletions
5
.idea/codeStyles/codeStyleConfig.xml
generated
Normal file
5
.idea/codeStyles/codeStyleConfig.xml
generated
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
<component name="ProjectCodeStyleConfiguration">
|
||||||
|
<state>
|
||||||
|
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Erik's Code Style" />
|
||||||
|
</state>
|
||||||
|
</component>
|
|
@ -8,18 +8,22 @@ plugins {
|
||||||
id("com.github.ben-manes.versions") version "0.21.0"
|
id("com.github.ben-manes.versions") version "0.21.0"
|
||||||
id("com.gradle.build-scan") version "2.3"
|
id("com.gradle.build-scan") version "2.3"
|
||||||
id("com.gradle.plugin-publish") version "0.10.1"
|
id("com.gradle.plugin-publish") version "0.10.1"
|
||||||
id("io.gitlab.arturbosch.detekt") version "1.0.0-RC14"
|
id("io.gitlab.arturbosch.detekt") version "1.0.0-RC14" // don't update until kotlin 1.3.401 is supported by Gradle
|
||||||
id("org.jmailen.kotlinter") version "1.25.2"
|
id("org.jmailen.kotlinter") version "1.26.0" // don't update until kotlin 1.3.41 supported by Gradle
|
||||||
id("org.sonarqube") version "2.7.1"
|
id("org.sonarqube") version "2.7.1"
|
||||||
|
kotlin("jvm") version "1.3.31"
|
||||||
}
|
}
|
||||||
|
|
||||||
version = "1.0.2"
|
version = "1.0.3-beta"
|
||||||
group = "net.thauvin.erik.gradle"
|
group = "net.thauvin.erik.gradle"
|
||||||
|
|
||||||
var github = "https://github.com/ethauvin/semver-gradle"
|
var github = "https://github.com/ethauvin/semver-gradle"
|
||||||
var packageName = "net.thauvin.erik.gradle.semver"
|
var packageName = "net.thauvin.erik.gradle.semver"
|
||||||
|
|
||||||
var spek_version = "2.0.5"
|
object Versions {
|
||||||
|
const val kotlin = "1.3.31"
|
||||||
|
const val spek = "2.0.5"
|
||||||
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
jcenter()
|
jcenter()
|
||||||
|
@ -28,12 +32,13 @@ repositories {
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation(gradleApi())
|
implementation(gradleApi())
|
||||||
|
|
||||||
testImplementation(kotlin("reflect"))
|
testImplementation(kotlin("reflect", version = Versions.kotlin))
|
||||||
testImplementation(kotlin("test"))
|
testImplementation(kotlin("test", version = Versions.kotlin))
|
||||||
testImplementation(gradleTestKit())
|
testImplementation(gradleTestKit())
|
||||||
|
|
||||||
testImplementation("org.spekframework.spek2:spek-dsl-jvm:$spek_version")
|
testImplementation("org.spekframework.spek2:spek-dsl-jvm:${Versions.spek}")
|
||||||
testRuntimeOnly("org.spekframework.spek2:spek-runner-junit5:$spek_version")
|
testRuntimeOnly("org.spekframework.spek2:spek-runner-junit5:${Versions.spek}")
|
||||||
|
implementation(kotlin("stdlib-jdk8", version = Versions.kotlin))
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
|
@ -81,6 +86,7 @@ kotlinter {
|
||||||
ignoreFailures = false
|
ignoreFailures = false
|
||||||
reporters = arrayOf("html")
|
reporters = arrayOf("html")
|
||||||
experimentalRules = false
|
experimentalRules = false
|
||||||
|
//disabledRules = arrayOf("import-ordering")
|
||||||
}
|
}
|
||||||
|
|
||||||
sonarqube {
|
sonarqube {
|
||||||
|
@ -111,3 +117,11 @@ pluginBundle {
|
||||||
artifactId = project.name
|
artifactId = project.name
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
val compileKotlin: KotlinCompile by tasks
|
||||||
|
compileKotlin.kotlinOptions {
|
||||||
|
jvmTarget = "1.8"
|
||||||
|
}
|
||||||
|
val compileTestKotlin: KotlinCompile by tasks
|
||||||
|
compileTestKotlin.kotlinOptions {
|
||||||
|
jvmTarget = "1.8"
|
||||||
|
}
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
* This file is automatically generated.
|
* This file is automatically generated.
|
||||||
* Do not modify! -- ALL CHANGES WILL BE ERASED!
|
* Do not modify! -- ALL CHANGES WILL BE ERASED!
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.example;
|
package com.example;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
@ -12,17 +13,17 @@ import java.util.Date;
|
||||||
* @author <a href="https://github.com/ethauvin/semver">Semantic Version Annotation Processor</a>
|
* @author <a href="https://github.com/ethauvin/semver">Semantic Version Annotation Processor</a>
|
||||||
*/
|
*/
|
||||||
public final class GeneratedVersion {
|
public final class GeneratedVersion {
|
||||||
public final static String PROJECT = "Java Example";
|
public static final String PROJECT = "Java Example";
|
||||||
public final static Date BUILDDATE = new Date(1556062927242L);
|
public static final Date BUILDDATE = new Date(1564027571537L);
|
||||||
public final static int MAJOR = 2;
|
public static final int MAJOR = 2;
|
||||||
public final static int MINOR = 9;
|
public static final int MINOR = 10;
|
||||||
public final static int PATCH = 0;
|
public static final int PATCH = 0;
|
||||||
public final static String PRERELEASE = "";
|
public static final String PRERELEASE = "";
|
||||||
public final static String PRERELEASE_PREFIX = "-";
|
public static final String PRERELEASE_PREFIX = "-";
|
||||||
public final static String BUILDMETA = "";
|
public static final String BUILDMETA = "";
|
||||||
public final static String BUILDMETA_PREFIX = "+";
|
public static final String BUILDMETA_PREFIX = "+";
|
||||||
public final static String SEPARATOR = ".";
|
public static final String SEPARATOR = ".";
|
||||||
public final static String VERSION = "2.9.0";
|
public static final String VERSION = "2.10.0";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Disables the default constructor.
|
* Disables the default constructor.
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
#Generated by the Semver Plugin for Gradle
|
#Generated by the Semver Plugin for Gradle
|
||||||
#Tue Apr 23 16:42:04 PDT 2019
|
#Wed Jul 24 21:06:09 PDT 2019
|
||||||
version.buildmeta=
|
version.buildmeta=
|
||||||
version.major=2
|
version.major=2
|
||||||
version.minor=9
|
version.minor=10
|
||||||
version.patch=0
|
version.patch=0
|
||||||
version.prerelease=
|
version.prerelease=
|
||||||
version.project=Java Example
|
version.project=Java Example
|
||||||
version.semver=2.9.0
|
version.semver=2.10.0
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm").version("1.3.30")
|
kotlin("jvm").version("1.3.41")
|
||||||
application
|
application
|
||||||
id("org.jetbrains.kotlin.kapt").version("1.3.31")
|
id("org.jetbrains.kotlin.kapt").version("1.3.41")
|
||||||
id("net.thauvin.erik.gradle.semver").version("1.0.2")
|
id("net.thauvin.erik.gradle.semver").version("1.0.2")
|
||||||
id("com.github.ben-manes.versions").version("0.21.0")
|
id("com.github.ben-manes.versions").version("0.21.0")
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
#Generated by the Semver Plugin for Gradle
|
#Generated by the Semver Plugin for Gradle
|
||||||
#Tue Apr 23 16:42:52 PDT 2019
|
#Wed Jul 24 21:06:46 PDT 2019
|
||||||
version.buildmeta=
|
version.buildmeta=
|
||||||
version.major=14
|
version.major=14
|
||||||
version.minor=2
|
version.minor=3
|
||||||
version.patch=0
|
version.patch=0
|
||||||
version.prerelease=
|
version.prerelease=
|
||||||
version.project=Kotlin Example
|
version.project=Kotlin Example
|
||||||
version.semver=14.2.0
|
version.semver=14.3.0
|
||||||
|
|
|
@ -16,8 +16,8 @@ mainClassName = 'App'
|
||||||
defaultTasks 'run'
|
defaultTasks 'run'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.0-M1'
|
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1'
|
||||||
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.0-M1'
|
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1'
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
#Generated by the Semver Plugin for Gradle
|
#Generated by the Semver Plugin for Gradle
|
||||||
#Fri May 24 07:51:21 PDT 2019
|
#Wed Jul 24 21:04:08 PDT 2019
|
||||||
version.buildmeta=
|
version.buildmeta=20190724210408
|
||||||
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
|
version.semver=1.0.0+20190724210408
|
||||||
|
|
|
@ -4,7 +4,7 @@ import java.time.LocalDateTime
|
||||||
import java.time.format.DateTimeFormatter
|
import java.time.format.DateTimeFormatter
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm").version("1.3.31")
|
kotlin("jvm").version("1.3.41")
|
||||||
application
|
application
|
||||||
id("net.thauvin.erik.gradle.semver").version("1.0.2")
|
id("net.thauvin.erik.gradle.semver").version("1.0.2")
|
||||||
id("com.github.ben-manes.versions").version("0.21.0")
|
id("com.github.ben-manes.versions").version("0.21.0")
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
#Generated by the Semver Plugin for Gradle
|
#Generated by the Semver Plugin for Gradle
|
||||||
#Fri May 24 01:12:52 PDT 2019
|
#Wed Jul 24 21:05:40 PDT 2019
|
||||||
version.buildmeta=20190524011252
|
version.buildmeta=20190724210540
|
||||||
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+20190524011252
|
version.semver=1.2.4-beta+20190724210540
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue