diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 538bdd42999..38b12cb51da 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -155,7 +155,7 @@ dependencies { implementation("net.sf.proguard:proguard-gradle:6.2.2") implementation("org.jetbrains.intellij.deps:asm-all:8.0.1") - implementation("gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:0.5") + implementation("gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:1.0.1") implementation("org.gradle:test-retry-gradle-plugin:1.2.0") implementation("com.gradle.enterprise:test-distribution-gradle-plugin:2.1") diff --git a/buildSrc/src/main/kotlin/ideaExtKotlinDsl.kt b/buildSrc/src/main/kotlin/ideaExtKotlinDsl.kt index 3dfd6a39fd8..13d4acf1f6b 100644 --- a/buildSrc/src/main/kotlin/ideaExtKotlinDsl.kt +++ b/buildSrc/src/main/kotlin/ideaExtKotlinDsl.kt @@ -24,16 +24,16 @@ fun ProjectSettings.compiler(block: IdeaCompilerConfiguration.() -> Unit) = fun ProjectSettings.delegateActions(block: ActionDelegationConfig.() -> Unit) = (this@delegateActions as ExtensionAware).extensions.configure(block) -fun ProjectSettings.runConfigurations(block: DefaultRunConfigurationContainer.() -> Unit) = +fun ProjectSettings.runConfigurations(block: RunConfigurationContainer.() -> Unit) = (this@runConfigurations as ExtensionAware).extensions.configure("runConfigurations", block) -inline fun DefaultRunConfigurationContainer.defaults(noinline block: T.() -> Unit) = +inline fun RunConfigurationContainer.defaults(noinline block: T.() -> Unit) = defaults(T::class.java, block) -fun DefaultRunConfigurationContainer.junit(name: String, block: JUnit.() -> Unit) = +fun RunConfigurationContainer.junit(name: String, block: JUnit.() -> Unit) = create(name, JUnit::class.java, block) -fun DefaultRunConfigurationContainer.application(name: String, block: Application.() -> Unit) = +fun RunConfigurationContainer.application(name: String, block: Application.() -> Unit) = create(name, Application::class.java, block) fun ProjectSettings.ideArtifacts(block: NamedDomainObjectContainer.() -> Unit) = diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index a232fb3d637..ee62159c9ec 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -2733,14 +2733,10 @@ - - - - - - - - + + + +