Skip to content

Gradle to 7.2 #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 3, 2021
Merged

Gradle to 7.2 #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a86dfe5
Update Gradle to 6.6.1
jraska Sep 29, 2020
231f2c9
Update Gradle to 6.6.1 - let's see f we need both configurations
jraska Sep 29, 2020
d23ad35
Gradle to 7.2
jraska Aug 31, 2021
e856278
Merge branch 'update-gradle' of https://github.com/jraska/modules-gra…
jraska Sep 3, 2021
93a909f
Update method to include `*orNull` suffix, Target Java 11
jraska Sep 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ dependencies {

compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}
}
compileTestKotlin {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}
}

Expand Down
6 changes: 3 additions & 3 deletions plugin/src/main/kotlin/com/jraska/module/graph/DependencyGraph.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class DependencyGraph private constructor() {
.forEach { rootCandidates.remove(it) }

return rootCandidates.associateBy { heightOf(it.key) }
.maxBy { it.key }!!.value
.maxByOrNull { it.key }!!.value
}

fun nodes(): Collection<Node> = nodes.values
Expand Down Expand Up @@ -94,7 +94,7 @@ class DependencyGraph private constructor() {
if (isLeaf()) {
return 0
} else {
return 1 + dependsOn.map { it.height() }.max()!!
return 1 + dependsOn.map { it.height() }.maxOrNull()!!
}
}

Expand All @@ -104,7 +104,7 @@ class DependencyGraph private constructor() {
} else {
val path = mutableListOf<Node>(this)

val maxHeightNode = dependsOn.maxBy { it.height() }!!
val maxHeightNode = dependsOn.maxByOrNull { it.height() }!!
path.addAll(maxHeightNode.longestPath())

return path
Expand Down