From c51aac0fb9fa1c4bb0901c1a92020d2777ae11a4 Mon Sep 17 00:00:00 2001 From: Rob Marrowstone Date: Thu, 22 Aug 2024 09:10:08 -0700 Subject: [PATCH] Update Build Dependencies Tried to checkout and build, discovered how outdated the build dependencies were. Updated them. These match ion-java at time of commit. --- build.gradle | 27 ++++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index c15631c..b91801a 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { ext.ionVersion = "[1.2,)" - ext.kotlinVersion = "[1.2,1.6[" + ext.kotlinVersion = "[1.2,1.9]" ext.junitVersion = "[5.3,)" repositories { @@ -31,10 +31,10 @@ buildscript { plugins { id "java" id "checkstyle" - id "org.jetbrains.kotlin.jvm" version "1.4.10" + id "org.jetbrains.kotlin.jvm" version "1.9.0" // benchmark - id "me.champeau.gradle.jmh" version "0.4.8" + id "me.champeau.jmh" version "0.7.2" // Deployment id "maven-publish" @@ -60,16 +60,16 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { } dependencies { - compile "com.amazon.ion:ion-java:$ionVersion" + implementation "com.amazon.ion:ion-java:$ionVersion" // using kotlin to make tests less verbose - testCompile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" - testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion" + testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" + testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion" // JUnit 5 - testCompile "org.junit.jupiter:junit-jupiter-api:$junitVersion" - testCompile "org.junit.jupiter:junit-jupiter-params:$junitVersion" - testRuntime "org.junit.jupiter:junit-jupiter-engine:$junitVersion" + testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion" + testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion" } @@ -94,12 +94,11 @@ checkstyle { ignoreFailures = false maxWarnings = 0 maxErrors = 0 - configDir = file("$rootProject.projectDir/config/checkstyle") + configDirectory = file("$rootProject.projectDir/config/checkstyle") } tasks.withType(Checkstyle) { reports { - xml.enabled = false - html.enabled = true + html.required = true } } @@ -108,12 +107,12 @@ tasks.withType(Checkstyle) { task sourcesJar(type: Jar) { from "src" - classifier = "sources" + archiveClassifier = "sources" } task javadocJar(type: Jar) { from javadoc - classifier = "javadoc" + archiveClassifier = "javadoc" } publishing { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 285f167..b1c4fac 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip