File tree Expand file tree Collapse file tree 4 files changed +18
-2
lines changed
Expand file tree Collapse file tree 4 files changed +18
-2
lines changed Original file line number Diff line number Diff line change @@ -9,6 +9,10 @@ dependencies {
99 exclude(module = " kotlin-android-extensions" )
1010 }
1111 implementation(libs.shadowPlugin)
12+
13+ // fix from the Gradle team: makes version catalog symbols available in build scripts
14+ // see here for more: https://github.com/gradle/gradle/issues/15383
15+ implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
1216}
1317
1418java {
Original file line number Diff line number Diff line change 11@file:Suppress(" HttpUrlsUsage" )
22
3+ import org.gradle.accessors.dm.LibrariesForLibs
4+
35plugins {
46 `java- library`
57 id(" pklKotlinTest" )
@@ -9,6 +11,9 @@ plugins {
911// make sources Jar available to other subprojects
1012val sourcesJarConfiguration = configurations.register(" sourcesJar" )
1113
14+ // Version Catalog library symbols.
15+ val libs = the<LibrariesForLibs >()
16+
1217java {
1318 withSourcesJar() // creates `sourcesJar` task
1419 withJavadocJar()
@@ -21,7 +26,7 @@ artifacts {
2126
2227spotless {
2328 java {
24- googleJavaFormat(" 1.15.0 " )
29+ googleJavaFormat(libs.versions.googleJavaFormat.get() )
2530 targetExclude(" **/generated/**" , " **/build/**" )
2631 licenseHeaderFile(rootProject.file(" buildSrc/src/main/resources/license-header.star-block.txt" ))
2732 }
Original file line number Diff line number Diff line change 1+ import org.gradle.accessors.dm.LibrariesForLibs
2+
13plugins {
24 id(" pklJavaLibrary" )
35
@@ -6,6 +8,9 @@ plugins {
68
79val buildInfo = project.extensions.getByType<BuildInfo >()
810
11+ // Version Catalog library symbols.
12+ val libs = the<LibrariesForLibs >()
13+
914dependencies {
1015 // At least some of our kotlin APIs contain Kotlin stdlib types
1116 // that aren't compiled away by kotlinc (e.g., `kotlin.Function`).
@@ -21,7 +26,7 @@ tasks.compileKotlin {
2126
2227spotless {
2328 kotlin {
24- ktfmt(" 0.44 " ).googleStyle()
29+ ktfmt(libs.versions.ktfmt.get() ).googleStyle()
2530 targetExclude(" **/generated/**" , " **/build/**" )
2631 licenseHeaderFile(rootProject.file(" buildSrc/src/main/resources/license-header.star-block.txt" ))
2732 }
Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ clikt = "3.5.1"
77commonMark = " 0.+"
88downloadTaskPlugin = " 4.1.2"
99geantyref = " 1.+"
10+ googleJavaFormat = " 1.15.0"
1011# must not use `+` because used in download URL
1112graalVm = " 22.3.3"
1213# intentionally empty; replaced by patch file when building pkl-cli macos/aarch64
@@ -30,6 +31,7 @@ kotlin = "1.7.10"
3031kotlinPoet = " 1.6.+"
3132kotlinxHtml = " 0.+"
3233kotlinxSerialization = " 1.+"
34+ ktfmt = " 0.44"
3335# replaces nuValidator's log4j dependency
3436# something related to log4j-1.2-api is apparently broken in 2.17.2
3537log4j = " 2.17.1"
You can’t perform that action at this time.
0 commit comments