Skip to content

Commit 492f883

Browse files
committed
Upgrade typesafe-conventions plugin to latest
1 parent 80c6bdf commit 492f883

File tree

11 files changed

+18
-25
lines changed

11 files changed

+18
-25
lines changed

buildSrc/build.gradle.kts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
import dev.panuszewski.gradle.pluginMarker
17-
1816
plugins {
1917
id("java-library")
2018
`kotlin-dsl`
@@ -28,18 +26,6 @@ repositories {
2826
google()
2927
}
3028

31-
// Dependencies needed for the configuration of the plugins
32-
// Uses `pluginMarker` from the `typesafe-conventions` plugin, see `settings.gradle.kts`
33-
dependencies {
34-
implementation(pluginMarker(libs.plugins.bnd))
35-
implementation(pluginMarker(libs.plugins.detekt))
36-
implementation(pluginMarker(libs.plugins.dokka))
37-
implementation(pluginMarker(libs.plugins.kotlin.gradle))
38-
implementation(pluginMarker(libs.plugins.spotbugs))
39-
implementation(pluginMarker(libs.plugins.spotless))
40-
implementation(pluginMarker(libs.plugins.test.logger))
41-
}
42-
4329
// Spotless configuration for `buildSrc` code.
4430
spotless {
4531
kotlinGradle {

buildSrc/settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ plugins {
1717
// Add support for `libs.versions.toml` within `buildSrc`
1818
// https://github.com/radoslaw-panuszewski/typesafe-conventions-gradle-plugin
1919
// https://github.com/gradle/gradle/issues/15383
20-
id("dev.panuszewski.typesafe-conventions") version "0.4.1"
20+
id("dev.panuszewski.typesafe-conventions") version "0.7.3"
2121
}

buildSrc/src/main/kotlin/conventions/bnd.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
*/
1616
package conventions
1717

18+
import libs
19+
1820
// Gradle Plugin for developing OSGi bundles with Bnd.
1921
// https://plugins.gradle.org/plugin/biz.aQute.bnd.builder
2022

21-
plugins { id("biz.aQute.bnd.builder") }
23+
plugins { alias(libs.plugins.bnd) }

buildSrc/src/main/kotlin/conventions/detekt.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
package conventions
1717

1818
import io.gitlab.arturbosch.detekt.Detekt
19+
import libs
1920

2021
// Static code analysis for Kotlin
2122
// https://plugins.gradle.org/plugin/io.gitlab.arturbosch.detekt
22-
plugins { id("io.gitlab.arturbosch.detekt") }
23+
plugins { alias(libs.plugins.detekt) }
2324

2425
detekt {
2526
allRules = true // fail build on any finding

buildSrc/src/main/kotlin/conventions/dokka.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515
*/
1616
package conventions
1717

18+
import libs
19+
1820
// Dokka, the documentation engine for Kotlin
1921
// https://plugins.gradle.org/plugin/org.jetbrains.dokka
2022
plugins {
21-
id("org.jetbrains.dokka")
23+
alias(libs.plugins.dokka)
2224
id("conventions.publishing")
2325
}
2426

buildSrc/src/main/kotlin/conventions/spotbugs.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
package conventions
1717

1818
import com.github.spotbugs.snom.SpotBugsTask
19+
import libs
1920
import org.gradle.kotlin.dsl.dependencies
20-
import project.libs
2121

2222
// Performs quality checks on your project's Java source files using SpotBug
2323
// https://plugins.gradle.org/plugin/com.github.spotbugs
2424
plugins {
2525
id("java-library")
26-
id("com.github.spotbugs")
26+
alias(libs.plugins.spotbugs)
2727
}
2828

2929
dependencies {

buildSrc/src/main/kotlin/conventions/spotless.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ package conventions
1717

1818
import com.diffplug.gradle.spotless.SpotlessApply
1919
import com.diffplug.gradle.spotless.SpotlessCheck
20+
import libs
2021

2122
// Spotless - keep your code spotless
2223
// https://plugins.gradle.org/plugin/com.diffplug.spotless
23-
plugins { id("com.diffplug.spotless") }
24+
plugins { alias(libs.plugins.spotless) }
2425

2526
val doesNotHaveACustomLicenseHeader = "/^(?s)(?!.*@custom-license-header).*/"
2627

buildSrc/src/main/kotlin/conventions/testing-base.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package conventions
1717

1818
import com.adarshr.gradle.testlogger.theme.ThemeType
19+
import libs
1920
import project.DEFAULT_JAVA_VERSION
2021

2122
// Default test configuration for projects
@@ -24,7 +25,7 @@ import project.DEFAULT_JAVA_VERSION
2425
// https://plugins.gradle.org/plugin/com.adarshr.test-logger
2526
plugins {
2627
id("java-library")
27-
id("com.adarshr.test-logger")
28+
alias(libs.plugins.test.logger)
2829
}
2930

3031
tasks.withType<Test> {

buildSrc/src/main/kotlin/project/kotlin.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515
*/
1616
package project
1717

18+
import libs
1819
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
1920
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
2021

2122
plugins {
22-
kotlin("jvm")
23+
alias(libs.plugins.kotlin.gradle)
2324
id("project.base")
2425
id("conventions.bnd")
2526
id("conventions.detekt")

buildSrc/src/main/kotlin/project/scala.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ package project
1717

1818
import ProjectExtensions.configureMavenPublication
1919
import ProjectExtensions.scalaVersion
20-
import gradle.kotlin.dsl.accessors._473b9544fb0ec2c6cc860d9af4296ace.java
2120

2221
plugins {
2322
id("scala")

0 commit comments

Comments
 (0)