erik/isgd-shorten
erik/isgd-shorten
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:40:20 -07:00
parent ccfe179a2e
commit c4d10acfbc
4 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
build.gradle.kts
View file

@ -1,7 +1,9 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
plugins { plugins {
jacoco jacoco
java
`java-library` `java-library`
`maven-publish` `maven-publish`
signing signing
@ -32,6 +34,8 @@ repositories {
} }
dependencies { dependencies {
implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
testImplementation("org.jetbrains.kotlin:kotlin-test") testImplementation("org.jetbrains.kotlin:kotlin-test")
testImplementation("org.jetbrains.kotlin:kotlin-test-junit") testImplementation("org.jetbrains.kotlin:kotlin-test-junit")
} }
@ -69,17 +73,22 @@ val javadocJar by tasks.creating(Jar::class) {
} }
tasks { tasks {
withType<KotlinCompile>().configureEach { withType<KotlinCompile>().configureEach {
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
} }
withType<Test> {
testLogging {
exceptionFormat = TestExceptionFormat.FULL
}
}
withType<GenerateMavenPom> { withType<GenerateMavenPom> {
destination = file("$projectDir/pom.xml") destination = file("$projectDir/pom.xml")
} }
jacoco { jacoco {
toolVersion = "0.8.7-SNAPSHOT" toolVersion = "0.8.7"
} }
jacocoTestReport { jacocoTestReport {
@ -169,7 +178,7 @@ publishing {
scm { scm {
connection.set("scm:git:git://github.com/$gitHub.git") connection.set("scm:git:git://github.com/$gitHub.git")
developerConnection.set("scm:git:git@github.com:$gitHub.git") developerConnection.set("scm:git:git@github.com:$gitHub.git")
url.set("$mavenUrl") url.set(mavenUrl)
} }
issueManagement { issueManagement {
system.set("GitHub") system.set("GitHub")

4
examples/build.gradle.kts
View file

@ -17,13 +17,13 @@ dependencies {
} }
application { application {
mainClassName = "com.example.IsgdExampleKt" mainClass.set("com.example.IsgdExampleKt")
} }
tasks { tasks {
register("runJava", JavaExec::class) { register("runJava", JavaExec::class) {
group = "application" group = "application"
main = "com.example.IsgdSample" main = "com.example.IsgdSample"
classpath = sourceSets["main"].runtimeClasspath classpath = sourceSets.main.get().runtimeClasspath
} }
} }

2
examples/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