Merge pull request cashapp#306 from square/jwilson.0705.consistent_deps

Be more consistent about how we specify dependencies
jpulgarin · Jul 5, 2018 · 8aa8e0c · 8aa8e0c
2 parents 52178f2 + efd5893
commit 8aa8e0c
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 GROUP=com.squareup.misk
 
-VERSION_NAME=0.4.0-SNAPSHOT
+VERSION_NAME=0.9.0-SNAPSHOT
 
 POM_URL=https://github.com/square/misk/
 POM_SCM_URL=https://github.com/square/misk/

diff --git a/misk-hibernate/build.gradle b/misk-hibernate/build.gradle
@@ -29,7 +29,6 @@ dependencies {
   compile dep.hibernateCore
   compile dep.mysql
   compile dep.hsqldb
-
   compile project(':misk')
 
   testCompile project(':misk-testing')

diff --git a/misk-testing/build.gradle b/misk-testing/build.gradle
@@ -26,8 +26,6 @@ junitPlatform {
 }
 
 dependencies {
-  compile project(':misk')
-
   compile dep.junitApi
   compile dep.junitParams
   compile dep.junitEngine
@@ -36,6 +34,7 @@ dependencies {
   compile dep.okHttpMockWebServer
   compile dep.openTracingMock
   compile dep.mockitoCore
+  compile project(':misk')
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
diff --git a/samples/exemplar/build.gradle b/samples/exemplar/build.gradle
@@ -21,7 +21,6 @@ dependencies {
   compile dep.guava
   compile dep.guice
   compile dep.logbackClassic
-
   compile project(':misk')
 
   testCompile project(':misk-testing')

diff --git a/samples/exemplarchat/build.gradle b/samples/exemplarchat/build.gradle
@@ -21,7 +21,6 @@ dependencies {
   compile dep.guava
   compile dep.guice
   compile dep.logbackClassic
-
   compile project(':misk')
 
   testCompile project(':misk-testing')

diff --git a/samples/urlshortener/build.gradle b/samples/urlshortener/build.gradle
@@ -21,7 +21,6 @@ dependencies {
   compile dep.guava
   compile dep.guice
   compile dep.logbackClassic
-
   compile project(':misk')
   compile project(':misk-hibernate')