Skip to content

Commit

Permalink
Bump Gradle plugins from 0.15 to 0.15.1 (#245)
Browse files Browse the repository at this point in the history
  • Loading branch information
TWiStErRob committed Mar 12, 2023
1 parent 4a44859 commit 34b5005
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 7 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#org.gradle.daemon=true # true is the default since 3.x
org.gradle.warning.mode=all
org.gradle.warning.mode=fail
org.gradle.configureondemand=true
org.gradle.parallel=true
org.gradle.jvmargs=-Xmx2048M
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ agp = "7.4.2"
# 23.0.0 + agp
agp-tools = "30.4.2"
## https://github.com/TWiStErRob/net.twisterrob.gradle/releases
twisterrob = "0.15"
twisterrob = "0.15.1"
detekt = "1.22.0"

# TODEL NewerVersionAvailable lint exception
Expand Down
2 changes: 1 addition & 1 deletion gradle/plugins-inventory/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# TODO =fail https://youtrack.jetbrains.com/issue/IDEA-301430 needs to propagate to AS
org.gradle.warning.mode=all
org.gradle.warning.mode=fail

# Non-strict accessors generation for Kotlin DSL precompiled script plugins has been deprecated.
# This will change in Gradle 8.0. Strict accessor generation will become the default.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("net.twisterrob.android-app")
id("net.twisterrob.gradle.plugin.android-app")
id("net.twisterrob.inventory.build.android.base")
id("net.twisterrob.inventory.build.allprojects")
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("net.twisterrob.android-library")
id("net.twisterrob.gradle.plugin.android-library")
id("net.twisterrob.inventory.build.android.base")
id("net.twisterrob.inventory.build.allprojects")
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("net.twisterrob.root")
id("net.twisterrob.quality")
id("net.twisterrob.gradle.plugin.root")
id("net.twisterrob.gradle.plugin.quality")
id("org.gradle.idea")
id("net.twisterrob.inventory.build.allprojects")
}
Expand Down
35 changes: 35 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import org.gradle.api.initialization.resolve.RepositoriesMode

import static net.twisterrob.gradle.GradleUtils.doNotNagAbout

pluginManagement {
includeBuild("gradle/plugins-inventory")
repositories {
Expand All @@ -8,6 +10,10 @@ pluginManagement {
}
}

plugins {
id("net.twisterrob.gradle.plugin.settings") version "0.15.1"
}

dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
Expand Down Expand Up @@ -47,3 +53,32 @@ void includeWithContract(String projectPath) {
includeBuild("libs") { build ->
apply from: new File(build.projectDir, "gradle/settings.substitutions.gradle"), to: build
}

String gradleVersion = GradleVersion.current().version

// TODEL Gradle sync in AS EE 2022.1.1 https://youtrack.jetbrains.com/issue/IDEA-301430, fixed in AS Giraffe.
if (System.getProperty("idea.version") ?: "" < "2022.3") {
doNotNagAbout(
"The org.gradle.util.GUtil type has been deprecated. " +
"This is scheduled to be removed in Gradle 9.0. " +
"Consult the upgrading guide for further information: " +
"https://docs.gradle.org/${gradleVersion}/userguide/upgrading_version_7.html#org_gradle_util_reports_deprecations",
//"at org.jetbrains.plugins.gradle.tooling.builder.ExternalProjectBuilderImpl\$_getSourceSets_closure"
)
} else {
error("Android Studio version changed, please remove hack.")
}

// TODEL Gradle sync in AS EE 2022.1.1 https://youtrack.jetbrains.com/issue/IDEA-284158
if (System.getProperty("idea.version") ?: "" < "2023.2") {
doNotNagAbout(
"Resolution of the configuration :tools:transform:detachedConfiguration1 " +
"was attempted from a context different than the project context. " +
"Have a look at the documentation to understand why this is a problem and how it can be resolved. " +
"This behaviour has been deprecated and is scheduled to be removed in Gradle 8.0. " +
"See https://docs.gradle.org/${gradleVersion}/userguide/viewing_debugging_dependencies.html#sub:resolving-unsafe-configuration-resolution-errors for more details.",
// at org.jetbrains.plugins.gradle.model.ProjectImportAction$MyBuildController.findModel(ProjectImportAction.java:618)
)
} else {
error("Android Studio version changed, please review hack.")
}

0 comments on commit 34b5005

Please sign in to comment.