mirror of
https://github.com/tadfisher/gradle2nix.git
synced 2026-01-11 15:30:38 -05:00
app: move static files to /share
This commit is contained in:
@@ -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")
|
||||
}
|
||||
|
||||
|
||||
@@ -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(",")}'"
|
||||
)
|
||||
|
||||
|
||||
@@ -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?,
|
||||
|
||||
Reference in New Issue
Block a user