erik/readingtime
erik/readingtime
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:42:28 -07:00
parent b1810846a5
commit b55e3a6956
4 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
build.gradle.kts
View file

@ -1,5 +1,6 @@
import org.jetbrains.dokka.gradle.DokkaTask import org.jetbrains.dokka.gradle.DokkaTask
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import java.io.FileInputStream import java.io.FileInputStream
import java.util.* import java.util.*
@ -9,6 +10,7 @@ plugins {
id("org.jetbrains.dokka") version "1.4.32" id("org.jetbrains.dokka") version "1.4.32"
id("org.jetbrains.kotlin.jvm") version "1.5.0" id("org.jetbrains.kotlin.jvm") version "1.5.0"
id("org.sonarqube") version "3.2.0" id("org.sonarqube") version "3.2.0"
java
`java-library` `java-library`
`maven-publish` `maven-publish`
jacoco jacoco
@ -31,6 +33,8 @@ repositories {
} }
dependencies { dependencies {
implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
implementation("org.jsoup:jsoup:1.13.1") implementation("org.jsoup:jsoup:1.13.1")
testImplementation("org.jetbrains.kotlin:kotlin-test") testImplementation("org.jetbrains.kotlin:kotlin-test")
@ -66,12 +70,18 @@ tasks {
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 {
@ -170,7 +180,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")

8
examples/build.gradle.kts
View file

@ -4,8 +4,8 @@ plugins {
application application
} }
// ./gradlew run --args="example.html" // ./gradlew run
// ./gradlew runJava --args="example.html" // ./gradlew runJava
repositories { repositories {
mavenLocal() mavenLocal()
@ -17,7 +17,7 @@ dependencies {
} }
application { application {
mainClassName = "com.example.ReadingTimeExampleKt" mainClass.set("com.example.ReadingTimeExampleKt")
} }
tasks { tasks {
@ -28,7 +28,7 @@ tasks {
register<JavaExec>("runJava") { register<JavaExec>("runJava") {
group = "application" group = "application"
main = "com.example.ReadingTimeSample" main = "com.example.ReadingTimeSample"
classpath = sourceSets["main"].runtimeClasspath classpath = sourceSets.main.get().runtimeClasspath
args = listOf("${project.projectDir}/example.html") args = listOf("${project.projectDir}/example.html")
} }
} }

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