diff --git a/build.gradle.kts b/build.gradle.kts index d1db9c706..7ea09bafc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,7 +20,7 @@ plugins { java kotlin("jvm") version "1.5.0" - id("org.jetbrains.intellij") version "1.0-SNAPSHOT" + id("org.jetbrains.intellij") version "0.7.3" id("io.gitlab.arturbosch.detekt") version "1.15.0" id("org.jetbrains.changelog") version "1.1.2" @@ -104,23 +104,23 @@ sourceSets { // --- Intellij plugin intellij { - version.set(ideaVersion) - pluginName.set("IdeaVim") - updateSinceUntilBuild.set(false) - downloadSources.set(downloadIdeaSources.toBoolean()) - instrumentCode.set(instrumentPluginCode.toBoolean()) - intellijRepository.set("https://www.jetbrains.com/intellij-repository") - plugins.set(listOf("java")) + version = ideaVersion + pluginName = "IdeaVim" + updateSinceUntilBuild = false + downloadSources = downloadIdeaSources.toBoolean() + instrumentCode = instrumentPluginCode.toBoolean() + intellijRepo = "https://www.jetbrains.com/intellij-repository" + setPlugins("java") } tasks { downloadRobotServerPlugin { - version.set("0.10.0") + version = "0.10.0" } publishPlugin { - channels.set(publishChannels.split(",")) - token.set(publishToken) + channels(publishChannels.split(",")) + token(publishToken) } runIdeForUiTests { @@ -128,9 +128,9 @@ tasks { } runPluginVerifier { - ideVersions.set(listOf("IC-2020.2.3", "IC-2020.3.2")) - downloadDir.set("${project.buildDir}/pluginVerifier/ides") - teamCityOutputFormat.set(true) + ideVersions(listOf("IC-2020.2.3", "IC-2020.3.2")) + downloadDirectory("${project.buildDir}/pluginVerifier/ides") + teamCityOutputFormat = true } } diff --git a/settings.gradle b/settings.gradle index 5c89b5c51..bb770be05 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,13 +16,4 @@ * along with this program. If not, see <https://www.gnu.org/licenses/>. */ -pluginManagement { - repositories { - maven { - url 'https://oss.sonatype.org/content/repositories/snapshots/' - } - gradlePluginPortal() - } -} - rootProject.name = 'IdeaVIM'