Skip to content
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

Jump to bottom

Inspect only *.properties entries under META-INF/gradle-plugins/ #8777

Merged
merged 1 commit into from Mar 14, 2019
Merged

Inspect only *.properties entries under META-INF/gradle-plugins/ #8777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 31 additions & 1 deletion .../kotlin/org/gradle/kotlin/dsl/plugins/precompiled/PrecompiledScriptPluginAccessorsTest.kt
View file
Open in desktop
Expand Up @@ -348,13 +348,22 @@ class PrecompiledScriptPluginAccessorsTest : AbstractPrecompiledScriptPluginTest
val pluginJar = jarForPlugin(pluginId, "MyPlugin")

withPrecompiledScriptApplying(pluginId, pluginJar)
assertPrecompiledScriptPluginApplies(
pluginId,
"Plugin_gradle"
)
}

private
fun assertPrecompiledScriptPluginApplies(pluginId: String, precompiledScriptClassName: String) {

compileKotlin()

val (project, pluginManager) = projectAndPluginManagerMocks()

instantiatePrecompiledScriptOf(
project,
"Plugin_gradle"
precompiledScriptClassName
)

inOrder(pluginManager) {
Expand All @@ -363,6 +372,27 @@ class PrecompiledScriptPluginAccessorsTest : AbstractPrecompiledScriptPluginTest
}
}

@Test
fun `can use plugin specs with jruby-gradle-plugin`() {

withKotlinDslPlugin().appendText("""
dependencies {
compile("com.github.jruby-gradle:jruby-gradle-plugin:1.4.0")
}
""")

withPrecompiledKotlinScript("plugin.gradle.kts", """
plugins {
com.github.`jruby-gradle`.base
}
""")

assertPrecompiledScriptPluginApplies(
"com.github.jruby-gradle.base",
"Plugin_gradle"
)
}

@Test
fun `plugin application errors are reported but don't cause the build to fail`() {

Expand Down
9 changes: 8 additions & 1 deletion subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/codegen/PluginIdExtensions.kt
View file
Open in desktop
Expand Up @@ -22,6 +22,7 @@ import org.gradle.plugin.use.PluginDependencySpec
import java.io.File

import java.util.Properties
import java.util.jar.JarEntry
import java.util.jar.JarFile


Expand Down Expand Up @@ -248,11 +249,17 @@ internal
fun pluginEntriesFrom(jar: File): List<PluginEntry> =
JarFile(jar).use { jarFile ->
jarFile.entries().asSequence().filter {
it.isFile && it.name.startsWith("META-INF/gradle-plugins/")
isGradlePluginPropertiesFile(it)
}.map { pluginEntry ->
val pluginProperties = jarFile.getInputStream(pluginEntry).use { Properties().apply { load(it) } }
val id = pluginEntry.name.substringAfterLast("/").substringBeforeLast(".properties")
val implementationClass = pluginProperties.getProperty("implementation-class")
PluginEntry(id, implementationClass)
}.toList()
}


private
fun isGradlePluginPropertiesFile(entry: JarEntry) = entry.run {
isFile && name.run { startsWith("META-INF/gradle-plugins/") && endsWith(".properties") }
}