Merge branch 'master' of github.com:namin/play-js-validation

namin · namin · commit d2e70d4e2d3e · 2012-04-11T12:20:51.000+02:00
diff --git a/samples/forms/project/Build.scala b/samples/forms/project/Build.scala
@@ -12,7 +12,7 @@ object ApplicationBuild extends Build {
     )
 
     val main = PlayProject(appName, appVersion, appDependencies, mainLang = SCALA).settings(
-      resolvers += Resolver.url("ivy-local", url("file:///home/namin/.ivy2/local"))(Resolver.ivyStylePatterns),
+      resolvers += Resolver.url("ivy-local", url("file://" + Path.userHome + "/.ivy2/local"))(Resolver.ivyStylePatterns),
       scalacOptions ++= Seq("-deprecation", "-unchecked", "-Xexperimental", "-Yvirtualize")
     )
 
diff --git a/samples/mini/project/Build.scala b/samples/mini/project/Build.scala
@@ -12,7 +12,7 @@ object ApplicationBuild extends Build {
     )
 
     val main = PlayProject(appName, appVersion, appDependencies, mainLang = SCALA).settings(
-      resolvers += Resolver.url("ivy-local", url("file:///home/namin/.ivy2/local"))(Resolver.ivyStylePatterns),
+      resolvers += Resolver.url("ivy-local", url("file://" + Path.userHome + "/.ivy2/local"))(Resolver.ivyStylePatterns),
       scalacOptions ++= Seq("-deprecation", "-unchecked", "-Xexperimental", "-Yvirtualize")
     )
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ object ApplicationBuild extends Build {`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`val main = PlayProject(appName, appVersion, appDependencies, mainLang = SCALA).settings(`
`15`		`- resolvers += Resolver.url("ivy-local", url("file:///home/namin/.ivy2/local"))(Resolver.ivyStylePatterns),`
	`15`	`+ resolvers += Resolver.url("ivy-local", url("file://" + Path.userHome + "/.ivy2/local"))(Resolver.ivyStylePatterns),`
`16`	`16`	`scalacOptions ++= Seq("-deprecation", "-unchecked", "-Xexperimental", "-Yvirtualize")`
`17`	`17`	`)`
`18`	`18`