mirror of
https://github.com/tadfisher/gradle2nix.git
synced 2026-01-11 15:30:38 -05:00
Bump gradle to nixos-unstable (8.12)
This commit is contained in:
@@ -49,6 +49,9 @@ kotlin {
|
||||
compilerOptions {
|
||||
jvmTarget.set(JvmTarget.JVM_1_8)
|
||||
optIn.add("kotlin.RequiresOptIn")
|
||||
freeCompilerArgs.addAll(
|
||||
"-Xconsistent-data-class-copy-visibility"
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@ package org.nixos.gradle2nix
|
||||
|
||||
import com.github.ajalt.clikt.core.CliktCommand
|
||||
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.parameters.arguments.argument
|
||||
import com.github.ajalt.clikt.parameters.arguments.multiple
|
||||
|
||||
@@ -23,6 +23,7 @@ kotlin.compilerOptions {
|
||||
optIn.add("kotlin.RequiresOptIn")
|
||||
freeCompilerArgs.addAll(
|
||||
listOf(
|
||||
"-Xconsistent-data-class-copy-visibility",
|
||||
"-Xskip-prerelease-check",
|
||||
"-Xsuppress-version-warnings",
|
||||
// We have to override the default value for `-Xsam-conversions` to `class`
|
||||
|
||||
2302
gradle.lock
2302
gradle.lock
File diff suppressed because it is too large
Load Diff
@@ -1,15 +1,15 @@
|
||||
[versions]
|
||||
gradle = "8.10.2"
|
||||
gradle = "8.12"
|
||||
junit = "5.8.2"
|
||||
# Intentionally using the version embedded in Gradle to reduce dependency count
|
||||
# See https://docs.gradle.org/current/userguide/compatibility.html#kotlin
|
||||
kotlin = { strictly = "1.9.24" }
|
||||
kotlin = { strictly = "2.0.21" }
|
||||
ktor = "3.0.2"
|
||||
kotest = "6.0.0.M1"
|
||||
shadow = "8.1.8"
|
||||
|
||||
[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-75 = "dev.gradleplugins:gradle-api:7.5"
|
||||
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-runner = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" }
|
||||
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-netty = { module = "io.ktor:ktor-server-netty", version.ref = "ktor" }
|
||||
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"
|
||||
|
||||
[plugins]
|
||||
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
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
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
Reference in New Issue
Block a user