replace deprecated dependency configurations

Using api and implementation instead of the
deprecated compile configuration.

Update to Gradle 6.0.
This commit is contained in:
2019-11-10 11:08:50 +01:00
parent ddd71ff14b
commit 4367323fcd
11 changed files with 58 additions and 43 deletions

View File

@@ -1,13 +1,16 @@
apply plugin: 'antlr'
//apply plugin: 'antlr'
//apply plugin: 'java'
System.out.println(dependencies.class);
dependencies {
compile project(':byte-utils')
compile project(':file-utils')
compile project(':pdb-utils')
api lib_primitive_collections
implementation project(':byte-utils')
implementation project(':file-utils')
implementation project(':pdb-utils')
compile lib_log4j2_slf4j_impl
compile lib_primitive_collections
implementation lib_log4j2_slf4j_impl
}

View File

@@ -55,7 +55,7 @@ ext {
* The shared configuration for all sub-projects:
*/
subprojects {
apply plugin: 'java'
apply plugin: 'java-library'
apply plugin: 'eclipse'
compileJava.options.encoding = 'UTF-8'
@@ -87,7 +87,7 @@ subprojects {
// dependencies that all sub-projects have
dependencies {
testCompile group: 'org.testng', name: 'testng', version: '6.14.3'
testImplementation group: 'org.testng', name: 'testng', version: '6.14.3'
}
task eclipseSettings(type: Copy) {
@@ -117,5 +117,5 @@ subprojects {
}
wrapper {
gradleVersion = '6.0-rc-2'
gradleVersion = '6.0'
}

View File

@@ -1,4 +1,4 @@
dependencies {
compile lib_log4j2_slf4j_impl
compile lib_primitive_collections
implementation lib_log4j2_slf4j_impl
implementation lib_primitive_collections
}

View File

@@ -1,16 +1,17 @@
apply plugin: 'antlr'
dependencies {
compile project(':pdb-api')
compile project(':file-utils')
compile project(':pdb-utils')
compile project(':block-storage')
implementation project(':pdb-api')
implementation project(':file-utils')
implementation project(':pdb-utils')
api project(':block-storage')
implementation project(':byte-utils')
antlr lib_antlr
compile lib_primitive_collections
compile lib_commons_lang3
implementation lib_primitive_collections
implementation lib_commons_lang3
compile lib_log4j2_slf4j_impl
implementation lib_log4j2_slf4j_impl
}

View File

@@ -1,3 +1,3 @@
dependencies {
compile lib_log4j2_slf4j_impl
implementation lib_log4j2_slf4j_impl
}

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-rc-2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

View File

@@ -1,7 +1,7 @@
dependencies {
compile project(':byte-utils')
compile project(':pdb-utils')
compile project(':file-utils')
compile lib_primitive_collections
implementation project(':byte-utils')
implementation project(':pdb-utils')
implementation project(':file-utils')
implementation lib_primitive_collections
}

View File

@@ -1,7 +1,12 @@
dependencies {
compile project(':performanceDb')
compile lib_primitive_collections
compile lib_jackson_databind
implementation project(':performanceDb')
implementation project(':file-utils')
implementation project(':pdb-utils')
implementation lib_primitive_collections
implementation lib_jackson_databind
implementation lib_log4j2_core
implementation lib_log4j2_slf4j_impl
}

View File

@@ -10,21 +10,26 @@ applicationDefaultJvmArgs = [
]
dependencies {
compile project(':performanceDb')
compile project(':pdb-plotting')
implementation project(':performanceDb')
implementation project(':pdb-plotting')
implementation project(':pdb-js')
implementation project(':pdb-utils')
implementation lib_commons_lang3
implementation lib_primitive_collections
compile(lib_spring_boot_mustache) {
implementation(lib_spring_boot_mustache) {
exclude module: 'spring-boot-starter-logging'
}
compile(lib_spring_boot_web){
implementation(lib_spring_boot_web){
exclude module: 'spring-boot-starter-logging'
}
compile(lib_spring_boot_log4j2)
implementation(lib_spring_boot_log4j2)
testCompile(lib_spring_boot_test){
testImplementation(lib_spring_boot_test){
exclude module: 'spring-boot-starter-logging'
}
testImplementation project(':file-utils')
}
jar {

View File

@@ -1,6 +1,6 @@
dependencies {
compile lib_primitive_collections
compile lib_log4j2_core
compile lib_log4j2_slf4j_impl
implementation lib_primitive_collections
implementation lib_log4j2_core
implementation lib_log4j2_slf4j_impl
}

View File

@@ -1,11 +1,12 @@
dependencies {
compile project(':pdb-api')
compile project(':data-store')
compile project(':file-utils')
compile lib_jackson_databind
compile lib_commons_collections4
api project(':pdb-api')
api project(':data-store')
implementation project(':file-utils')
implementation lib_jackson_databind
implementation lib_commons_collections4
compile lib_log4j2_core
compile lib_log4j2_slf4j_impl
implementation lib_log4j2_core
implementation lib_log4j2_slf4j_impl
testImplementation project(':pdb-utils')
}