Permalink
Browse files

Delete unnecessary mockito 1.x modules in release module. [ci skip-re…

…lease]
  • Loading branch information...
thekingnothing committed Sep 10, 2017
1 parent 56b9d55 commit 440e3bba157eb32e40238af634d9d5d2114d2da7
Showing with 5 additions and 44 deletions.
  1. +0 −2 gradle/release/distZip.gradle
  2. +0 −1 gradle/release/fullJars.gradle
  3. +5 −6 gradlew
  4. +0 −32 powermock-release/build.gradle
  5. +0 −3 settings.gradle
@@ -1,8 +1,6 @@
def fullJars = [
project(":powermock-release:powermock-easymock-junit"),
project(":powermock-release:powermock-easymock-testng"),
project(":powermock-release:powermock-mockito-junit"),
project(":powermock-release:powermock-mockito-testng"),
project(":powermock-release:powermock-mockito2-junit"),
project(":powermock-release:powermock-mockito2-testng")
]
@@ -1,6 +1,5 @@
def fullJars = [
project(":powermock-release:powermock-easymock"),
project(":powermock-release:powermock-mockito"),
project(":powermock-release:powermock-mockito2")
]
11 gradlew
@@ -155,14 +155,13 @@ if $cygwin ; then
fi
# Escape application args
save ( ) {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")
for s in "${@}" ; do
s=\"$s\"
APP_ARGS=$APP_ARGS" "$s
done
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
eval set -- "$DEFAULT_JVM_OPTS" "$JAVA_OPTS" "$GRADLE_OPTS" "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
@@ -97,38 +97,6 @@ project(":powermock-release:powermock-easymock-testng") {
}
}
project(":powermock-release:powermock-mockito-junit") {
description = "Single jar containing binaries for PowerMock core, JUnit and Mockito modules."
dependencies {
compile(project(path:":powermock-release:powermock-mockito", configuration: "shadow"))
compile("junit:junit:${junitVersion}") {
exclude group: 'org.hamcrest', module: 'hamcrest-core'
}
compile("org.hamcrest:hamcrest-core:${hamcrestVersion}")
compile("org.mockito:mockito-core:${mockitoVersion}")
compile("org.objenesis:objenesis:${objenesisVersion}")
compile("org.javassist:javassist:${javassistVersion}")
compile("cglib:cglib-nodep:${cglibVersion}")
}
}
project(":powermock-release:powermock-mockito-testng") {
description = "Single jar containing binaries for PowerMock core, TestNG and Mockito modules."
dependencies {
compile(project(path:":powermock-release:powermock-mockito", configuration: "shadow"))
compile("org.testng:testng:${testngVersion}")
compile("org.hamcrest:hamcrest-core:${hamcrestVersion}")
compile("org.mockito:mockito-core:${mockitoVersion}")
compile("org.objenesis:objenesis:${objenesisVersion}")
compile("org.javassist:javassist:${javassistVersion}")
compile("cglib:cglib-nodep:${cglibVersion}")
}
}
project(":powermock-release:powermock-mockito2-junit") {
description = "Single jar containing binaries for PowerMock core, JUnit and Mockito modules."
@@ -41,11 +41,8 @@ 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")

0 comments on commit 440e3bb

Please sign in to comment.