Skip to content

Commit d97eda0

Browse files
committed
Documentation tweaks
1 parent 2103a16 commit d97eda0

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed

src/docs/asciidoc/index.adoc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ image:https://onepiecesoftware.github.io/img/videos/11.png[width=400,link=https:
2929

3030
NOTE: With these plugins, you enable your build to detect and automatically resolve typical capability conflicts in the JVM ecosystem.
3131

32-
== Plugins
32+
== Plugins Overview
3333

3434
TIP: These plugins require Gradle 6.8.3 at a minimum.
3535

@@ -46,8 +46,11 @@ It adds a DSL to configure resolution strategies, select logging implementations
4646

4747
See each plugin's documentation for more details.
4848

49-
include::src/docs/asciidoc/parts/detection.adoc[leveloffset=+2]
50-
include::src/docs/asciidoc/parts/resolution.adoc[leveloffset=+2]
49+
TIP: The `org.gradlex.jvm-dependency-conflict-resolution` extends the `org.gradlex.jvm-dependency-conflict-detection` plugin.
50+
In most projects, you can apply only `org.gradlex.jvm-dependency-conflict-resolution` to get all functionality.
51+
52+
include::src/docs/asciidoc/parts/detection.adoc[leveloffset=+1]
53+
include::src/docs/asciidoc/parts/resolution.adoc[leveloffset=+1]
5154

5255
[[appendix]]
5356
== Appendix

src/docs/asciidoc/parts/detection.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Note that the `jvm-dependency-conflict-resolution` dependency contains both the
1313
[source,groovy]
1414
----
1515
dependencies {
16-
implementation("org.gradlex:jvm-dependency-conflict-resolution:2.1.2")
16+
implementation("org.gradlex:jvm-dependency-conflict-resolution:2.2")
1717
}
1818
----
1919

src/docs/asciidoc/parts/resolution.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Add this to the build file of your convention plugin's build (e.g. `build-logic/
77
[source,groovy]
88
----
99
dependencies {
10-
implementation("org.gradlex:jvm-dependency-conflict-resolution:2.1.2")
10+
implementation("org.gradlex:jvm-dependency-conflict-resolution:2.2")
1111
}
1212
----
1313

src/docs/samples/plugin-dependency/groovy/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ repositories.gradlePluginPortal()
66

77
// tag::plugin-dependency[]
88
dependencies {
9-
implementation 'org.gradlex:jvm-dependency-conflict-resolution:2.1.2'
9+
implementation 'org.gradlex:jvm-dependency-conflict-resolution:2.2'
1010
}
1111
// end::plugin-dependency[]

src/docs/samples/plugin-dependency/kotlin/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ repositories.gradlePluginPortal()
66

77
// tag::plugin-dependency[]
88
dependencies {
9-
implementation("org.gradlex:jvm-dependency-conflict-resolution:2.1.2")
9+
implementation("org.gradlex:jvm-dependency-conflict-resolution:2.2")
1010
}
1111
// end::plugin-dependency[]

0 commit comments

Comments
 (0)