Skip to content

Commit ce84307

Browse files
committed
Migrate build to Gradle 9
- Replace johnrengelman shadow 8.1.1 with gradleup shadow 9.4.3 - Bump protobuf-gradle-plugin to 0.10.0 - Fix Task.project execution-time access; drop redundant imports - Pin Docker Gradle to 9.4.1
1 parent 0276deb commit ce84307

4 files changed

Lines changed: 11 additions & 24 deletions

File tree

‎bin/docker-setup.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ unzip -d /opt/maven maven.zip
1010
rm maven.zip
1111
mv /opt/maven/*/* /opt/maven
1212

13-
curl -fLo gradle.zip https://services.gradle.org/distributions/gradle-8.14.4-bin.zip
13+
curl -fLo gradle.zip https://services.gradle.org/distributions/gradle-9.4.1-bin.zip
1414
unzip -d /opt/gradle gradle.zip
1515
rm gradle.zip
1616
mv /opt/gradle/*/* /opt/gradle

‎build.gradle.kts‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,6 @@ import com.google.protobuf.gradle.ProtobufExtension
33
import com.google.protobuf.gradle.proto
44
import com.vanniktech.maven.publish.MavenPublishBaseExtension
55
import java.util.Properties
6-
import org.gradle.api.JavaVersion
7-
import org.gradle.api.distribution.DistributionContainer
8-
import org.gradle.api.plugins.JavaApplication
9-
import org.gradle.api.plugins.JavaPlugin
10-
import org.gradle.api.plugins.JavaPluginExtension
11-
import org.gradle.api.tasks.JavaExec
12-
import org.gradle.api.tasks.SourceSetContainer
13-
import org.gradle.api.tasks.Sync
14-
import org.gradle.api.tasks.compile.JavaCompile
15-
import org.gradle.api.tasks.javadoc.Javadoc
16-
import org.gradle.api.tasks.testing.Test
17-
import org.gradle.external.javadoc.StandardJavadocDocletOptions
18-
import org.gradle.jvm.tasks.Jar
19-
import org.gradle.language.jvm.tasks.ProcessResources
206
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
217
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
228

@@ -132,7 +118,7 @@ project(":scip-shared") {
132118

133119
project(":scip-javac") {
134120
apply(plugin = "java-library")
135-
apply(plugin = "com.github.johnrengelman.shadow")
121+
apply(plugin = "com.gradleup.shadow")
136122
description = "A javac plugin to emit SCIP information"
137123

138124
dependencies {
@@ -173,7 +159,7 @@ project(":scip-javac") {
173159
project(":scip-kotlinc") {
174160
apply(plugin = "java-library")
175161
apply(plugin = "org.jetbrains.kotlin.jvm")
176-
apply(plugin = "com.github.johnrengelman.shadow")
162+
apply(plugin = "com.gradleup.shadow")
177163
description = "A kotlinc plugin to emit SCIP information"
178164

179165
dependencies {
@@ -210,7 +196,7 @@ project(":scip-kotlinc") {
210196

211197
project(":scip-gradle-plugin") {
212198
apply(plugin = "java-library")
213-
apply(plugin = "com.github.johnrengelman.shadow")
199+
apply(plugin = "com.gradleup.shadow")
214200

215201
dependencies {
216202
"compileOnly"(catalog.gradle.api)
@@ -333,12 +319,13 @@ project(":scip-java") {
333319

334320
val generateDistributionVersion = tasks.register("generateDistributionVersion") {
335321
val output = layout.buildDirectory.file("generated/distribution/VERSION")
336-
inputs.property("version", project.version.toString())
322+
val version = project.version.toString()
323+
inputs.property("version", version)
337324
outputs.file(output)
338325
doLast {
339326
val file = output.get().asFile
340327
file.parentFile.mkdirs()
341-
file.writeText("version:=${project.version}\n")
328+
file.writeText("version:=$version\n")
342329
}
343330
}
344331

‎flake.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
bazelisk
3131
git
3232
google-java-format
33-
(gradle.override ({ java = jdk; }))
33+
(gradle_9.override ({ java = jdk; }))
3434
jdk
3535
jq
3636
ktfmt

‎gradle/libs.versions.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ maven-plugin-annotations = "3.6.4"
1212
maven-plugin-api = "3.6.3"
1313
maven-project = "2.2.1"
1414
protobuf = "4.34.2"
15-
protobuf-plugin = "0.9.4"
15+
protobuf-plugin = "0.10.0"
1616
scip-bindings = "0.8.0"
17-
shadow = "8.1.1"
17+
shadow = "9.4.3"
1818
vanniktech-maven-publish = "0.35.0"
1919

2020
[libraries]
@@ -46,5 +46,5 @@ scip-kotlin-bindings = { module = "org.scip-code:scip-kotlin-bindings", version.
4646
[plugins]
4747
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
4848
protobuf = { id = "com.google.protobuf", version.ref = "protobuf-plugin" }
49-
shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
49+
shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
5050
vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "vanniktech-maven-publish" }

0 commit comments

Comments
 (0)