Upgraded to Kotlin 1.5.31 and JDK 17.

This commit is contained in:
Erik C. Thauvin 2021-10-01 22:55:54 -07:00
parent 0a0469c5e0
commit 79689f4932
5 changed files with 16 additions and 11 deletions

View file

@ -30,11 +30,11 @@ defaults_gradle: &defaults_gradle
path: build/reports/ path: build/reports/
jobs: jobs:
build_gradle_jdk16: build_gradle_jdk17:
<<: *defaults <<: *defaults
docker: docker:
- image: cimg/openjdk:16.0 - image: cimg/openjdk:17.0
<<: *defaults_gradle <<: *defaults_gradle
@ -51,4 +51,4 @@ workflows:
gradle: gradle:
jobs: jobs:
- build_gradle_jdk8 - build_gradle_jdk8
- build_gradle_jdk16 - build_gradle_jdk17

View file

@ -12,7 +12,7 @@ jobs:
strategy: strategy:
matrix: matrix:
java-version: [ 1.8, 11, 16 ] java-version: [ 1.8, 11, 17 ]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

View file

@ -5,15 +5,15 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
plugins { plugins {
id("com.github.ben-manes.versions") version "0.39.0" id("com.github.ben-manes.versions") version "0.39.0"
id("io.gitlab.arturbosch.detekt") version "1.18.0" id("io.gitlab.arturbosch.detekt") version "1.18.1"
id("jacoco") id("jacoco")
id("java") id("java")
id("java-library") id("java-library")
id("maven-publish") id("maven-publish")
id("org.jetbrains.dokka") version "1.5.0" id("org.jetbrains.dokka") version "1.5.30"
id("org.sonarqube") version "3.3" id("org.sonarqube") version "3.3"
id("signing") id("signing")
kotlin("jvm") version "1.5.30" kotlin("jvm") version "1.5.31"
} }
description = "Estimated Reading Time for Blog Posts, Articles, etc." description = "Estimated Reading Time for Blog Posts, Articles, etc."

View file

@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
id("application") id("application")
id("com.github.ben-manes.versions") version "0.39.0" id("com.github.ben-manes.versions") version "0.39.0"
kotlin("jvm") version "1.5.30" kotlin("jvm") version "1.5.31"
} }
// ./gradlew run // ./gradlew run
@ -18,6 +18,11 @@ dependencies {
implementation("net.thauvin.erik:readingtime:0.9.1-SNAPSHOT") implementation("net.thauvin.erik:readingtime:0.9.1-SNAPSHOT")
} }
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
application { application {
mainClass.set("com.example.ReadingTimeExampleKt") mainClass.set("com.example.ReadingTimeExampleKt")
} }

View file

@ -40,7 +40,7 @@
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-bom</artifactId> <artifactId>kotlin-bom</artifactId>
<version>1.5.20</version> <version>1.5.31</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
@ -50,13 +50,13 @@
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId> <artifactId>kotlin-stdlib-jdk8</artifactId>
<version>1.5.20</version> <version>1.5.31</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jsoup</groupId> <groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId> <artifactId>jsoup</artifactId>
<version>1.14.1</version> <version>1.14.2</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
</dependencies> </dependencies>