Skip to content

Commit c7c7d28

Browse files
authored
Update to gradle 8.5 (#182)
1 parent 4a7acf0 commit c7c7d28

5 files changed

Lines changed: 38 additions & 29 deletions

File tree

ToolchainPlugin/build.gradle

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,13 @@ tasks.withType(Test).configureEach {
3232
useJUnitPlatform()
3333
}
3434

35-
archivesBaseName = "Toolchain"
36-
37-
sourceCompatibility = 11
38-
targetCompatibility = 11
35+
base {
36+
archivesName = "Toolchain"
37+
}
3938

40-
pluginBundle {
41-
website = 'https://github.com/wpilibsuite/native-utils'
42-
vcsUrl = 'https://github.com/wpilibsuite/native-utils'
43-
description = 'FRC Toolchain Standalone Gradle Plugin'
44-
tags = ['frc', 'wpilib', 'gradlerio']
39+
java {
40+
sourceCompatibility = 11
41+
targetCompatibility = 11
4542
}
4643

4744
if (project.hasProperty('RunToolchainTests')) {
@@ -51,11 +48,15 @@ if (project.hasProperty('RunToolchainTests')) {
5148
}
5249

5350
gradlePlugin {
51+
website = 'https://github.com/wpilibsuite/native-utils'
52+
vcsUrl = 'https://github.com/wpilibsuite/native-utils'
5453
plugins {
5554
toolchain {
5655
id = 'edu.wpi.first.Toolchain'
5756
displayName = 'Toolchain'
5857
implementationClass = 'edu.wpi.first.toolchain.ToolchainPlugin'
58+
description = 'FRC Toolchain Standalone Gradle Plugin'
59+
tags = ['frc', 'wpilib', 'gradlerio']
5960
}
6061
}
6162
}

build.gradle

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
plugins {
2-
id "com.gradle.plugin-publish" version "0.15.0"
2+
id "com.gradle.plugin-publish" version "1.2.1"
33
id 'java-gradle-plugin'
44
id 'maven-publish'
55
id 'groovy'
66
id 'java'
7-
id 'idea'
87
}
98

10-
sourceCompatibility = 11
11-
targetCompatibility = 11
9+
java {
10+
sourceCompatibility = 11
11+
targetCompatibility = 11
12+
}
1213

1314
allprojects {
1415
group = "edu.wpi.first"
@@ -48,19 +49,16 @@ tasks.withType(JavaCompile) {
4849
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
4950
}
5051

51-
pluginBundle {
52+
gradlePlugin {
5253
website = 'https://github.com/wpilibsuite/native-utils'
5354
vcsUrl = 'https://github.com/wpilibsuite/native-utils'
54-
description = 'This plugin provides native build utilities for FRC projects.'
55-
tags = ['groovy', 'native', 'utils', 'maven', 'frc', 'wpilib']
56-
}
57-
58-
gradlePlugin {
5955
plugins {
6056
NativeUtils {
6157
id = 'edu.wpi.first.NativeUtils'
6258
displayName = 'NativeUtils'
6359
implementationClass = 'edu.wpi.first.nativeutils.NativeUtils'
60+
description = 'This plugin provides native build utilities for FRC projects.'
61+
tags = ['groovy', 'native', 'utils', 'maven', 'frc', 'wpilib']
6462
}
6563
}
6664
}
@@ -99,3 +97,8 @@ tasks.register('PatchExamples') {
9997

10098
build.dependsOn PatchExamples
10199
jar.finalizedBy PatchExamples
100+
101+
wrapper {
102+
gradleVersion = '8.5'
103+
distributionType = Wrapper.DistributionType.BIN
104+
}

gradle/wrapper/gradle-wrapper.jar

-18.2 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 13 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)