GP-849: Gradle 7 support

DevGuide.md

@@ -34,8 +34,8 @@ You may not need all of these, depending on which portions you are building or d
       - https://adoptopenjdk.net/releases.html?variant=openjdk11&jvmVariant=hotspot
     - Amazon Corretto
       - https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html
-* Gradle 5.x or 6.x - We use version 5.0, and have tested with up to 6.8.3.
-    - https://gradle.org/next-steps/?version=5.0&format=bin
+* Gradle 6.0 or later - We use version 6.9, and tested with up to 7.0.1.
+    - https://gradle.org/releases/
 * A C/C++ compiler - We use GCC on Linux, Xcode (Clang) on macOS, and Visual Studio (2017 or later) on Windows.
     - https://gcc.gnu.org/
     - https://developer.apple.com/xcode/

GPL/DMG/build.gradle

@@ -16,7 +16,7 @@ if (findProject(':Generic') != null) {
 	}
 }
 else {
-	apply plugin: 'java'
+	apply plugin: 'java-library'
 }
 apply plugin: 'eclipse'
 
@@ -39,16 +39,14 @@ sourceSets {
 	}
 }
 
-eclipse.classpath.plusConfigurations += [configurations.dmgCompile]
-
 repositories {
 	flatDir name: "flat", dirs:["data/lib"]
 }
 
 dependencies {
-	dmgCompile ':csframework@jar'
-	dmgCompile ':hfsx@jar'
-	dmgCompile ':hfsx_dmglib@jar'
+	dmgImplementation ':csframework@jar'
+	dmgImplementation ':hfsx@jar'
+	dmgImplementation ':hfsx_dmglib@jar'
 }
 
 /***************************************************************************************
@@ -58,6 +56,6 @@ dependencies {
  ***************************************************************************************/
 
 jar {
-	destinationDir = file("build/data/lib")
+	destinationDirectory = file("build/data/lib")
 	from sourceSets.dmg.output
 }

GPL/DemanglerGnu/build.gradle

