sbl/gradle2nix
1
0
Fork 0
mirror of https://github.com/tadfisher/gradle2nix.git synced 2026-01-11 15:30:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

app: move static files to /share

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
app/build.gradle.kts
View File

@@ -32,12 +32,10 @@ dependencies {
application { application {
mainClassName = "org.nixos.gradle2nix.MainKt" mainClassName = "org.nixos.gradle2nix.MainKt"
applicationName = "gradle2nix" applicationName = "gradle2nix"
applicationDefaultJvmArgs += "-Dorg.nixos.gradle2nix.initScript=@APP_HOME@/gradle/init.gradle" applicationDefaultJvmArgs += "-Dorg.nixos.gradle2nix.share=@APP_HOME@/share"
applicationDistribution applicationDistribution
.from( .from(tasks.getByPath(":plugin:shadowJar"))
tasks.getByPath(":plugin:shadowJar"), .into("share")
project(":plugin").file("src/main/resources/init.gradle"))
.into("gradle")
.rename("plugin.*\\.jar", "plugin.jar") .rename("plugin.*\\.jar", "plugin.jar")
} }

0
plugin/src/main/resources/org/nixos/gradle2nix/gradle-env.nix → app/src/dist/share/gradle-env.nix vendored
View File

0
app/src/dist/gradle/init.gradle → app/src/dist/share/init.gradle vendored
View File

4
app/src/main/kotlin/org/nixos/gradle2nix/GradleRunner.kt
View File

@@ -3,8 +3,6 @@ package org.nixos.gradle2nix
import org.gradle.tooling.GradleConnector import org.gradle.tooling.GradleConnector
import org.gradle.tooling.ProjectConnection import org.gradle.tooling.ProjectConnection
private val initScript: String = System.getProperty("org.nixos.gradle2nix.initScript")
fun connect(config: Config): ProjectConnection = fun connect(config: Config): ProjectConnection =
GradleConnector.newConnector() GradleConnector.newConnector()
.apply { .apply {
@@ -19,7 +17,7 @@ fun connect(config: Config): ProjectConnection =
fun ProjectConnection.getBuildModel(config: Config, path: String): DefaultBuild { fun ProjectConnection.getBuildModel(config: Config, path: String): DefaultBuild {
val arguments = mutableListOf( val arguments = mutableListOf(
"--init-script=$initScript", "--init-script=$shareDir/init.gradle",
"-Dorg.nixos.gradle2nix.configurations='${config.configurations.joinToString(",")}'" "-Dorg.nixos.gradle2nix.configurations='${config.configurations.joinToString(",")}'"
) )

2
app/src/main/kotlin/org/nixos/gradle2nix/Main.kt
View File

@@ -16,6 +16,8 @@ import okio.buffer
import okio.sink import okio.sink
import java.io.File import java.io.File
val shareDir: String = System.getProperty("org.nixos.gradle2nix.share")
data class Config( data class Config(
val wrapper: Boolean, val wrapper: Boolean,
val gradleVersion: String?, val gradleVersion: String?,