fix files locations

Yelp · Feb 6, 2020 · b4b681a · b4b681a
1 parent ea4c63d
commit b4b681a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -10,11 +10,10 @@ run-hooks: venv
 	${CURDIR}/venv/bin/pre-commit run --all-files
 
 test: run-hooks
-	${CURDIR}/gradlew plugin:build check
-	${CURDIR}/gradlew -p samples/ generateSwagger
-	${CURDIR}/gradlew -p samples/ assembleDebug
-	# Give more metaspace to the JVM
-	${CURDIR}/gradlew -p samples/ check  -Dorg.gradle.jvmargs="-Xmx4g -XX:MaxMetaspaceSize=2g"
+	${CURDIR}/gradlew -p plugin-root build check
+	${CURDIR}/gradlew generateSwagger
+	# The check task requires a lot of MetaSpace
+	${CURDIR}/gradlew assembleDebug check -Dorg.gradle.jvmargs="-Xmx4g -XX:MaxMetaspaceSize=2g"
 
 venv:
 	virtualenv venv

diff --git a/plugin-root/plugin/build.gradle.kts b/plugin-root/plugin/build.gradle.kts
@@ -69,7 +69,7 @@ configure<PublishingExtension> {
 detekt {
     toolVersion = "1.4.0"
     input = files("src/")
-    config = rootProject.files("./config/detekt/detekt.yml")
+    config = rootProject.files("../config/detekt/detekt.yml")
 }
 
 tasks.jacocoTestReport {

diff --git a/plugin-root/plugin/src/test/java/com/yelp/codegen/MainTest.kt b/plugin-root/plugin/src/test/java/com/yelp/codegen/MainTest.kt
@@ -9,7 +9,7 @@ class MainTest {
         val temporaryFolder = TemporaryFolder()
         val junitTestsSpecsPath = File(
             // Repo root
-            File(".").absoluteFile.parentFile.parentFile.absolutePath,
+            File(".").absoluteFile.parentFile.parentFile.parentFile.absolutePath,
             "samples${File.separator}junit-tests${File.separator}junit_tests_specs.json"
         ).path
 

diff --git a/plugin-root/plugin/src/test/testProject/build.gradle.kts b/plugin-root/plugin/src/test/testProject/build.gradle.kts
@@ -24,7 +24,7 @@ apply(plugin = "com.yelp.codegen.plugin")
 configure<GenerateTaskConfiguration> {
   platform = "kotlin"
   packageName = "com.yelp.codegen.samples"
-  // this file is in rootDir/plugin/build/testProject/
-  inputFile = file("../../../samples/junit-tests/junit_tests_specs.json")
+  // we are in rootDir/plugin-root/plugin/build/testProject/
+  inputFile = file("../../../../samples/junit-tests/junit_tests_specs.json")
   outputDir = file("./build/generatedSources")
 }
diff --git a/samples/junit-tests/build.gradle b/samples/junit-tests/build.gradle
@@ -72,5 +72,5 @@ repositories {
 detekt {
     toolVersion = "1.4.0"
     input = files("src/test")
-    config = rootProject.files("../config/detekt/detekt.yml")
+    config = rootProject.files("./config/detekt/detekt.yml")
 }