Skip to content

Commit

Permalink
Merge branch 'main' into renovate/gradle-8.x
Browse files Browse the repository at this point in the history
  • Loading branch information
TWiStErRob authored Dec 20, 2024
2 parents 7b7f42c + 05853a7 commit 746ee5e
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 29 deletions.
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
org.gradle.warning.mode=fail
org.gradle.kotlin.dsl.allWarningsAsErrors=true

org.gradle.jvmargs=-Xmx2048M -Dorg.gradle.deprecation.trace=true

org.gradle.configureondemand=true
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions gradle/plugins-inventory/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ dependencies {
testImplementation(libs.test.junit4)
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
kotlinOptions {
kotlin {
compilerOptions {
allWarningsAsErrors = true
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/plugins-inventory/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# TODO =fail https://youtrack.jetbrains.com/issue/IDEA-301430 needs to propagate to AS
org.gradle.warning.mode=fail
org.gradle.kotlin.dsl.allWarningsAsErrors=true
26 changes: 0 additions & 26 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import org.gradle.api.initialization.resolve.RepositoriesMode
import static net.twisterrob.gradle.GradleUtils.doNotNagAbout

pluginManagement {
includeBuild("gradle/plugins-inventory")
Expand Down Expand Up @@ -73,28 +72,3 @@ develocity {
termsOfUseAgree = "yes"
}
}

def gradleVersion = GradleVersion.current().version

// TODEL Gradle 8.8 sync in IDEA 2024.1.4 https://youtrack.jetbrains.com/issue/IDEA-353787.
if ((System.getProperty("idea.version") ?: "") < "2024.2") {
doNotNagAbout(
"The CopyProcessingSpec.getFileMode() method has been deprecated. " +
"This is scheduled to be removed in Gradle 9.0. " +
"Please use the getFilePermissions() method instead. " +
"Consult the upgrading guide for further information: " +
"https://docs.gradle.org/${gradleVersion}/userguide/upgrading_version_8.html#unix_file_permissions_deprecated",
"at com.intellij.gradle.toolingExtension.impl.model.resourceFilterModel.GradleResourceFilterModelBuilder.getFilters(GradleResourceFilterModelBuilder.groovy:46)"
)
doNotNagAbout(
"The CopyProcessingSpec.getDirMode() method has been deprecated. " +
"This is scheduled to be removed in Gradle 9.0. " +
"Please use the getDirPermissions() method instead. " +
"Consult the upgrading guide for further information: " +
"https://docs.gradle.org/${gradleVersion}/userguide/upgrading_version_8.html#unix_file_permissions_deprecated",
"at com.intellij.gradle.toolingExtension.impl.model.resourceFilterModel.GradleResourceFilterModelBuilder.getFilters(GradleResourceFilterModelBuilder.groovy:46)"
)
} else {
def error = CI ? { throw new IllegalStateException(it) } : logger::warn
error("IDEA version changed, please review hack.")
}

0 comments on commit 746ee5e

Please sign in to comment.