@@ -60,8 +60,8 @@ task zipBuildableSource(type:Zip) {
 
 	group 'private'
 	description "Collects the source files needed to build this module."
-	baseName project.name + "-src-for-build"
-	extension 'zip'
+	archiveBaseName = project.name + "-src-for-build"
+	archiveExtension = 'zip'
 
 	//
 	// Version 2.33.1

Ghidra/Debug/AnnotationValidator/build.gradle

@@ -22,7 +22,7 @@ apply plugin: 'eclipse'
 eclipse.project.name = 'Debug AnnotationValidator'
 
 dependencies {
-	compile project(':ProposedUtils')
+	api project(':ProposedUtils')
 }
 
 // no-dep jar for experiments in loading annotation processor into Eclipse

Ghidra/Debug/Debugger-agent-dbgeng/build.gradle

@@ -23,14 +23,16 @@ apply plugin: 'eclipse'
 eclipse.project.name = 'Debug Debugger-agent-dbgeng'
 
 dependencies {
-	compile project(":Framework-AsyncComm")
-	compile project(":Framework-Debugging")
-	compile project(":Debugger-gadp")
-	compile "net.java.dev.jna:jna:5.4.0"
-	compile "net.java.dev.jna:jna-platform:5.4.0"
+	api project(":Framework-AsyncComm")
+	api project(":Framework-Debugging")
+	api project(":Debugger-gadp")
+	api "net.java.dev.jna:jna:5.4.0"
+	api "net.java.dev.jna:jna-platform:5.4.0"
 
-	//testCompile project(":Base")
-	testCompile project(path: ":Debugger-gadp", configuration: 'testArtifacts')
+	//testImplementation project(":Base")
+	testImplementation project(path: ':Framework-AsyncComm', configuration: 'testArtifacts')
+	testImplementation project(path: ':Framework-Debugging', configuration: 'testArtifacts')
+	testImplementation project(path: ":Debugger-gadp", configuration: 'testArtifacts')
 }
 
 def boolean filterJar(File jarfile) {
@@ -52,7 +54,7 @@ jar {
 
 task configureNodepJar {
 	doLast {
-		configurations.runtime.files.forEach {
+		configurations.runtimeOnly.files.forEach {
 			if (filterJar(it)) {
 				nodepJar.from(zipTree(it))
 			}

Ghidra/Debug/Debugger-agent-dbgmodel-traceloader/build.gradle

@@ -22,7 +22,7 @@ apply plugin: 'eclipse'
 eclipse.project.name = 'Debug Debugger-agent-dbgmodel-traceloader'
 
 dependencies {
-	compile project(":Debugger")
-	compile project(":Debugger-agent-dbgeng")
-	compile project(':Debugger-agent-dbgmodel') 
+	api project(":Debugger")
+	api project(":Debugger-agent-dbgeng")
+	api project(':Debugger-agent-dbgmodel') 
 }

Ghidra/Debug/Debugger-agent-dbgmodel/build.gradle

@@ -23,9 +23,12 @@ apply plugin: 'eclipse'
 eclipse.project.name = 'Debug Debugger-agent-dbgmodel'
 
 dependencies {
-	compile project(":Debugger-agent-dbgeng")
+	api project(":Debugger-agent-dbgeng")
 
-	testCompile project(path: ":Debugger-agent-dbgeng", configuration: 'testArtifacts')
+	testImplementation project(path: ":Debugger-agent-dbgeng", configuration: 'testArtifacts')
+	testImplementation project(path: ':Framework-AsyncComm', configuration: 'testArtifacts')
+	testImplementation project(path: ':Framework-Debugging', configuration: 'testArtifacts')
+	testImplementation project(path: ":Debugger-gadp", configuration: 'testArtifacts')
 }
 
 def boolean filterJar(File jarfile) {
@@ -47,7 +50,7 @@ jar {
 
 task configureNodepJar {
 	doLast {
-		configurations.runtime.files.forEach {
+		configurations.runtimeOnly.files.forEach {
 			if (filterJar(it)) {
 				nodepJar.from(zipTree(it))
 			}

Ghidra/Debug/Debugger-agent-gdb/build.gradle

@@ -23,12 +23,14 @@ apply plugin: 'eclipse'
 eclipse.project.name = 'Debug Debugger-agent-gdb'
 
 dependencies {
-	compile project(':Framework-AsyncComm')
-	compile project(':Framework-Debugging')
-	compile project(':Debugger-gadp')
-	compile 'org.python:jython-standalone:2.7.1'
+	api project(':Framework-AsyncComm')
+	api project(':Framework-Debugging')
+	api project(':Debugger-gadp')
+	api 'org.python:jython-standalone:2.7.1'
 
-	testCompile project(path: ':Debugger-gadp', configuration: 'testArtifacts')
+	testImplementation project(path: ':Framework-AsyncComm', configuration: 'testArtifacts')
+	testImplementation project(path: ':Framework-Debugging', configuration: 'testArtifacts')
+	testImplementation project(path: ':Debugger-gadp', configuration: 'testArtifacts')
 }
 
 def boolean filterJar(File jarfile) {
@@ -50,7 +52,7 @@ jar {
 
 task configureNodepJar {
 	doLast {
-		configurations.runtime.files.forEach {
+		configurations.runtimeOnly.files.forEach {
 			if (filterJar(it)) {
 				nodepJar.from(zipTree(it))
 			}

Ghidra/Debug/Debugger-gadp/build.gradle

@@ -47,12 +47,13 @@ dependencies {
     	protocArtifact 'com.google.protobuf:protoc:3.11.1:osx-x86_64@exe'
     }
 
-	compile 'com.google.protobuf:protobuf-java:3.11.1'
-	compile project(':Framework-AsyncComm')
-	compile project(':Framework-Debugging')
-	compile project(':ProposedUtils')
+	api 'com.google.protobuf:protobuf-java:3.11.1'
+	api project(':Framework-AsyncComm')
+	api project(':Framework-Debugging')
+	api project(':ProposedUtils')
 
-	testCompile project(path: ':Framework-Debugging', configuration: 'testArtifacts')
+	testImplementation project(path: ':Framework-AsyncComm', configuration: 'testArtifacts')
+	testImplementation project(path: ':Framework-Debugging', configuration: 'testArtifacts')
 }
 
 /*protobuf {

Ghidra/Debug/Debugger-jpda/build.gradle

@@ -22,9 +22,10 @@ apply plugin: 'eclipse'
 eclipse.project.name = 'Debug Debugger-jpda'
 
 dependencies {
-	compile project(':Framework-AsyncComm')
-	compile project(':Framework-Debugging')
-	compile project(':ProposedUtils')
+	api project(':Framework-AsyncComm')
+	api project(':Framework-Debugging')
+	api project(':ProposedUtils')
 
-	testCompile project(path: ':Framework-Debugging', configuration: 'testArtifacts')
+	testImplementation project(path: ':Framework-AsyncComm', configuration: 'testArtifacts')
+	testImplementation project(path: ':Framework-Debugging', configuration: 'testArtifacts')
 }

Ghidra/Debug/Debugger/build.gradle

@@ -23,15 +23,16 @@ apply plugin: 'eclipse'
 eclipse.project.name = 'Debug Debugger'
 
 dependencies {
-	compile project(':Framework-AsyncComm')
-	compile project(':Framework-Debugging')
-	compile project(':Framework-TraceModeling')
-	compile project(':Base')
-	compile project(':ByteViewer')
-	compile project(':ProposedUtils')
+	api project(':Framework-AsyncComm')
+	api project(':Framework-Debugging')
+	api project(':Framework-TraceModeling')
+	api project(':Base')
+	api project(':ByteViewer')
+	api project(':ProposedUtils')
 
 	helpPath project(path: ':Base', configuration: 'helpPath')
 
-	testCompile project(path: ':Framework-Debugging', configuration: 'testArtifacts')
-	testCompile project(path: ':Framework-TraceModeling', configuration: 'testArtifacts')
+	testImplementation project(path: ':Framework-AsyncComm', configuration: 'testArtifacts')
+	testImplementation project(path: ':Framework-Debugging', configuration: 'testArtifacts')
+	testImplementation project(path: ':Framework-TraceModeling', configuration: 'testArtifacts')
 }

Ghidra/Debug/Framework-AsyncComm/build.gradle

@@ -22,9 +22,9 @@ apply plugin: 'eclipse'
 eclipse.project.name = 'Debug Framework-AsyncComm'
 
 dependencies {
-	compile project(':Generic')
-	compile project(':Graph')
-	compile project(':ProposedUtils')
+	api project(':Generic')
+	api project(':Graph')
+	api project(':ProposedUtils')
 }
 
 task genTestPy(type: JavaExec) {

Ghidra/Debug/Framework-Debugging/build.gradle

@@ -23,12 +23,12 @@ apply plugin: 'eclipse'
 eclipse.project.name = 'Debug Framework-Debugging'
 
 dependencies {
-	compile project(':Framework-AsyncComm')
-	compile project(':Generic')
-	compile project(':SoftwareModeling')
-	compile project(':ProposedUtils')
+	api project(':Framework-AsyncComm')
+	api project(':Generic')
+	api project(':SoftwareModeling')
+	api project(':ProposedUtils')
 
-	testCompile project(path: ':Framework-AsyncComm', configuration: 'testArtifacts')
+	testImplementation project(path: ':Framework-AsyncComm', configuration: 'testArtifacts')
 }
 
 task testSpecimenWin64 {

Ghidra/Debug/Framework-TraceModeling/build.gradle

@@ -22,11 +22,11 @@ apply plugin: 'eclipse'
 eclipse.project.name = 'Debug Framework-TraceModeling'
 
 dependencies {
-	compile project(':Generic')
-	compile project(':SoftwareModeling')
-	compile project(':ProposedUtils')
+	api project(':Generic')
+	api project(':SoftwareModeling')
+	api project(':ProposedUtils')
 	annotationProcessor project(':AnnotationValidator')
 
-	testCompile project(':Base')
-	testRuntime project(':ARM')  // For its emulator state modifier
+	testImplementation project(':Base')
+	testRuntimeOnly project(':ARM')  // For its emulator state modifier
 }

Ghidra/Debug/ProposedUtils/build.gradle

@@ -24,16 +24,16 @@ eclipse.project.name = 'Debug ProposedUtils'
 // val autoServiceVersion = "1.0-rc5"
 
 dependencies {
-	compile project(':DB')
-	compile project(':Project')
-	compile project(':SoftwareModeling')
-	compile project(':Utility')
+	api project(':DB')
+	api project(':Project')
+	api project(':SoftwareModeling')
+	api project(':Utility')
 
-	compile project(':Base') // Boo!: (Where to put DefaultEnumeratedColumnProgramTableModel?)
+	api project(':Base') // Boo!: (Where to put DefaultEnumeratedColumnProgramTableModel?)
 
 	// TODO: Evaluate these dependencies
-	// compile("com.google.auto.service:auto-service-annotations:$autoServiceVersion")
+	// api("com.google.auto.service:auto-service-annotations:$autoServiceVersion")
 	// annotationProcessor("com.google.auto.service:auto-service:$autoServiceVersion")
 
-	testCompile project(':Base')
+	testImplementation project(':Base')
 }

Ghidra/Extensions/SampleTablePlugin/build.gradle

@@ -23,5 +23,5 @@ eclipse.project.name = 'Xtra SampleTablePlugin'
 
 
 dependencies {
-	compile project(':Base')
+	api project(':Base')
 }

Ghidra/Extensions/SleighDevTools/build.gradle

@@ -20,5 +20,5 @@ apply plugin: 'eclipse'
 eclipse.project.name = 'Xtra SleighDevTools'
 
 dependencies {
-	compile project(':Base')
+	api project(':Base')
 }

Ghidra/Extensions/bundle_examples/build.gradle

@@ -30,7 +30,7 @@ eclipse.project.name = 'Xtra Bundle Examples'
 
 
 dependencies {
-	compile project(':Base')
+	api project(':Base')
 }
 
 
@@ -50,8 +50,8 @@ srcDirs.each {dirName ->
 // create and return a jar task for the given source directory
 def makeJarTask(dirName) {
 	return tasks.create("build${dirName}", Jar) {
-		baseName  dirName
-		archiveName "${dirName}.jar"
+		archiveBaseName =  dirName
+		archiveFileName = "${dirName}.jar"
 		ext.dirName=dirName
 
 
@@ -91,8 +91,8 @@ eclipse {
 // "$rootProject.projectDir/gradle/support/extensionCommon.gradle"
 task zipExtensions(type: Zip, dependsOn:jarTasks) {
 	def p = this.project
-	archiveName "${rootProject.ext.ZIP_NAME_PREFIX}_${p.name}.zip"
-	destinationDir rootProject.ext.DISTRIBUTION_DIR
+	archiveFileName = "${rootProject.ext.ZIP_NAME_PREFIX}_${p.name}.zip"
+	destinationDirectory = rootProject.ext.DISTRIBUTION_DIR
 
 	duplicatesStrategy 'exclude'
 

Ghidra/Extensions/sample/build.gradle

@@ -22,5 +22,5 @@ eclipse.project.name = 'Xtra sample'
 
 
 dependencies {
-	compile project(':Base')
+	api project(':Base')
 }

Ghidra/Features/Base/build.gradle

@@ -33,28 +33,28 @@ configurations {
 }
 
 dependencies {
-	compile project(':Utility')
-	compile project(':Generic')
-	compile project(':Docking')
-	compile project(':Graph')
-	compile project(':SoftwareModeling')
-	compile project(':DB')
-	compile project(':Help')
-
-	compile 'org.apache.felix:org.apache.felix.framework:6.0.3'
-	compile 'com.github.rotty3000:phidias:0.3.7'
-	compile 'biz.aQute.bnd:biz.aQute.bndlib:5.1.2'
-	compile 'org.slf4j:slf4j-api:1.7.25'
+	api project(':Utility')
+	api project(':Generic')
+	api project(':Docking')
+	api project(':Graph')
+	api project(':SoftwareModeling')
+	api project(':DB')
+	api project(':Help')
+
+	api 'org.apache.felix:org.apache.felix.framework:6.0.3'
+	api 'com.github.rotty3000:phidias:0.3.7'
+	api 'biz.aQute.bnd:biz.aQute.bndlib:5.1.2'
+	api 'org.slf4j:slf4j-api:1.7.25'
 
-	runtime "org.slf4j:slf4j-nop:1.7.25"
+	runtimeOnly "org.slf4j:slf4j-nop:1.7.25"
 
    	compileOnly "junit:junit:4.12"
 
 	// These have abstract test classes and stubs needed by this module	
-	testCompile project(path: ':Docking', configuration: 'testArtifacts')
-	testCompile project(path: ':Generic', configuration: 'testArtifacts')
-	testCompile project(path: ':Project', configuration: 'testArtifacts')
-	testCompile project(path: ':SoftwareModeling', configuration: 'testArtifacts')
+	testImplementation project(path: ':Docking', configuration: 'testArtifacts')
+	testImplementation project(path: ':Generic', configuration: 'testArtifacts')
+	testImplementation project(path: ':Project', configuration: 'testArtifacts')
+	testImplementation project(path: ':SoftwareModeling', configuration: 'testArtifacts')
 
 	javacc 'net.java.dev.javacc:javacc:5.0'
 }