From 8914f05e31bd01251e1d0e887373897be8c25fe8 Mon Sep 17 00:00:00 2001 From: Theodore Tsirpanis Date: Mon, 21 Oct 2024 23:52:24 +0300 Subject: [PATCH] Update Gradle. --- apis/java/build.gradle | 22 ++++++++++++------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/apis/java/build.gradle b/apis/java/build.gradle index 78c9fada5..3e9bbea9b 100644 --- a/apis/java/build.gradle +++ b/apis/java/build.gradle @@ -2,8 +2,8 @@ plugins { id 'java' id 'idea' id 'maven-publish' - id 'com.github.sherter.google-java-format' version '0.8' - id 'com.github.johnrengelman.shadow' version '4.0.3' + id 'com.github.sherter.google-java-format' version '0.9' + id 'com.github.johnrengelman.shadow' version '8.1.1' } ext.getVersionName = { -> @@ -29,8 +29,10 @@ ext.getVersionName = { -> group 'io.tiledb' version getVersionName() -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 +} sourceSets { main { @@ -51,9 +53,9 @@ repositories { dependencies { // https://mvnrepository.com/artifact/commons-io/commons-io - compile group: 'commons-io', name: 'commons-io', version: '2.6' + implementation group: 'commons-io', name: 'commons-io', version: '2.17.0' - testCompile group: 'junit', name: 'junit', version: '4.12' + testImplementation group: 'junit', name: 'junit', version: '4.12' } test { @@ -106,6 +108,10 @@ shadowJar { import com.github.sherter.googlejavaformatgradleplugin.GoogleJavaFormat import com.github.sherter.googlejavaformatgradleplugin.VerifyGoogleJavaFormat +googleJavaFormat { + toolVersion = '1.7' +} + task format(type: GoogleJavaFormat) { source = sourceSets*.allJava include '**/*.java' @@ -206,12 +212,12 @@ assemble { } task sourceJar(type: Jar) { - classifier "sources" + archiveClassifier.set("sources") from sourceSets.main.allJava } task javadocJar(type: Jar, dependsOn: javadoc) { - classifier "javadoc" + archiveClassifier.set("javadoc") from javadoc.destinationDir } diff --git a/apis/java/gradle/wrapper/gradle-wrapper.properties b/apis/java/gradle/wrapper/gradle-wrapper.properties index 6c9a22477..1e2fbf0d4 100644 --- a/apis/java/gradle/wrapper/gradle-wrapper.properties +++ b/apis/java/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists