Skip to content

Commit

Permalink
chore: plugin refactorings
Browse files Browse the repository at this point in the history
  • Loading branch information
@sureshg
sureshg committed Oct 23, 2024
1 parent 24c7fc3 commit dc4f855
Show file tree
Hide file tree
Showing 15 changed files with 624 additions and 668 deletions.
4 changes: 4 additions & 0 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ org.gradle.unsafe.isolated-projects=false
kotlin.code.style=official
kotlin.jvm.target.validation.mode=warning

## Dokka
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true

# Project
semver.tagPrefix=v
semver.project.tagPrefix=v
Expand Down
71 changes: 35 additions & 36 deletions gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[versions]
java = "24"
kotlin = "2.1.0-Beta1"
kotlin-ksp = "2.1.0-Beta1-1.0.25"
kotlin-jvmtarget = "22"
kotlin = "2.1.0-Beta2"
kotlin-ksp = "2.1.0-Beta2-1.0.25"
kotlin-jvmtarget = "21"
kotlin-dsl-jvmtarget = "21"
kotlin-api-version = "2.1"
kotlin-lang-version = "2.1"
gradle = "8.10.2"
gradle = "8.11-rc-1"
java-vendor = "Oracle"
java-jvmArguments = "--enable-preview"
java-addModules = "jdk.incubator.vector"
Expand All @@ -22,7 +22,7 @@ org-url = "https://suresh.dev"
# Gradle Dependencies Versions
kotlinx-kover = "0.9.0-RC"
kotlinx-io = "0.5.4"
kotlinx-atomicfu = "0.25.0"
kotlinx-atomicfu = "0.26.0"
kotlinx-coroutines = "1.9.0"
kotlinx-datetime = "0.6.1"
kotlinx-serialization = "1.7.3"
Expand All @@ -31,18 +31,18 @@ kotlinx-collections-immutable = "0.3.8"
kotlinx-lincheck = "2.34"
kotlinx-html = "0.11.0"
kotlinx-browser = "0.2"
kotlinx-benchmark = "0.4.11"
kotlinx-benchmark = "0.4.12"
kotlinx-metadata = "0.9.0"
kotlinx-reflect-lite = "1.1.0"
kotlinx-bcv = "0.16.3"
kotlin-dokka = "1.9.20"
kotlin-wrappers = "1.0.0-pre.817"
kotlin-dokka = "2.0.0-Beta"
kotlin-wrappers = "1.0.0-pre.820"
kotlin-redacted = "1.11.0-alpha01"
kotlinx-multik = "0.2.3"
kotlinx-dataframe = "0.13.1"
kotlinx-kandy = "0.5.0"
evas = "1.1.0"
kopy = "0.11.0+2.0.20"
kopy = "0.12.0+2.0.21"
poko = "0.17.2"
mappie = "0.8.0"
akkurate = "0.10.0"
Expand All @@ -53,11 +53,11 @@ spring-boot = "3.3.4"
spring-depmgmt = "1.1.6"
ktor = "3.0.0"
ktor-cohort = "2.5.1"
otel = "1.42.1"
otel = "1.43.0"
otel-instr = "2.9.0"
otel-instr-alpha = "2.8.0-alpha"
otel-semconv = "1.27.0-alpha"
otel-samplers = "1.39.0-alpha"
otel-instr-alpha = "2.9.0-alpha"
otel-semconv = "1.28.0-alpha"
otel-samplers = "1.40.0-alpha"
elastic-otel = "0.4.0"
okio = "3.9.1"
sslcontext-kickstart = "8.3.7"
Expand All @@ -76,17 +76,17 @@ jte = "3.1.13"
jimfs = "1.3.0"
sshj = "0.38.0"
jsch = "0.2.20"
pty4j = "0.13.0"
junit = "5.11.2"
pty4j = "0.13.2"
junit = "5.11.3"
koin = "4.0.0"
kotest = "6.0.0.M1"
mockk = "1.13.13"
mokkery = "2.4.0"
wiremock = "3.9.1"
wiremock = "3.9.2"
wiremock-kotlin = "2.1.1"
okhttp = "5.0.0-alpha.14"
slf4j = "2.1.0-alpha1"
logback = "1.5.9"
logback = "1.5.11"
logback-tyler = "0.7"
log4j = "3.0.0-beta2"
jmh = "1.37"
Expand All @@ -111,9 +111,9 @@ kotlin-cryptography = "0.4.0"
uri-kmp = "0.0.18"
urlencoder = "1.5.0"
bytesize = "2.0.0-beta04"
cash-turbine = "1.1.0"
cash-turbine = "1.2.0"
cardiologist = "0.2.2"
kmp-store5 = "5.1.0-alpha05"
kmp-store5 = "5.1.0-alpha04"
kmp-settings = "1.2.0"
kmp-appdirs = "1.2.0"
parsus = "0.6.1"
Expand All @@ -125,37 +125,37 @@ exposed = "0.55.0"
postgresql = "42.7.4"
hikariCP = "6.0.0"
h2 = "2.3.232"
micrometer = "1.13.5"
micrometer = "1.13.3"
swagger-ui = "5.17.14"
hoplite = "2.8.0"
config4k = "0.6.0"
shedlock = "5.15.0"
sherlock = "1.0.1"
sqids = "0.1.0"
tsid = "2.1.1"
expiringmap = "0.5.11"
expiringmap = "0.5.10"
otp = "2.0.3"
password4j = "1.8.2"
apache-commons-imaging = "1.0-alpha3"
testcontainers = "1.20.2"
testcontainers = "1.20.3"
sourceBuddy = "2.5.0"
tcp-javanioproxy = "1.6"
kubernetes-client = "21.0.1"
kubernetes-client = "21.0.2"
reflect-typeparamresolver = "1.0.2"
reflect-typetools = "0.6.3"
async-profiler = "3.0"
ap-loader-all = "3.0-9"
openjdk-jmc = "9.0.0"
airlift-aircompressor = "2.0.2"
airlift-security = "273"
airlift-security = "275"
directory-keystore = "1.1.0"
maven-mima = "3.0.0-alpha-3"
maven-archeologist = "0.0.10"
jfree-chart = "1.5.5"
jfree-chart = "1.5.4"
jfree-svg = "5.0.6"
xchart = "3.8.7"
batik = "1.17"
twelvemonkeys = "3.10.1"
twelvemonkeys = "3.12.0"
okapibarcode = "0.4.1"
chasm = "0.7.1"
kfswatch = "1.3.0"
Expand All @@ -165,16 +165,16 @@ ldaptive = "2.3.2"
chicory = "0.0.12"

# Compose
jetbrains-compose = "1.7.0-rc01"
jetbrains-compose-viewmodel = "2.8.3-rc01"
jetbrains-compose = "1.7.0"
jetbrains-compose-viewmodel = "2.8.3"
jetbrains-compose-nav = "2.8.0-alpha10"
jetbrains-compose-adaptive = "1.0.0-rc01"
jetbrains-compose-adaptive = "1.0.0"
kobweb = "0.19.2"
detekt = "1.23.7"
detekt-compose-rules = "0.4.12"
detekt-compose-rules = "0.4.16"
compose-icons = "1.1.0"
compose-routing = "0.4.0"
kottie = "2.0.0"
kottie = "2.0.1"
mosaic = "0.14.0"

# NPM Dependencies
Expand All @@ -191,14 +191,14 @@ foojay-resolver = "0.8.0"
gradle-develocity = "3.18.1"
nmcp = "0.0.9"
nexus-publish = "2.0.0"
vanniktech-publish = "0.29.0"
vanniktech-publish = "0.30.0"
shadow = "8.3.3"
spotless = "7.0.0.BETA2"
spotless = "7.0.0.BETA3"
semver-plugin = "0.8.0"
tasktree = "4.0.0"
sigstore = "1.0.0"
reproducible-builds = "1.0"
autonomousapps-depanalysis = "2.1.4"
autonomousapps-depanalysis = "2.2.0"
autonomousapps-bestpractices = "0.10"
graalvm-nativeimage = "0.10.3"
github-depgraph = "0.1.0"
Expand All @@ -211,7 +211,7 @@ modulegraph = "0.10.1"
cash-molecule = "1.4.3"
npm-publish-plugin = "3.4.3"
exposed-plugin = "0.2.1"
jib-plugin = "3.4.3"
jib-plugin = "3.4.4"
jib-nativeimage-extn = "0.1.0"
includegit-plugin = "0.1.6"
kmp-hierarchy = "1.1"
Expand All @@ -238,7 +238,6 @@ build-kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicf
build-kotlinx-benchmark = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-plugin" , version.ref = "kotlinx-benchmark"}
build-kotlin-dsl = { module = "org.gradle.kotlin:gradle-kotlin-dsl-plugins" , version.ref = "gradle-kotlin-dsl"}
build-dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin" , version.ref = "kotlin-dokka"}
build-dokka-base = { module = "org.jetbrains.dokka:dokka-base" , version.ref = "kotlin-dokka"}
build-kotlin-ksp = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin" , version.ref = "kotlin-ksp"}
build-kopy-plugin = { module = "com.javiersc.kotlin:kopy-gradle-plugin" , version.ref = "kopy"}
build-redacted-plugin = { module = "dev.zacsweers.redacted:redacted-compiler-plugin-gradle" , version.ref = "kotlin-redacted"}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -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.11-rc-1-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
8 changes: 3 additions & 5 deletions plugins/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import gg.jte.gradle.GenerateJteTask
import org.jetbrains.kotlin.gradle.dsl.*

plugins {
// Just apply with `kotlin-dsl` id.
id("org.gradle.kotlin.kotlin-dsl")
// embeddedKotlin("jvm")
embeddedKotlin("plugin.serialization")
Expand Down Expand Up @@ -118,9 +117,6 @@ gradlePlugin {
}

dependencies {
// Hack to access version catalog from pre-compiled script plugins.
// https://github.com/gradle/gradle/issues/15383#issuecomment-779893192
implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
implementation(platform(libs.kotlin.bom))
implementation(libs.kotlin.stdlib)
implementation(libs.kotlinx.coroutines.core)
Expand Down Expand Up @@ -153,7 +149,6 @@ dependencies {
implementation(libs.build.kotlinx.benchmark)
implementation(libs.build.kotlinx.bcv)
implementation(libs.build.dokka.plugin)
implementation(libs.build.dokka.base)
implementation(libs.build.redacted.plugin)
implementation(libs.build.gradle.develocity)
implementation(libs.build.nmcp.plugin)
Expand All @@ -176,6 +171,9 @@ dependencies {
implementation(libs.build.kopy.plugin)
implementation(libs.build.tomlj)

// https://github.com/gradle/gradle/issues/15383#issuecomment-779893192
implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))

// implementation(libs.build.kotlin.compose.compiler)
// implementation(libs.build.karakum.plugin)
// implementation(libs.jte.native)
Expand Down
Loading

0 comments on commit dc4f855

Please sign in to comment.