From dca3b9ec8c192239c7f18c6c8ec4135629292f31 Mon Sep 17 00:00:00 2001 From: georgepradhan Date: Thu, 5 Feb 2015 17:56:32 -0600 Subject: [PATCH 1/2] Change Java version, replace mockito-all as mockito-core, gitignore build, delete unused import --- .gitignore | 3 ++- build.gradle | 4 ++-- .../java/com/thoughtworks/voidmethods/BookBannerTests.java | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7fb0613..74c55c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .idea/ printStream/ .gradle -.DS_Store \ No newline at end of file +.DS_Store +build/ diff --git a/build.gradle b/build.gradle index f9306e0..6329d31 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'java' -sourceCompatibility = 1.5 +sourceCompatibility = 1.7 version = '1.0' repositories { @@ -10,6 +10,6 @@ repositories { dependencies { compile 'joda-time:joda-time:2.7' testCompile group: 'junit', name: 'junit', version: '4.11' - testCompile group: 'org.mockito', name: 'mockito-all', version: '1.9.5' + testCompile group: 'org.mockito', name: 'mockito-core', version: '1.9.5' testCompile 'org.hamcrest:hamcrest-core:1.3' } \ No newline at end of file diff --git a/src/test/java/com/thoughtworks/voidmethods/BookBannerTests.java b/src/test/java/com/thoughtworks/voidmethods/BookBannerTests.java index 411370e..1e2a3c0 100644 --- a/src/test/java/com/thoughtworks/voidmethods/BookBannerTests.java +++ b/src/test/java/com/thoughtworks/voidmethods/BookBannerTests.java @@ -1,6 +1,5 @@ package com.thoughtworks.voidmethods; -import com.sun.javaws.jnl.LibraryDesc; import org.junit.Test; import java.util.ArrayList; From 85670fe72037f41d07013be01c4b0346516aeaa7 Mon Sep 17 00:00:00 2001 From: georgepradhan Date: Thu, 5 Feb 2015 18:11:18 -0600 Subject: [PATCH 2/2] Remove iml file from git tracking --- .gitignore | 1 + TDDIntro.iml | 22 ---------------------- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 TDDIntro.iml diff --git a/.gitignore b/.gitignore index 74c55c3..12f5971 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ printStream/ .gradle .DS_Store build/ +*.iml \ No newline at end of file diff --git a/TDDIntro.iml b/TDDIntro.iml deleted file mode 100644 index f8f190b..0000000 --- a/TDDIntro.iml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file