Skip to content

Commit

Permalink
Use 'jvm-dependency-conflict-resolution' as 3rd party plugin example
Browse files Browse the repository at this point in the history
  • Loading branch information
jjohannes committed Jun 24, 2024
1 parent 36efbe2 commit d0e2749
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
junit-launcher = { module = "org.junit.platform:junit-platform-launcher" }

# Gradle plugin dependencies
gradlex-java-ecosystem-capabilities = { module = "org.gradlex:java-ecosystem-capabilities"}
gradlex-jvm-dependency-conflict-resolution = { module = "org.gradlex:jvm-dependency-conflict-resolution"}
4 changes: 2 additions & 2 deletions gradle/platform/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ dependencies {
api(libs.junit.api) {
version { prefer("5.6.2") }
}
api(libs.gradlex.java.ecosystem.capabilities) {
version { prefer("1.1") }
api(libs.gradlex.jvm.dependency.conflict.resolution) {
version { prefer("2.1.1") }
}
}
}
2 changes: 1 addition & 1 deletion gradle/plugins/java-convention/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ dependencies {

implementation(platform("com.example.idiomatic.gradle:platform"))
implementation(libs.guava) // example of using a standard Java library in your plugins
implementation(libs.gradlex.java.ecosystem.capabilities) // example of using a Gradle community plugin
implementation(libs.gradlex.jvm.dependency.conflict.resolution) // example of using a Gradle community plugin
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
id("com.example.unit-testing")
id("com.example.end2end-testing")
id("com.example.jacoco")
id("org.gradlex.java-ecosystem-capabilities")
id("org.gradlex.jvm-dependency-conflict-detection")
}

dependencies {
Expand Down

0 comments on commit d0e2749

Please sign in to comment.