Skip to content

Commit

Permalink
Update Gradle.
Browse files Browse the repository at this point in the history
  • Loading branch information
teo-tsirpanis authored and jdblischak committed Nov 20, 2024
1 parent 3c1a6a6 commit 53a8e98
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 9 deletions.
22 changes: 14 additions & 8 deletions apis/java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 = { ->
Expand All @@ -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 {
Expand All @@ -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 {
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion apis/java/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 53a8e98

Please sign in to comment.