GP-849: Gradle 7 support

This commit is contained in:
Ryan Kurtz
2021-04-12 11:07:06 -04:00
parent cb63f67a81
commit 3a0ae8ee39
84 changed files with 324 additions and 290 deletions

View File

@@ -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
}

View File

@@ -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