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

Compare commits

merge into: sbl:tad/nixpkgs-update
Branches Tags
sbl:master sbl:v2 sbl:tad/nixpkgs-update sbl:s3 sbl:flake sbl:extraInit sbl:lenient-configs sbl:custom-resolver sbl:explicit-subprojects
sbl:v1.0.0-rc2 sbl:v1.0.0-rc1
...
pull from: sbl:v2
Branches Tags
sbl:v2 sbl:tad/nixpkgs-update sbl:master sbl:s3 sbl:flake sbl:extraInit sbl:lenient-configs sbl:custom-resolver sbl:explicit-subprojects
sbl:v1.0.0-rc2 sbl:v1.0.0-rc1

3 Commits
tad/nixpkg ... v2

Author SHA1 Message Date
Tad Fisher
30cfe58891 Update for Gradle 8.14.3 2025-08-22 15:43:11 -07:00
Tad Fisher
53672d5e87 flake: Fix builders.{system}.default 2025-08-22 15:10:58 -07:00
Tad Fisher
293ecbdc10 Update for Gradle 8.13 2025-04-02 14:31:27 -07:00
9 changed files with 54 additions and 56 deletions
Expand all files Collapse all files

28
fixtures/golden/buildsrc/plugin-in-buildsrc.kotlin.json
View File

