Skip to content

Commit 5d2beb5

Browse files
committed
build(gradle): Simplify accessing the version catalog from buildSrc
Make use of [1]. [1]: https://github.com/radoslaw-panuszewski/typesafe-conventions-gradle-plugin Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
1 parent 5723455 commit 5d2beb5

4 files changed

Lines changed: 3 additions & 17 deletions

File tree

buildSrc/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ repositories {
3838
}
3939

4040
dependencies {
41-
implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
42-
4341
implementation(libs.jgit)
4442
implementation(libs.plugin.dependencyAnalysis)
4543
implementation(libs.plugin.detekt)

buildSrc/settings.gradle.kts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@
1919

2020
rootProject.name = "buildSrc"
2121

22-
dependencyResolutionManagement {
23-
versionCatalogs {
24-
create("libs") {
25-
from(files("../gradle/libs.versions.toml"))
26-
}
27-
}
22+
plugins {
23+
// Gradle cannot access the version catalog from here, so hard-code the dependency.
24+
id("dev.panuszewski.typesafe-conventions").version("0.10.0")
2825
}

buildSrc/src/main/kotlin/ort-application-conventions.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ import java.nio.file.Files
2525

2626
import org.graalvm.buildtools.gradle.tasks.BuildNativeImageTask
2727

28-
import org.gradle.accessors.dm.LibrariesForLibs
29-
30-
private val Project.libs: LibrariesForLibs
31-
get() = extensions.getByType()
32-
3328
val javaLanguageVersion: String by project
3429

3530
plugins {

buildSrc/src/main/kotlin/ort-kotlin-conventions.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import io.gitlab.arturbosch.detekt.Detekt
2121
import io.gitlab.arturbosch.detekt.report.ReportMergeTask
2222

23-
import org.gradle.accessors.dm.LibrariesForLibs
2423
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
2524
import org.gradle.api.tasks.testing.logging.TestLogEvent
2625
import org.gradle.kotlin.dsl.dependencies
@@ -32,9 +31,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
3231
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
3332
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
3433

35-
private val Project.libs: LibrariesForLibs
36-
get() = extensions.getByType()
37-
3834
val javaLanguageVersion: String by project
3935

4036
plugins {

0 commit comments

Comments
 (0)