erik/semver-gradle
erik/semver-gradle
1
1
Fork 0
Code Issues Pull requests Releases Activity

Upgraded to Gradle 7.0.1

Browse source
This commit is contained in:
Erik C. Thauvin 2021-05-11 20:57:34 -07:00
parent bcf95bc6f0
commit f4b1caa986
10 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
build.gradle.kts
View file

@ -1,10 +1,12 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
plugins { plugins {
java
`java-gradle-plugin` `java-gradle-plugin`
`maven-publish` `maven-publish`
jacoco jacoco
kotlin("jvm") version "1.4.31" kotlin("jvm") version "1.4.31" // Don't upgrade until kotlin-dsl plugin is upgraded.
id("com.github.ben-manes.versions") version "0.38.0" id("com.github.ben-manes.versions") version "0.38.0"
id("com.gradle.plugin-publish") version "0.14.0" id("com.gradle.plugin-publish") version "0.14.0"
id("io.gitlab.arturbosch.detekt") version "1.16.0" id("io.gitlab.arturbosch.detekt") version "1.16.0"
@ -16,7 +18,7 @@ version = "1.0.5"
group = "net.thauvin.erik.gradle" group = "net.thauvin.erik.gradle"
object VersionInfo { object VersionInfo {
const val spek = "2.0.15" const val spek = "2.0.15" // Don't upgrade until 2.0.17
} }
val versions: VersionInfo by extra { VersionInfo } val versions: VersionInfo by extra { VersionInfo }
@ -33,10 +35,11 @@ dependencies {
implementation(platform("org.jetbrains.kotlin:kotlin-bom")) implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
implementation(kotlin("stdlib")) implementation(kotlin("stdlib"))
testImplementation(kotlin("reflect")) testImplementation(kotlin("reflect"))
testImplementation(kotlin("test")) testImplementation(kotlin("test"))
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}")
@ -50,13 +53,17 @@ tasks {
} }
withType<Test> { withType<Test> {
testLogging {
exceptionFormat = TestExceptionFormat.FULL
}
useJUnitPlatform { useJUnitPlatform {
includeEngines("spek2") includeEngines("spek2")
} }
} }
jacoco { jacoco {
toolVersion = "0.8.7-SNAPSHOT" toolVersion = "0.8.7"
} }
jacocoTestReport { jacocoTestReport {

1
examples/annotation-processor/java/build.gradle
View file

@ -28,6 +28,7 @@ tasks.withType(JavaCompile) {
repositories { repositories {
mavenLocal() mavenLocal()
mavenCentral()
} }
run { run {

2
examples/annotation-processor/java/gradle/wrapper/gradle-wrapper.properties vendored
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.0-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

2
examples/annotation-processor/java/src/generated/java/com/example/GeneratedVersion.java
View file

@ -14,7 +14,7 @@ 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(1619649806553L); public static final Date BUILDDATE = new Date(1620791725025L);
public static final int MAJOR = 2; public static final int MAJOR = 2;
public static final int MINOR = 10; public static final int MINOR = 10;
public static final int PATCH = 0; public static final int PATCH = 0;

2
examples/annotation-processor/kotlin/build.gradle.kts
View file

@ -28,7 +28,7 @@ repositories {
} }
application { application {
mainClassName = "com.example.Main" mainClass.set("com.example.Main")
} }
kapt { kapt {

2
examples/annotation-processor/kotlin/gradle/wrapper/gradle-wrapper.properties vendored
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.0-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

2
examples/java/gradle/wrapper/gradle-wrapper.properties vendored
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.0-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

2
examples/kotlin/build.gradle.kts
View file

@ -28,7 +28,7 @@ repositories {
} }
application { application {
mainClassName = "com.example.MainKt" mainClass.set("com.example.MainKt")
// project.afterEvaluate { // project.afterEvaluate {
// println("Version: $version") // println("Version: $version")
// } // }

2
examples/kotlin/gradle/wrapper/gradle-wrapper.properties vendored
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.0-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

2
gradle/wrapper/gradle-wrapper.properties vendored
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.0-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists