From dc9d1bfda6f3d590a8353a89dfb86608a7fb2b6b Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Sun, 26 May 2019 11:39:32 -0700 Subject: [PATCH] Test gradle-env.json output --- plugin/build.gradle.kts | 5 - .../projectWithBuildSrc/build.gradle | 10 +- .../projectWithBuildSrc/build.gradle.kts | 9 ++ .../buildSrc/gradle-env.json | 121 +++++++++++++++++ .../projectWithBuildSrc/gradle-env.json | 22 ++++ plugin/src/gradleTest/simple/build.gradle | 7 +- plugin/src/gradleTest/simple/build.gradle.kts | 6 + plugin/src/gradleTest/simple/gradle-env.json | 123 ++++++++++++++++++ 8 files changed, 295 insertions(+), 8 deletions(-) create mode 100644 plugin/src/gradleTest/projectWithBuildSrc/buildSrc/gradle-env.json create mode 100644 plugin/src/gradleTest/projectWithBuildSrc/gradle-env.json create mode 100644 plugin/src/gradleTest/simple/gradle-env.json diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 5d5bca8..9e2ac30 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -40,11 +40,6 @@ tasks { kotlinDsl = true } - register("gradle2nixTest", Test::class) { - dependsOn(gradleTest) - - } - gradleTestGenerator { dependsOn(shadowJar) doLast { diff --git a/plugin/src/gradleTest/projectWithBuildSrc/build.gradle b/plugin/src/gradleTest/projectWithBuildSrc/build.gradle index 1a29485..577ffe7 100644 --- a/plugin/src/gradleTest/projectWithBuildSrc/build.gradle +++ b/plugin/src/gradleTest/projectWithBuildSrc/build.gradle @@ -1,3 +1,9 @@ -task runGradleTest { +tasks.register("runGradleTest") { dependsOn 'nixGradleEnv' -} \ No newline at end of file + + doLast { + assert file("gradle-env.json").text == file("gradle/nix/gradle-env.json").text: "Mismatch: gradle-env.json" + assert (file("buildSrc/gradle-env.json").text == file("buildSrc/gradle/nix/gradle-env.json").text) : + "Mismatch (buildSrc): gradle-env.json" + } +} diff --git a/plugin/src/gradleTest/projectWithBuildSrc/build.gradle.kts b/plugin/src/gradleTest/projectWithBuildSrc/build.gradle.kts index c77bb76..7bc130a 100644 --- a/plugin/src/gradleTest/projectWithBuildSrc/build.gradle.kts +++ b/plugin/src/gradleTest/projectWithBuildSrc/build.gradle.kts @@ -1,3 +1,12 @@ tasks.register("runGradleTest") { dependsOn("nixGradleEnv") + + doLast { + assert(file("gradle-env.json").readText() == file("gradle/nix/gradle-env.json").readText()) { + "Mismatch: gradle-env.json" + } + assert(file("buildSrc/gradle-env.json").readText() == file("buildSrc/gradle/nix/gradle-env.json").readText()) { + "Mismatch (buildSrc): gradle-env.json" + } + } } diff --git a/plugin/src/gradleTest/projectWithBuildSrc/buildSrc/gradle-env.json b/plugin/src/gradleTest/projectWithBuildSrc/buildSrc/gradle-env.json new file mode 100644 index 0000000..a94a5ac --- /dev/null +++ b/plugin/src/gradleTest/projectWithBuildSrc/buildSrc/gradle-env.json @@ -0,0 +1,121 @@ +{ + ":": { + "plugins": { + "path": ":", + "env": "plugins", + "repositories": [], + "artifacts": [] + }, + "buildscript": { + "path": ":", + "env": "buildscript", + "repositories": [], + "artifacts": [] + }, + "project": { + "path": ":", + "env": "project", + "repositories": [ + "https://jcenter.bintray.com/" + ], + "artifacts": [ + { + "groupId": "com.squareup.moshi", + "artifactId": "moshi-parent", + "version": "1.8.0", + "classifier": "", + "extension": "pom", + "sha256": "2t8UzX/uSexrgqkORdccwax1imVTFwGtlNy+98xgP7c=" + }, + { + "groupId": "com.squareup.moshi", + "artifactId": "moshi", + "version": "1.8.0", + "classifier": "", + "extension": "jar", + "sha256": "Qv50bSaU6hH+agK+zZ2iyj2v6Xye/VCg+a9cRZbnSmo=" + }, + { + "groupId": "com.squareup.moshi", + "artifactId": "moshi", + "version": "1.8.0", + "classifier": "", + "extension": "pom", + "sha256": "FLuAWbnddiACWSkN+IfjfmaaB0qsnImUAePIEC/lII8=" + }, + { + "groupId": "com.squareup.okio", + "artifactId": "okio", + "version": "2.2.2", + "classifier": "", + "extension": "jar", + "sha256": "5YyXQGprsROIk3UCmaxjxqoEs4trSerhv8rRpj75uhs=" + }, + { + "groupId": "com.squareup.okio", + "artifactId": "okio", + "version": "2.2.2", + "classifier": "", + "extension": "pom", + "sha256": "/WIZiPf2lXAlc13G3QkLAKIPOju413ynkDYHf2KbFAs=" + }, + { + "groupId": "org.jetbrains.kotlin", + "artifactId": "kotlin-stdlib-common", + "version": "1.2.60", + "classifier": "", + "extension": "jar", + "sha256": "CbQ3WgZc8SeryZjF3PIrFmTEWvQrSJSZ16j0+Kt5P7E=" + }, + { + "groupId": "org.jetbrains.kotlin", + "artifactId": "kotlin-stdlib-common", + "version": "1.2.60", + "classifier": "", + "extension": "pom", + "sha256": "gwwnrx4c8k8PUm6kV5AcQ/OMGbtvfl03Y8PSU98bjaE=" + }, + { + "groupId": "org.jetbrains.kotlin", + "artifactId": "kotlin-stdlib", + "version": "1.2.60", + "classifier": "", + "extension": "jar", + "sha256": "ahMCmPUXGsUqHiSW9+rnhbb1ZBbqPMuZ5DRNBNg/8HE=" + }, + { + "groupId": "org.jetbrains.kotlin", + "artifactId": "kotlin-stdlib", + "version": "1.2.60", + "classifier": "", + "extension": "pom", + "sha256": "5jKJkgnmtMqrlA/YLk7GOjLjJkP4Fff6cJdkeJDXnxg=" + }, + { + "groupId": "org.jetbrains", + "artifactId": "annotations", + "version": "13.0", + "classifier": "", + "extension": "jar", + "sha256": "rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=" + }, + { + "groupId": "org.jetbrains", + "artifactId": "annotations", + "version": "13.0", + "classifier": "", + "extension": "pom", + "sha256": "llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + { + "groupId": "org.sonatype.oss", + "artifactId": "oss-parent", + "version": "7", + "classifier": "", + "extension": "pom", + "sha256": "tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + } + ] + } + } +} \ No newline at end of file diff --git a/plugin/src/gradleTest/projectWithBuildSrc/gradle-env.json b/plugin/src/gradleTest/projectWithBuildSrc/gradle-env.json new file mode 100644 index 0000000..af4dfca --- /dev/null +++ b/plugin/src/gradleTest/projectWithBuildSrc/gradle-env.json @@ -0,0 +1,22 @@ +{ + ":": { + "plugins": { + "path": ":", + "env": "plugins", + "repositories": [], + "artifacts": [] + }, + "buildscript": { + "path": ":", + "env": "buildscript", + "repositories": [], + "artifacts": [] + }, + "project": { + "path": ":", + "env": "project", + "repositories": [], + "artifacts": [] + } + } +} \ No newline at end of file diff --git a/plugin/src/gradleTest/simple/build.gradle b/plugin/src/gradleTest/simple/build.gradle index b5a8b48..cb22c89 100644 --- a/plugin/src/gradleTest/simple/build.gradle +++ b/plugin/src/gradleTest/simple/build.gradle @@ -11,6 +11,11 @@ dependencies { implementation("com.squareup.moshi:moshi:1.8.0") } -task runGradleTest { +tasks.register("runGradleTest") { dependsOn 'nixGradleEnv' + + doLast { + assert file("gradle-env.json").text == file("gradle/nix/gradle-env.json").text : + "Mismatch: gradle-env.json" + } } diff --git a/plugin/src/gradleTest/simple/build.gradle.kts b/plugin/src/gradleTest/simple/build.gradle.kts index 9fcb227..daef9af 100644 --- a/plugin/src/gradleTest/simple/build.gradle.kts +++ b/plugin/src/gradleTest/simple/build.gradle.kts @@ -13,4 +13,10 @@ dependencies { tasks.register("runGradleTest") { dependsOn("nixGradleEnv") + + doLast { + assert(file("gradle-env.json").readText() == file("gradle/nix/gradle-env.json").readText()) { + "Mismatch: gradle-env.json" + } + } } diff --git a/plugin/src/gradleTest/simple/gradle-env.json b/plugin/src/gradleTest/simple/gradle-env.json new file mode 100644 index 0000000..385ab60 --- /dev/null +++ b/plugin/src/gradleTest/simple/gradle-env.json @@ -0,0 +1,123 @@ +{ + ":": { + "plugins": { + "path": ":", + "env": "plugins", + "repositories": [ + "https://plugins.gradle.org/m2" + ], + "artifacts": [] + }, + "buildscript": { + "path": ":", + "env": "buildscript", + "repositories": [], + "artifacts": [] + }, + "project": { + "path": ":", + "env": "project", + "repositories": [ + "https://jcenter.bintray.com/" + ], + "artifacts": [ + { + "groupId": "com.squareup.moshi", + "artifactId": "moshi-parent", + "version": "1.8.0", + "classifier": "", + "extension": "pom", + "sha256": "2t8UzX/uSexrgqkORdccwax1imVTFwGtlNy+98xgP7c=" + }, + { + "groupId": "com.squareup.moshi", + "artifactId": "moshi", + "version": "1.8.0", + "classifier": "", + "extension": "jar", + "sha256": "Qv50bSaU6hH+agK+zZ2iyj2v6Xye/VCg+a9cRZbnSmo=" + }, + { + "groupId": "com.squareup.moshi", + "artifactId": "moshi", + "version": "1.8.0", + "classifier": "", + "extension": "pom", + "sha256": "FLuAWbnddiACWSkN+IfjfmaaB0qsnImUAePIEC/lII8=" + }, + { + "groupId": "com.squareup.okio", + "artifactId": "okio", + "version": "2.2.2", + "classifier": "", + "extension": "jar", + "sha256": "5YyXQGprsROIk3UCmaxjxqoEs4trSerhv8rRpj75uhs=" + }, + { + "groupId": "com.squareup.okio", + "artifactId": "okio", + "version": "2.2.2", + "classifier": "", + "extension": "pom", + "sha256": "/WIZiPf2lXAlc13G3QkLAKIPOju413ynkDYHf2KbFAs=" + }, + { + "groupId": "org.jetbrains.kotlin", + "artifactId": "kotlin-stdlib-common", + "version": "1.2.60", + "classifier": "", + "extension": "jar", + "sha256": "CbQ3WgZc8SeryZjF3PIrFmTEWvQrSJSZ16j0+Kt5P7E=" + }, + { + "groupId": "org.jetbrains.kotlin", + "artifactId": "kotlin-stdlib-common", + "version": "1.2.60", + "classifier": "", + "extension": "pom", + "sha256": "gwwnrx4c8k8PUm6kV5AcQ/OMGbtvfl03Y8PSU98bjaE=" + }, + { + "groupId": "org.jetbrains.kotlin", + "artifactId": "kotlin-stdlib", + "version": "1.2.60", + "classifier": "", + "extension": "jar", + "sha256": "ahMCmPUXGsUqHiSW9+rnhbb1ZBbqPMuZ5DRNBNg/8HE=" + }, + { + "groupId": "org.jetbrains.kotlin", + "artifactId": "kotlin-stdlib", + "version": "1.2.60", + "classifier": "", + "extension": "pom", + "sha256": "5jKJkgnmtMqrlA/YLk7GOjLjJkP4Fff6cJdkeJDXnxg=" + }, + { + "groupId": "org.jetbrains", + "artifactId": "annotations", + "version": "13.0", + "classifier": "", + "extension": "jar", + "sha256": "rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=" + }, + { + "groupId": "org.jetbrains", + "artifactId": "annotations", + "version": "13.0", + "classifier": "", + "extension": "pom", + "sha256": "llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + { + "groupId": "org.sonatype.oss", + "artifactId": "oss-parent", + "version": "7", + "classifier": "", + "extension": "pom", + "sha256": "tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + } + ] + } + } +} \ No newline at end of file