app: move static files to /share

This commit is contained in:
Tad Fisher
2019-06-04 15:29:18 -07:00
parent 987c03604b
commit 65af918965
5 changed files with 6 additions and 8 deletions

View File

@@ -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")
}

View File

@@ -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(",")}'"
)

View File

@@ -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?,