Merge pull request Kotlin#1 from nskvortsov/patch-1

shafirov · shafirov · commit e966d2d53dd2 · 2013-04-11T03:29:54.000-07:00
Workaround for lost tests
diff --git a/gradle/mixed-java-kotlin-hello-world/build.gradle b/gradle/mixed-java-kotlin-hello-world/build.gradle
@@ -30,6 +30,8 @@ dependencies {
   testCompile  'org.testng:testng:6.8'
 }
 
+test.testClassesDir = project.tasks.compileTestKotlin.destinationDir
+
 task wrapper(type: Wrapper) {
   gradleVersion="1.4"
 }

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@ dependencies {`
`30`	`30`	`testCompile 'org.testng:testng:6.8'`
`31`	`31`	`}`
`32`	`32`
	`33`	`+test.testClassesDir = project.tasks.compileTestKotlin.destinationDir`
	`34`	`+`
`33`	`35`	`task wrapper(type: Wrapper) {`
`34`	`36`	`gradleVersion="1.4"`
`35`	`37`	`}`