Skip to content

Commit

Permalink
Update Gradle wrapper to 8.7
Browse files Browse the repository at this point in the history
  • Loading branch information
bestbeforetoday committed May 30, 2024
1 parent e9f033c commit 9590130
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
9 changes: 5 additions & 4 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
id("antlr")
id("com.google.protobuf") version "0.8.17"
id("com.diffplug.spotless") version "6.11.0"
id("com.github.johnrengelman.shadow") version "7.1.2"
id("com.github.johnrengelman.shadow") version "8.1.1"
signing
}

Expand Down Expand Up @@ -46,8 +46,8 @@ publishing {
repositories {
maven {
name = "local"
val releasesRepoUrl = "$buildDir/repos/releases"
val snapshotsRepoUrl = "$buildDir/repos/snapshots"
val releasesRepoUrl = layout.buildDirectory.dir("repos/releases")
val snapshotsRepoUrl = layout.buildDirectory.dir("repos/snapshots")
url = uri(if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
}
}
Expand Down Expand Up @@ -158,7 +158,8 @@ tasks.named<AntlrTask>("generateGrammarSource") {
arguments.add("-Werror")
arguments.add("-Xexact-output-dir")
setSource(fileTree("src/main/antlr/SubstraitType.g4"))
outputDirectory = File(buildDir, "generated/sources/antlr/main/java/io/substrait/type")
outputDirectory =
layout.buildDirectory.dir("generated/sources/antlr/main/java/io/substrait/type").get().asFile
}

protobuf { protoc { artifact = "com.google.protobuf:protoc:3.17.3" } }
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ protobuf.version=3.17.3
slf4j.version=2.0.13

#version that is going to be updated automatically by releases
version = 0.31.0
version = 0.32.0-SNAPSHOT

#signing
SIGNING_KEY_ID = 193EAE47
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion 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-7.4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions isthmus/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
id("java")
id("idea")
id("com.diffplug.spotless") version "6.11.0"
id("com.github.johnrengelman.shadow") version "7.1.2"
id("com.github.johnrengelman.shadow") version "8.1.1"
signing
}

Expand Down Expand Up @@ -42,8 +42,8 @@ publishing {
repositories {
maven {
name = "local"
val releasesRepoUrl = "$buildDir/repos/releases"
val snapshotsRepoUrl = "$buildDir/repos/snapshots"
val releasesRepoUrl = layout.buildDirectory.dir("repos/releases")
val snapshotsRepoUrl = layout.buildDirectory.dir("repos/snapshots")
url = uri(if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
}
}
Expand Down

0 comments on commit 9590130

Please sign in to comment.