@@ -57,24 +57,24 @@
"hash": "sha256-OFbj/NFpUC1fEv4kUmBOv2x8Al8VZWv6VY6pntKdc+o=" "hash": "sha256-OFbj/NFpUC1fEv4kUmBOv2x8Al8VZWv6VY6pntKdc+o="
} }
}, },
"org.gradle.kotlin:gradle-kotlin-dsl-plugins:5.1.2": { "org.gradle.kotlin:gradle-kotlin-dsl-plugins:5.2.0": {
"gradle-kotlin-dsl-plugins-5.1.2.jar": { "gradle-kotlin-dsl-plugins-5.2.0.jar": {
"url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.1.2/gradle-kotlin-dsl-plugins-5.1.2.jar", "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.2.0/gradle-kotlin-dsl-plugins-5.2.0.jar",
"hash": "sha256-tYw+XDWgAln9QC3r89pHqjrQhcP0vnL5AuoSYbNQGa4=" "hash": "sha256-SKlcMPRlehDfloYC01LJ2GTZemYholfoFQjINWDE/q4="
}, },
"gradle-kotlin-dsl-plugins-5.1.2.module": { "gradle-kotlin-dsl-plugins-5.2.0.module": {
"url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.1.2/gradle-kotlin-dsl-plugins-5.1.2.module", "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.2.0/gradle-kotlin-dsl-plugins-5.2.0.module",
"hash": "sha256-CPnVxzwOvolk4aq3z59G93inhCcxnZJ52ZKoRBPIXPM=" "hash": "sha256-fxo3x8yLU7tmBAqrbAacidiqWOJ/+nH3s2HGROtaD7A="
}, },
"gradle-kotlin-dsl-plugins-5.1.2.pom": { "gradle-kotlin-dsl-plugins-5.2.0.pom": {
"url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.1.2/gradle-kotlin-dsl-plugins-5.1.2.pom", "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.2.0/gradle-kotlin-dsl-plugins-5.2.0.pom",
"hash": "sha256-Y4Th1GwfBKl4Go/Pl6nFQ5YPNNoKZ/XQI2x8EubcvqU=" "hash": "sha256-uB9ZcQ4lOEW0+Pbe27BWPWfD5/UPg7AiQZXjo2GAtH8="
} }
}, },
"org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:5.1.2": { "org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:5.2.0": {
"org.gradle.kotlin.kotlin-dsl.gradle.plugin-5.1.2.pom": { "org.gradle.kotlin.kotlin-dsl.gradle.plugin-5.2.0.pom": {
"url": "https://plugins.gradle.org/m2/org/gradle/kotlin/kotlin-dsl/org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.1.2/org.gradle.kotlin.kotlin-dsl.gradle.plugin-5.1.2.pom", "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/kotlin-dsl/org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.2.0/org.gradle.kotlin.kotlin-dsl.gradle.plugin-5.2.0.pom",
"hash": "sha256-1JPwqwDRfMB4Zduo3oQAo5CJ1SpxzkFtyQOlEsXe1V0=" "hash": "sha256-pXu0ObpCYKJW8tYIRx1wgRiQd6Ck3fsCjdGBe+W8Ejc="
} }
}, },
"org.jetbrains:annotations:13.0": { "org.jetbrains:annotations:13.0": {

6
flake.lock generated
View File

@@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1737469691, "lastModified": 1755615617,
"narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", "rev": "20075955deac2583bb12f07151c2df830ef346b4",
"type": "github" "type": "github"
}, },
"original": { "original": {

11
flake.nix
View File

@@ -7,11 +7,10 @@
}; };
outputs = outputs =
{ { self
self, , flake-utils
flake-utils, , nixpkgs
nixpkgs, , ...
...
}: }:
flake-utils.lib.eachDefaultSystem ( flake-utils.lib.eachDefaultSystem (
system: system:
@@ -23,7 +22,7 @@
{ {
builders = { builders = {
inherit (scope) buildGradlePackage buildMavenRepo; inherit (scope) buildGradlePackage buildMavenRepo;
default = self.packages.${system}.buildGradlePackage; default = self.builders.${system}.buildGradlePackage;
}; };
packages = { packages = {

48
gradle.lock
View File

@@ -567,38 +567,38 @@
"hash": "sha256-00QQSm7mGdplmEA8JdA6qqrw9U6WRv01EkWN9Xyarrg=" "hash": "sha256-00QQSm7mGdplmEA8JdA6qqrw9U6WRv01EkWN9Xyarrg="
} }
}, },
"org.gradle:gradle-tooling-api:8.12": { "org.gradle:gradle-tooling-api:8.14.3": {
"gradle-tooling-api-8.12.jar": { "gradle-tooling-api-8.14.3.jar": {
"url": "https://repo.gradle.org/gradle/libs-releases/org/gradle/gradle-tooling-api/8.12/gradle-tooling-api-8.12.jar", "url": "https://repo.gradle.org/gradle/libs-releases/org/gradle/gradle-tooling-api/8.14.3/gradle-tooling-api-8.14.3.jar",
"hash": "sha256-E83CJbXoqfUumQ1GWNnmPGrz8DAc0VWv2Ulpm5UP5Mk=" "hash": "sha256-vBe7VVz8xs5jn3GsbU641ujeXrawq7H+x2CNmEWGsb4="
}, },
"gradle-tooling-api-8.12.module": { "gradle-tooling-api-8.14.3.module": {
"url": "https://repo.gradle.org/gradle/libs-releases/org/gradle/gradle-tooling-api/8.12/gradle-tooling-api-8.12.module", "url": "https://repo.gradle.org/gradle/libs-releases/org/gradle/gradle-tooling-api/8.14.3/gradle-tooling-api-8.14.3.module",
"hash": "sha256-WUNWwl7AANbkn6vxhnKU9CQhh73Ay3DaCSoZkHlP/lQ=" "hash": "sha256-zLPSOpDK1upkzmpd+BdqQwX9pUiULfc5tDsudSqS/xM="
}, },
"gradle-tooling-api-8.12.pom": { "gradle-tooling-api-8.14.3.pom": {
"url": "https://repo.gradle.org/gradle/libs-releases/org/gradle/gradle-tooling-api/8.12/gradle-tooling-api-8.12.pom", "url": "https://repo.gradle.org/gradle/libs-releases/org/gradle/gradle-tooling-api/8.14.3/gradle-tooling-api-8.14.3.pom",
"hash": "sha256-TOuw8aZAUe7Q69OhyGG5VMkUAhMYOFFoRX5Ztgz1SKI=" "hash": "sha256-YMbw6a3xU4bIbmL/o+rS0BYH5WqxtIhXIkMN7IDuvbo="
} }
}, },
"org.gradle.kotlin:gradle-kotlin-dsl-plugins:5.1.2": { "org.gradle.kotlin:gradle-kotlin-dsl-plugins:5.2.0": {
"gradle-kotlin-dsl-plugins-5.1.2.jar": { "gradle-kotlin-dsl-plugins-5.2.0.jar": {
"url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.1.2/gradle-kotlin-dsl-plugins-5.1.2.jar", "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.2.0/gradle-kotlin-dsl-plugins-5.2.0.jar",
"hash": "sha256-tYw+XDWgAln9QC3r89pHqjrQhcP0vnL5AuoSYbNQGa4=" "hash": "sha256-SKlcMPRlehDfloYC01LJ2GTZemYholfoFQjINWDE/q4="
}, },
"gradle-kotlin-dsl-plugins-5.1.2.module": { "gradle-kotlin-dsl-plugins-5.2.0.module": {
"url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.1.2/gradle-kotlin-dsl-plugins-5.1.2.module", "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.2.0/gradle-kotlin-dsl-plugins-5.2.0.module",
"hash": "sha256-CPnVxzwOvolk4aq3z59G93inhCcxnZJ52ZKoRBPIXPM=" "hash": "sha256-fxo3x8yLU7tmBAqrbAacidiqWOJ/+nH3s2HGROtaD7A="
}, },
"gradle-kotlin-dsl-plugins-5.1.2.pom": { "gradle-kotlin-dsl-plugins-5.2.0.pom": {
"url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.1.2/gradle-kotlin-dsl-plugins-5.1.2.pom", "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/gradle-kotlin-dsl-plugins/5.2.0/gradle-kotlin-dsl-plugins-5.2.0.pom",
"hash": "sha256-Y4Th1GwfBKl4Go/Pl6nFQ5YPNNoKZ/XQI2x8EubcvqU=" "hash": "sha256-uB9ZcQ4lOEW0+Pbe27BWPWfD5/UPg7AiQZXjo2GAtH8="
} }
}, },
"org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:5.1.2": { "org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:5.2.0": {
"org.gradle.kotlin.kotlin-dsl.gradle.plugin-5.1.2.pom": { "org.gradle.kotlin.kotlin-dsl.gradle.plugin-5.2.0.pom": {
"url": "https://plugins.gradle.org/m2/org/gradle/kotlin/kotlin-dsl/org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.1.2/org.gradle.kotlin.kotlin-dsl.gradle.plugin-5.1.2.pom", "url": "https://plugins.gradle.org/m2/org/gradle/kotlin/kotlin-dsl/org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.2.0/org.gradle.kotlin.kotlin-dsl.gradle.plugin-5.2.0.pom",
"hash": "sha256-1JPwqwDRfMB4Zduo3oQAo5CJ1SpxzkFtyQOlEsXe1V0=" "hash": "sha256-pXu0ObpCYKJW8tYIRx1wgRiQd6Ck3fsCjdGBe+W8Ejc="
} }
}, },
"org.jdom:jdom2:2.0.6.1": { "org.jdom:jdom2:2.0.6.1": {

2
gradle/libs.versions.toml
View File

@@ -1,5 +1,5 @@
[versions] [versions]
gradle = "8.12" gradle = "8.14.3"
junit = "5.8.2" junit = "5.8.2"
# Intentionally using the version embedded in Gradle to reduce dependency count # Intentionally using the version embedded in Gradle to reduce dependency count
# See https://docs.gradle.org/current/userguide/compatibility.html#kotlin # See https://docs.gradle.org/current/userguide/compatibility.html#kotlin

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

9
gradlew vendored
View File

@@ -86,8 +86,7 @@ done
# shellcheck disable=SC2034 # shellcheck disable=SC2034
APP_BASE_NAME=${0##*/} APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;; NONSTOP* ) nonstop=true ;;
esac esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar CLASSPATH="\\\"\\\""
# Determine the Java command to use to start the JVM. # Determine the Java command to use to start the JVM.
@@ -206,7 +205,7 @@ fi
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command: # Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped. # and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line. # treated as '${Hostname}' itself on the command line.
@@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
set -- \ set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \ "-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \ -classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@" "$@"
# Stop when "xargs" is not available. # Stop when "xargs" is not available.

4
gradlew.bat vendored
View File

@@ -70,11 +70,11 @@ goto fail
:execute :execute
@rem Setup the command line @rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar set CLASSPATH=
@rem Execute Gradle @rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
:end :end
@rem End local scope for the variables with windows NT shell @rem End local scope for the variables with windows NT shell