From 09b5bfb11a4d096095ff08eee26f1d774c057402 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Mon, 3 Jun 2019 15:47:34 -0700 Subject: [PATCH] Remove gradleTest source --- .../projectWithBuildSrc/build.gradle | 9 -- .../projectWithBuildSrc/build.gradle.kts | 12 -- .../projectWithBuildSrc/buildSrc/build.gradle | 10 -- .../buildSrc/gradle-env.json | 121 ----------------- .../buildSrc/settings.gradle | 0 .../projectWithBuildSrc/gradle-env.json | 22 ---- plugin/src/gradleTest/simple/build.gradle | 21 --- plugin/src/gradleTest/simple/build.gradle.kts | 22 ---- plugin/src/gradleTest/simple/gradle-env.json | 123 ------------------ 9 files changed, 340 deletions(-) delete mode 100644 plugin/src/gradleTest/projectWithBuildSrc/build.gradle delete mode 100644 plugin/src/gradleTest/projectWithBuildSrc/build.gradle.kts delete mode 100644 plugin/src/gradleTest/projectWithBuildSrc/buildSrc/build.gradle delete mode 100644 plugin/src/gradleTest/projectWithBuildSrc/buildSrc/gradle-env.json delete mode 100644 plugin/src/gradleTest/projectWithBuildSrc/buildSrc/settings.gradle delete mode 100644 plugin/src/gradleTest/projectWithBuildSrc/gradle-env.json delete mode 100644 plugin/src/gradleTest/simple/build.gradle delete mode 100644 plugin/src/gradleTest/simple/build.gradle.kts delete mode 100644 plugin/src/gradleTest/simple/gradle-env.json diff --git a/plugin/src/gradleTest/projectWithBuildSrc/build.gradle b/plugin/src/gradleTest/projectWithBuildSrc/build.gradle deleted file mode 100644 index 577ffe7..0000000 --- a/plugin/src/gradleTest/projectWithBuildSrc/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -tasks.register("runGradleTest") { - dependsOn 'nixGradleEnv' - - 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 deleted file mode 100644 index 7bc130a..0000000 --- a/plugin/src/gradleTest/projectWithBuildSrc/build.gradle.kts +++ /dev/null @@ -1,12 +0,0 @@ -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/build.gradle b/plugin/src/gradleTest/projectWithBuildSrc/buildSrc/build.gradle deleted file mode 100644 index 30b6e18..0000000 --- a/plugin/src/gradleTest/projectWithBuildSrc/buildSrc/build.gradle +++ /dev/null @@ -1,10 +0,0 @@ -apply plugin: "java" - -repositories { - jcenter() -} - -dependencies { - implementation("com.squareup.okio:okio:2.2.2") - implementation("com.squareup.moshi:moshi:1.8.0") -} diff --git a/plugin/src/gradleTest/projectWithBuildSrc/buildSrc/gradle-env.json b/plugin/src/gradleTest/projectWithBuildSrc/buildSrc/gradle-env.json deleted file mode 100644 index a94a5ac..0000000 --- a/plugin/src/gradleTest/projectWithBuildSrc/buildSrc/gradle-env.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - ":": { - "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/buildSrc/settings.gradle b/plugin/src/gradleTest/projectWithBuildSrc/buildSrc/settings.gradle deleted file mode 100644 index e69de29..0000000 diff --git a/plugin/src/gradleTest/projectWithBuildSrc/gradle-env.json b/plugin/src/gradleTest/projectWithBuildSrc/gradle-env.json deleted file mode 100644 index af4dfca..0000000 --- a/plugin/src/gradleTest/projectWithBuildSrc/gradle-env.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - ":": { - "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 deleted file mode 100644 index cb22c89..0000000 --- a/plugin/src/gradleTest/simple/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -plugins { - id 'java' -} - -repositories { - jcenter() -} - -dependencies { - implementation("com.squareup.okio:okio:2.2.2") - implementation("com.squareup.moshi:moshi:1.8.0") -} - -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 deleted file mode 100644 index daef9af..0000000 --- a/plugin/src/gradleTest/simple/build.gradle.kts +++ /dev/null @@ -1,22 +0,0 @@ -plugins { - java -} - -repositories { - jcenter() -} - -dependencies { - implementation("com.squareup.okio:okio:2.2.2") - implementation("com.squareup.moshi:moshi:1.8.0") -} - -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 deleted file mode 100644 index 385ab60..0000000 --- a/plugin/src/gradleTest/simple/gradle-env.json +++ /dev/null @@ -1,123 +0,0 @@ -{ - ":": { - "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