Skip to content

Commit ba108ec

Browse files
committed
Bump Gradle 3.4 -> 7.6 and get build to happen.
1 parent f6883d0 commit ba108ec

5 files changed

Lines changed: 24 additions & 24 deletions

File tree

build.gradle

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
plugins {
22
// code formatting
3-
id "com.diffplug.gradle.spotless" version "3.1.0"
4-
// bintray uploading
5-
id "com.jfrog.bintray" version "1.3.1"
3+
id "com.diffplug.spotless" version "6.19.0"
64
// for downloading JRE6
7-
id "de.undercouch.download" version "2.0.0"
5+
id "de.undercouch.download" version "5.4.0"
86
}
97

108
repositories {
@@ -19,7 +17,7 @@ sourceCompatibility = VER_JAVA
1917
targetCompatibility = VER_JAVA
2018

2119
dependencies {
22-
testCompile "junit:junit:${VER_JUNIT}"
20+
testImplementation "junit:junit:${VER_JUNIT}"
2321
}
2422

2523
////////////////////
@@ -86,9 +84,9 @@ task unzipJRE6(dependsOn: verifyJRE6, type: Copy) {
8684
sourceCompatibility = 1.6
8785
targetCompatibility = 1.6
8886
def sep = System.getProperty('path.separator')
89-
def bootClasspathStr = "${JRE6_HOME}/lib/rt.jar${sep}${JRE6_HOME}/lib/jsse.jar"
87+
def bootClasspathStr = project.files("${JRE6_HOME}/lib/rt.jar${sep}${JRE6_HOME}/lib/jsse.jar")
9088
project.tasks.withType(AbstractCompile, { AbstractCompile ac ->
91-
ac.options.bootClasspath = bootClasspathStr // options is always there but not defined on AbstractCompile so going to hit it anyway
89+
ac.options.bootstrapClasspath = bootClasspathStr // options is always there but not defined on AbstractCompile so going to hit it anyway
9290
ac.dependsOn(unzipJRE6)
9391
})
9492

@@ -116,8 +114,8 @@ spotless {
116114

117115
// we'll want the findbugs annotations (they don't have a 3.0.1 version)
118116
dependencies {
119-
compile 'com.google.code.findbugs:annotations:3.0.0'
120-
compile 'com.google.code.findbugs:jsr305:3.0.0'
117+
implementation 'com.google.code.findbugs:annotations:3.0.0'
118+
implementation 'com.google.code.findbugs:jsr305:3.0.0'
121119
}
122120

123121
// the package of the jmi stub (which we're going to leave out of all the jars we make)

gradle/wrapper/gradle-wrapper.jar

656 Bytes
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Mar 14 13:53:56 PDT 2017
1+
#Thu Jun 15 07:55:52 PDT 2023
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip

gradlew

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

gradlew.bat

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

0 commit comments

Comments
 (0)