[Misc] Update gradle build and use concept of api/implementation depe…

…ndencies (which is missing in Maven)
xwiki · May 19, 2018 · af21259 · af21259
1 parent 7213733
commit af21259
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 26 deletions.
diff --git a/build.gradle b/build.gradle
@@ -21,17 +21,19 @@
 // WARNING: NOT WORKING, WORK IN PROGRESS. USE THE MAVEN BUILD WHICH IS THE XWIKI OFFICIAL BUILD TOOL.
 
 ext {
-    junitVersion = '4.12'
+    junit4Version = '4.12'
+    junit5Version = '5.2.0'
     slf4jVersion =  '1.7.25'
-    commonsLang3Version = '3.5'
-    mockitoVersion= '2.6.3'
+    commonsLang3Version = '3.7'
+    mockitoVersion= '2.18.3'
 }
 
 allprojects {
     group = 'org.xwiki.commons'
-    version = '9.3-SNAPSHOT'
+    version = '10.5-SNAPSHOT'
 
     apply plugin: 'java'
+    apply plugin: 'java-library'
     apply plugin: 'maven'
 
     sourceCompatibility = 1.8
@@ -42,6 +44,9 @@ allprojects {
     }
 
     dependencies {
-        testCompile "junit:junit:${junitVersion}"
+        testImplementation "org.junit.jupiter:junit-jupiter-api:${junit5Version}"
+        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit5Version}"
+        testCompileOnly "junit:junit:${junit4Version}"
+        testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junit5Version}"
     }
 }
diff --git a/xwiki-commons-core/xwiki-commons-blame/xwiki-commons-blame-api/build.gradle b/xwiki-commons-core/xwiki-commons-blame/xwiki-commons-blame-api/build.gradle
@@ -21,7 +21,7 @@
 // WARNING: NOT WORKING, WORK IN PROGRESS. USE THE MAVEN BUILD WHICH IS THE XWIKI OFFICIAL BUILD TOOL.
 
 dependencies {
-    compile project(':xwiki-component-api')
-    compile 'com.googlecode.java-diff-utils:diffutils:1.3.0'
-    testCompile project(':xwiki-test-component')
+    api project(':xwiki-component-api')
+    implementation 'com.googlecode.java-diff-utils:diffutils:1.3.0'
+    testImplementation project(':xwiki-test-component')
 }
diff --git a/xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-api/build.gradle b/xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-api/build.gradle
@@ -21,7 +21,8 @@
 // WARNING: NOT WORKING, WORK IN PROGRESS. USE THE MAVEN BUILD WHICH IS THE XWIKI OFFICIAL BUILD TOOL.
 
 dependencies {
-    compile project(':xwiki-stability')
-    compile project(':xwiki-text')
-    compile 'javax.inject:javax.inject:1'
+    api project(':xwiki-stability')
+    api 'javax.inject:javax.inject:1'
+    implementation project(':xwiki-text')
+    implementation "org.apache.commons:commons-lang3:${commonsLang3Version}"
 }
diff --git a/xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-default/build.gradle b/xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-default/build.gradle
@@ -21,9 +21,10 @@
 // WARNING: NOT WORKING, WORK IN PROGRESS. USE THE MAVEN BUILD WHICH IS THE XWIKI OFFICIAL BUILD TOOL.
 
 dependencies {
-    compile project(':xwiki-component-api')
-    compile project(':xwiki-component-observation')
-    compile "org.slf4j:slf4j-api:${slf4jVersion}"
-    testCompile project(':xwiki-test-simple')
-    testCompile 'com.google.inject:guice:3.0'
+    api project(':xwiki-component-api')
+    implementation project(':xwiki-component-observation')
+    implementation "org.slf4j:slf4j-api:${slf4jVersion}"
+    implementation "org.apache.commons:commons-lang3:${commonsLang3Version}"
+    testImplementation project(':xwiki-test-simple')
+    testImplementation 'com.google.inject:guice:3.0'
 }
diff --git a/xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-observation/build.gradle b/xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-observation/build.gradle
@@ -21,7 +21,7 @@
 // WARNING: NOT WORKING, WORK IN PROGRESS. USE THE MAVEN BUILD WHICH IS THE XWIKI OFFICIAL BUILD TOOL.
 
 dependencies {
-    compile project(':xwiki-component-api')
-    compile project(':xwiki-observation-api')
-    compile "org.apache.commons:commons-lang3:${commonsLang3Version}"
+    api project(':xwiki-component-api')
+    api project(':xwiki-observation-api')
+    implementation "org.apache.commons:commons-lang3:${commonsLang3Version}"
 }
diff --git a/xwiki-commons-core/xwiki-commons-context/build.gradle b/xwiki-commons-core/xwiki-commons-context/build.gradle
@@ -21,7 +21,7 @@
 // WARNING: NOT WORKING, WORK IN PROGRESS. USE THE MAVEN BUILD WHICH IS THE XWIKI OFFICIAL BUILD TOOL.
 
 dependencies {
-    compile project(':xwiki-component-api')
-    compile "org.slf4j:slf4j-api:${slf4jVersion}"
-    testCompile project(':xwiki-test-simple')
+    api project(':xwiki-component-api')
+    implementation "org.slf4j:slf4j-api:${slf4jVersion}"
+    testImplementation project(':xwiki-test-simple')
 }
diff --git a/xwiki-commons-core/xwiki-commons-observation/xwiki-commons-observation-api/build.gradle b/xwiki-commons-core/xwiki-commons-observation/xwiki-commons-observation-api/build.gradle
@@ -21,6 +21,7 @@
 // WARNING: NOT WORKING, WORK IN PROGRESS. USE THE MAVEN BUILD WHICH IS THE XWIKI OFFICIAL BUILD TOOL.
 
 dependencies {
-    compile project(':xwiki-component-api')
-    testCompile project(':xwiki-test-simple')
+    api project(':xwiki-component-api')
+    implementation "org.apache.commons:commons-lang3:${commonsLang3Version}"
+    testImplementation project(':xwiki-test-simple')
 }
diff --git a/xwiki-commons-core/xwiki-commons-text/build.gradle b/xwiki-commons-core/xwiki-commons-text/build.gradle
@@ -21,5 +21,5 @@
 // WARNING: NOT WORKING, WORK IN PROGRESS. USE THE MAVEN BUILD WHICH IS THE XWIKI OFFICIAL BUILD TOOL.
 
 dependencies {
-    compile "org.apache.commons:commons-lang3:${commonsLang3Version}"
+    implementation "org.apache.commons:commons-lang3:${commonsLang3Version}"
 }
diff --git a/xwiki-commons-tools/xwiki-commons-tool-test/xwiki-commons-tool-test-simple/build.gradle b/xwiki-commons-tools/xwiki-commons-tool-test/xwiki-commons-tool-test-simple/build.gradle
@@ -21,7 +21,8 @@
 // WARNING: NOT WORKING, WORK IN PROGRESS. USE THE MAVEN BUILD WHICH IS THE XWIKI OFFICIAL BUILD TOOL.
 
 dependencies {
-    compile "junit:junit:${junitVersion}"
+    compile "junit:junit:${junit4Version}"
+    compile "org.junit.jupiter:junit-jupiter-api:${junit5Version}"
     compile "org.slf4j:slf4j-api:${slf4jVersion}"
     compile 'ch.qos.logback:logback-classic:1.2.3'
     compile 'commons-io:commons-io:2.5'