Skip to content

Attempt to fix Gradle 9 compatibility #735 #736

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
LouisCAD merged 5 commits into from
Aug 15, 2025
Merged

Attempt to fix Gradle 9 compatibility #735 #736

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
25abbd5
Attempt to fix Gradle 9 compatibility #735
AlexanderBartash Aug 3, 2025
05ea140
Minor reformat: Put parameters on separate lines
LouisCAD Aug 15, 2025
e88334d
Use buildscript for pluginIdToDependency
LouisCAD Aug 15, 2025
590846a
Make propertyOrEnvOrNull return null if the property is empty
LouisCAD Aug 15, 2025
bb02676
Make signing not required
LouisCAD Aug 15, 2025
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
8 changes: 6 additions & 2 deletions plugins/convention-plugins/src/main/kotlin/PropertyOrEnv.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ internal fun Project.propertyOrEnv(key: String): String {
?: error("Didn't find any value for the key \"$key\" in Project properties or environment variables.")
}

internal fun Project.propertyOrEnvOrNull(key: String): String? {
return findProperty(key) as String? ?: System.getenv(key)
internal fun Project.propertyOrEnvOrNull(
key: String,
nullIfEmpty: Boolean = true
): String? {
return (findProperty(key) as String?)?.takeUnless { nullIfEmpty && it.isEmpty() }
?: System.getenv(key)?.takeUnless { nullIfEmpty && it.isEmpty() }
}
1 change: 1 addition & 0 deletions plugins/convention-plugins/src/main/kotlin/gradle-plugin.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ plugins {
}

signing {
isRequired = false
useInMemoryPgpKeys(
propertyOrEnvOrNull("GPG_key_id"),
propertyOrEnvOrNull("GPG_private_key") ?: return@signing,
Expand Down
13 changes: 9 additions & 4 deletions plugins/core/src/main/kotlin/de/fayard/refreshVersions/core/RefreshVersionsCoreSetup.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import de.fayard.refreshVersions.core.internal.setupVersionPlaceholdersResolving
import org.gradle.api.artifacts.ExternalDependency
import org.gradle.api.file.RegularFile
import org.gradle.api.initialization.Settings
import org.gradle.api.internal.artifacts.dependencies.DefaultClientModule
import org.gradle.kotlin.dsl.apply
import org.gradle.tooling.UnsupportedVersionException
import org.gradle.util.GradleVersion
Expand Down Expand Up @@ -212,7 +211,7 @@ private fun setupPluginsVersionsResolution(
val pluginVersion = requested.version ?: return@eachPlugin
UsedPluginsTracker.pluginHasNoEntryInVersionsFile(
settings = settings,
dependency = pluginIdToDependency(pluginId, pluginVersion)
dependency = pluginIdToDependency(settings, pluginId, pluginVersion)
)
return@eachPlugin
}
Expand Down Expand Up @@ -248,5 +247,11 @@ internal fun pluginDependencyNotationToVersionKey(dependencyNotation: String): S
else -> null
}

internal fun pluginIdToDependency(pluginId: String, version: String): ExternalDependency =
DefaultClientModule(pluginId, "$pluginId.gradle.plugin", version)
internal fun pluginIdToDependency(
settings: Settings,
pluginId: String,
version: String
): ExternalDependency {
val dependencyNotation = "$pluginId:$pluginId.gradle.plugin:$version"
return settings.gradle.rootProject.buildscript.dependencies.create(dependencyNotation) as ExternalDependency
}
Loading