From 65af9189659f520cf3250a1cee1abf6913c34f25 Mon Sep 17 00:00:00 2001
From: Tad Fisher <tad@simple.com>
Date: Tue, 4 Jun 2019 15:29:18 -0700
Subject: [PATCH] app: move static files to /share

---
 app/build.gradle.kts                                      | 8 +++-----
 .../gradle2nix => app/src/dist/share}/gradle-env.nix      | 0
 app/src/dist/{gradle => share}/init.gradle                | 0
 app/src/main/kotlin/org/nixos/gradle2nix/GradleRunner.kt  | 4 +---
 app/src/main/kotlin/org/nixos/gradle2nix/Main.kt          | 2 ++
 5 files changed, 6 insertions(+), 8 deletions(-)
 rename {plugin/src/main/resources/org/nixos/gradle2nix => app/src/dist/share}/gradle-env.nix (100%)
 rename app/src/dist/{gradle => share}/init.gradle (100%)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e8f8cd0..93e0a37 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -32,12 +32,10 @@ dependencies {
 application {
     mainClassName = "org.nixos.gradle2nix.MainKt"
     applicationName = "gradle2nix"
-    applicationDefaultJvmArgs += "-Dorg.nixos.gradle2nix.initScript=@APP_HOME@/gradle/init.gradle"
+    applicationDefaultJvmArgs += "-Dorg.nixos.gradle2nix.share=@APP_HOME@/share"
     applicationDistribution
-        .from(
-            tasks.getByPath(":plugin:shadowJar"),
-            project(":plugin").file("src/main/resources/init.gradle"))
-        .into("gradle")
+        .from(tasks.getByPath(":plugin:shadowJar"))
+        .into("share")
         .rename("plugin.*\\.jar", "plugin.jar")
 }
 
diff --git a/plugin/src/main/resources/org/nixos/gradle2nix/gradle-env.nix b/app/src/dist/share/gradle-env.nix
similarity index 100%
rename from plugin/src/main/resources/org/nixos/gradle2nix/gradle-env.nix
rename to app/src/dist/share/gradle-env.nix
diff --git a/app/src/dist/gradle/init.gradle b/app/src/dist/share/init.gradle
similarity index 100%
rename from app/src/dist/gradle/init.gradle
rename to app/src/dist/share/init.gradle
diff --git a/app/src/main/kotlin/org/nixos/gradle2nix/GradleRunner.kt b/app/src/main/kotlin/org/nixos/gradle2nix/GradleRunner.kt
index f0582ec..bb46b6b 100644
--- a/app/src/main/kotlin/org/nixos/gradle2nix/GradleRunner.kt
+++ b/app/src/main/kotlin/org/nixos/gradle2nix/GradleRunner.kt
@@ -3,8 +3,6 @@ package org.nixos.gradle2nix
 import org.gradle.tooling.GradleConnector
 import org.gradle.tooling.ProjectConnection
 
-private val initScript: String = System.getProperty("org.nixos.gradle2nix.initScript")
-
 fun connect(config: Config): ProjectConnection =
     GradleConnector.newConnector()
         .apply {
@@ -19,7 +17,7 @@ fun connect(config: Config): ProjectConnection =
 
 fun ProjectConnection.getBuildModel(config: Config, path: String): DefaultBuild {
     val arguments = mutableListOf(
-        "--init-script=$initScript",
+        "--init-script=$shareDir/init.gradle",
         "-Dorg.nixos.gradle2nix.configurations='${config.configurations.joinToString(",")}'"
     )
 
diff --git a/app/src/main/kotlin/org/nixos/gradle2nix/Main.kt b/app/src/main/kotlin/org/nixos/gradle2nix/Main.kt
index 0a68c3f..0fdff2b 100644
--- a/app/src/main/kotlin/org/nixos/gradle2nix/Main.kt
+++ b/app/src/main/kotlin/org/nixos/gradle2nix/Main.kt
@@ -16,6 +16,8 @@ import okio.buffer
 import okio.sink
 import java.io.File
 
+val shareDir: String = System.getProperty("org.nixos.gradle2nix.share")
+
 data class Config(
     val wrapper: Boolean,
     val gradleVersion: String?,