andi/perfdb
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Activity

replace deprecated dependency configurations

Browse Source 
Using api and implementation instead of the
deprecated compile configuration.

Update to Gradle 6.0.
This commit is contained in:
Andreas Huber
2019-11-10 11:08:50 +01:00
parent ddd71ff14b
commit 4367323fcd
11 changed files with 58 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
block-storage/build.gradle
View File

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

6
build.gradle
View File

@@ -55,7 +55,7 @@ ext {
* The shared configuration for all sub-projects: * The shared configuration for all sub-projects:
*/ */
subprojects { subprojects {
apply plugin: 'java' apply plugin: 'java-library'
apply plugin: 'eclipse' apply plugin: 'eclipse'
compileJava.options.encoding = 'UTF-8' compileJava.options.encoding = 'UTF-8'
@@ -87,7 +87,7 @@ subprojects {
// dependencies that all sub-projects have // dependencies that all sub-projects have
dependencies { 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) { task eclipseSettings(type: Copy) {
@@ -117,5 +117,5 @@ subprojects {
} }
wrapper { wrapper {
gradleVersion = '6.0-rc-2' gradleVersion = '6.0'
} }

4
byte-utils/build.gradle
View File

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

15
data-store/build.gradle
View File

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

2
file-utils/build.gradle
View File

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

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

8
pdb-api/build.gradle
View File

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

11
pdb-plotting/build.gradle
View File

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

25
pdb-ui/build.gradle
View File

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

6
pdb-utils/build.gradle
View File

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

15
performanceDb/build.gradle
View File

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