sbl/gradle2nix
1
0
Fork 0
mirror of https://github.com/tadfisher/gradle2nix.git synced 2026-01-12 07:50:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Bump gradle to nixos-unstable (8.12)

Browse Source
This commit is contained in:
Tad Fisher
2025-01-22 14:07:02 -08:00
parent 854024b721
commit effc6f3c8b
6 changed files with 577 additions and 1742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle.kts
View File

@@ -49,6 +49,9 @@ kotlin {
compilerOptions { compilerOptions {
jvmTarget.set(JvmTarget.JVM_1_8) jvmTarget.set(JvmTarget.JVM_1_8)
optIn.add("kotlin.RequiresOptIn") optIn.add("kotlin.RequiresOptIn")
freeCompilerArgs.addAll(
"-Xconsistent-data-class-copy-visibility"
)
} }
} }

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

@@ -2,6 +2,7 @@ package org.nixos.gradle2nix
import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.core.CliktCommand
import com.github.ajalt.clikt.core.context import com.github.ajalt.clikt.core.context
import com.github.ajalt.clikt.core.main
import com.github.ajalt.clikt.output.MordantHelpFormatter import com.github.ajalt.clikt.output.MordantHelpFormatter
import com.github.ajalt.clikt.parameters.arguments.argument import com.github.ajalt.clikt.parameters.arguments.argument
import com.github.ajalt.clikt.parameters.arguments.multiple import com.github.ajalt.clikt.parameters.arguments.multiple

1
buildSrc/src/main/kotlin/gradle-kotlin-conventions.gradle.kts
View File

@@ -23,6 +23,7 @@ kotlin.compilerOptions {
optIn.add("kotlin.RequiresOptIn") optIn.add("kotlin.RequiresOptIn")
freeCompilerArgs.addAll( freeCompilerArgs.addAll(
listOf( listOf(
"-Xconsistent-data-class-copy-visibility",
"-Xskip-prerelease-check", "-Xskip-prerelease-check",
"-Xsuppress-version-warnings", "-Xsuppress-version-warnings",
// We have to override the default value for `-Xsam-conversions` to `class` // We have to override the default value for `-Xsam-conversions` to `class`

2302
gradle.lock
View File

File diff suppressed because it is too large Load Diff

10
gradle/libs.versions.toml
View File

@@ -1,15 +1,15 @@
[versions] [versions]
gradle = "8.10.2" gradle = "8.12"
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
kotlin = { strictly = "1.9.24" } kotlin = { strictly = "2.0.21" }
ktor = "3.0.2" ktor = "3.0.2"
kotest = "6.0.0.M1" kotest = "6.0.0.M1"
shadow = "8.1.8" shadow = "8.1.8"
[libraries] [libraries]
clikt = "com.github.ajalt.clikt:clikt:4.4.0" clikt = "com.github.ajalt.clikt:clikt:5.0.2"
gradle-api-69 = "dev.gradleplugins:gradle-api:6.9" gradle-api-69 = "dev.gradleplugins:gradle-api:6.9"
gradle-api-75 = "dev.gradleplugins:gradle-api:7.5" gradle-api-75 = "dev.gradleplugins:gradle-api:7.5"
gradle-api-80 = "dev.gradleplugins:gradle-api:8.0" gradle-api-80 = "dev.gradleplugins:gradle-api:8.0"
@@ -20,11 +20,11 @@ gradle-toolingApi = { module = "org.gradle:gradle-tooling-api", version.ref = "g
kotest-assertions = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" } kotest-assertions = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }
kotest-runner = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" } kotest-runner = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
kotlinx-coroutines-core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1" kotlinx-coroutines-core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1"
ktor-server-core = { module = "io.ktor:ktor-server-core", version.ref = "ktor" } ktor-server-core = { module = "io.ktor:ktor-server-core", version.ref = "ktor" }
ktor-server-netty = { module = "io.ktor:ktor-server-netty", version.ref = "ktor" } ktor-server-netty = { module = "io.ktor:ktor-server-netty", version.ref = "ktor" }
okio = "com.squareup.okio:okio:3.9.1" okio = "com.squareup.okio:okio:3.9.1"
serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3" serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0"
slf4j-simple = "org.slf4j:slf4j-simple:1.7.36" slf4j-simple = "org.slf4j:slf4j-simple:1.7.36"
[plugins] [plugins]

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.10.2-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME