Fixes #726 Mockito Public API Support

Upgrade Mockito to 2.10.0 - release with a new Mockito API.
powermock · Sep 10, 2017 · 96c955a · 96c955a
1 parent 1e9e16d
commit 96c955a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 23 deletions.
diff --git a/build.gradle b/build.gradle
@@ -32,7 +32,7 @@ ext{
     junitRulesVersion = "4.8.2"
     testngVersion = "6.9.10"
     xstreamVersion = "1.4.9"
-    mockitoVersion = "2.8.54"
+    mockitoVersion = "2.10.0"
     servletVersion = "2.5"
     systemRulesVersion = "1.16.0"
     jacocoVersion = "0.7.7.201606060606"

diff --git a/gradle/java-module.gradle b/gradle/java-module.gradle
@@ -1,7 +1,6 @@
 repositories {
     mavenCentral()
     jcenter()
-    mavenLocal()
 }
 
 group = "org.powermock"

diff --git a/gradle/modules.gradle b/gradle/modules.gradle
@@ -1,4 +1,4 @@
-def publishableModules = allprojects - rootProject - project(":powermock-api")  - project(":powermock-classloading") - project(":powermock-modules") - project(":tests") - project(":tests").subprojects  //- project(":powermock-release") - project(":powermock-release").subprojects
+def publishableModules = allprojects - rootProject - project(":powermock-api") - project(":powermock-classloading") - project(":powermock-modules") - project(":tests") - project(":tests").subprojects - project(":powermock-release") - project(":powermock-release").subprojects
 
 configure(publishableModules) { project ->
     apply from: "${gradleScriptDir}/java-module.gradle"
@@ -14,7 +14,7 @@ def skippedTasksForUnpublishableModules = [
     'bintrayUpload'
 ]
 
-def unpublishableModules = allprojects - publishableModules// - project(":powermock-release").subprojects
+def unpublishableModules = allprojects - publishableModules - project(":powermock-release").subprojects
 configure(unpublishableModules) { project ->
     project.tasks.all {
         if(skippedTasksForUnpublishableModules.contains(it.name)) {
@@ -32,14 +32,14 @@ def skippedTasksForGenericModules = [
     'sourcesJar'
 ]
 
-//def genericModules = project(":powermock-release").subprojects
-//configure(genericModules) { project ->
-//    project.tasks.all {
-//        if(skippedTasksForGenericModules.contains(it.name)) {
-//            it.enabled = false
-//        }
-//    }
-//}
+def genericModules = project(":powermock-release").subprojects
+configure(genericModules) { project ->
+    project.tasks.all {
+        if (skippedTasksForGenericModules.contains(it.name)) {
+            it.enabled = false
+        }
+    }
+}
 
 if (project.hasProperty('checkJava6Compatibility') && !System.getenv("SKIP_RELEASE")) {
     //if we're skipping release, let's also skip checking compatibility (faster builds)

diff --git a/powermock-release/build.gradle b/powermock-release/build.gradle
@@ -141,7 +141,7 @@ project(":powermock-release:powermock-mockito2-junit") {
             exclude group: 'org.hamcrest', module: 'hamcrest-core'
         }
         compile("org.hamcrest:hamcrest-core:${hamcrestVersion}")
-        compile("org.mockito:mockito-core:${mockito2Version}")
+        compile("org.mockito:mockito-core:${mockitoVersion}")
         compile("org.objenesis:objenesis:${objenesisVersion}")
         compile("org.javassist:javassist:${javassistVersion}")
         compile("cglib:cglib-nodep:${cglibVersion}")
@@ -156,7 +156,7 @@ project(":powermock-release:powermock-mockito2-testng") {
         compile(project(path:":powermock-release:powermock-mockito2", configuration: "shadow"))
         compile("org.testng:testng:${testngVersion}")
         compile("org.hamcrest:hamcrest-core:${hamcrestVersion}")
-        compile("org.mockito:mockito-core:${mockito2Version}")
+        compile("org.mockito:mockito-core:${mockitoVersion}")
         compile("org.objenesis:objenesis:${objenesisVersion}")
         compile("org.javassist:javassist:${javassistVersion}")
         compile("cglib:cglib-nodep:${cglibVersion}")

diff --git a/settings.gradle b/settings.gradle
@@ -42,12 +42,12 @@ include("tests:java8:mockito-junit4")
 include("tests:java8:mockito-junit4-agent")
 include("tests:java8:mockito-junit4-rule-xstream")
 include("tests:java8:easymock-junit4")
-//include("powermock-release:powermock-easymock")
-//include("powermock-release:powermock-mockito")
-//include("powermock-release:powermock-mockito2")
-//include("powermock-release:powermock-easymock-junit")
-//include("powermock-release:powermock-easymock-testng")
-//include("powermock-release:powermock-mockito-junit")
-//include("powermock-release:powermock-mockito-testng")
-//include("powermock-release:powermock-mockito2-junit")
-//include("powermock-release:powermock-mockito2-testng")
+include("powermock-release:powermock-easymock")
+include("powermock-release:powermock-mockito")
+include("powermock-release:powermock-mockito2")
+include("powermock-release:powermock-easymock-junit")
+include("powermock-release:powermock-easymock-testng")
+include("powermock-release:powermock-mockito-junit")
+include("powermock-release:powermock-mockito-testng")
+include("powermock-release:powermock-mockito2-junit")
+include("powermock-release:powermock-mockito2-testng")