-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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.
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
refactor: fix gradle warnings #5140
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
import java.net.URI | ||
|
||
plugins { | ||
id("org.gradle.kotlin.kotlin-dsl") version "4.1.0" | ||
id("org.gradle.kotlin.kotlin-dsl") version "4.0.14" | ||
} | ||
|
||
kotlin { | ||
|
@@ -50,7 +50,7 @@ dependencies { | |
implementation("org.terasology.gestalt:gestalt-module:7.1.0") | ||
|
||
// plugins we configure | ||
implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:5.1.3") | ||
implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:5.1.3") // TODO: upgrade with gradle 7.x | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We're on Gradle 8.3 now. I think this new comment is rather outdated already, |
||
implementation("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.3") | ||
|
||
api(kotlin("test")) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -90,13 +90,10 @@ fun moduleDependencyOrdering(modulesConfig: Configuration): List<String> { | |
// configurations.resolvedConfiguration is more straightforward if you just want all the artifacts, | ||
// but using `.incoming` lets us turn on lenient mode as well as do more accurate filtering of local modules | ||
val resolvable = modulesConfig.incoming | ||
val artifactView = resolvable.artifactView { | ||
lenient(true) | ||
} | ||
Comment on lines
-93
to
-95
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think these lines might have been here for their side-effect? It might be worth keeping them there if possible. |
||
|
||
val result = resolvable.resolutionResult | ||
val allDependencies = result.allDependencies | ||
val resolvedDependencies = allDependencies.mapNotNull { | ||
allDependencies.mapNotNull { | ||
if (it is ResolvedDependencyResult) { | ||
return@mapNotNull it | ||
} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -43,7 +43,7 @@ plugins { | |
// For the "Build and run using: Intellij IDEA | Gradle" switch | ||
id "org.jetbrains.gradle.plugin.idea-ext" version "1.0" | ||
|
||
id("com.google.protobuf") version "0.8.16" apply false | ||
id("com.google.protobuf") version "0.9.4" apply false | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could this break network compatibility between game clients? I believe that protobuf is used for serialising entity data over the network. |
||
id("terasology-repositories") | ||
} | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We stopped using an explicit version of the Kotlin DSL plugin after upgrading to Gradle 8.3. This might be a source of merge conflicts.