diff --git a/.github/workflows/code-samples.yml b/.github/workflows/code-samples.yml index f5fb60905..25c934869 100644 --- a/.github/workflows/code-samples.yml +++ b/.github/workflows/code-samples.yml @@ -78,10 +78,12 @@ jobs: - name: Run Plugin Verifier run: | echo " - runPluginVerifier { - ideVersions = '$PLUGIN_VERIFIER_IDE_VERSIONS'.split(' ').toList() + tasks { + runPluginVerifier { + ideVersions.set("\"$PLUGIN_VERIFIER_IDE_VERSIONS\"".split(' ').toList()) + } } - " >> code_samples/${{ matrix.plugin }}/build.gradle + " >> code_samples/${{ matrix.plugin }}/build.gradle.kts cd code_samples/${{ matrix.plugin }} ./gradlew runPluginVerifier -Pplugin.verifier.home.dir=${{ steps.properties.outputs.pluginVerifierHomeDir }} diff --git a/code_samples/_gradleCompositeBuild/settings.gradle b/code_samples/_gradleCompositeBuild/settings.gradle deleted file mode 100644 index 9c4a8c830..000000000 --- a/code_samples/_gradleCompositeBuild/settings.gradle +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -// Composite Build for all SDK Code Sample projects (excluding those under /product_specific/ to reduce dependencies) - -rootProject.name = 'SDK Code Samples' - -includeBuild '../action_basics' -includeBuild '../comparing_references_inspection' -includeBuild '../conditional_operator_intention' -includeBuild '../editor_basics' -includeBuild '../facet_basics' -includeBuild '../framework_basics' -includeBuild '../inspection_basics' -includeBuild '../kotlin_demo' -includeBuild '../live_templates' -includeBuild '../max_opened_projects' -includeBuild '../module' -includeBuild '../project_model' -includeBuild '../project_view_pane' -includeBuild '../project_wizard' -includeBuild '../psi_demo' -includeBuild '../run_configuration' -includeBuild '../settings' -includeBuild '../simple_language_plugin' -includeBuild '../tool_window' -includeBuild '../tree_structure_provider' diff --git a/code_samples/_gradleCompositeBuild/settings.gradle.kts b/code_samples/_gradleCompositeBuild/settings.gradle.kts new file mode 100644 index 000000000..7e15c80ac --- /dev/null +++ b/code_samples/_gradleCompositeBuild/settings.gradle.kts @@ -0,0 +1,26 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +// Composite Build for all SDK Code Sample projects (excluding those under /product_specific/ to reduce dependencies) + +rootProject.name = "SDK Code Samples" + +includeBuild("../action_basics") +includeBuild("../comparing_references_inspection") +includeBuild("../conditional_operator_intention") +includeBuild("../editor_basics") +includeBuild("../facet_basics") +includeBuild("../framework_basics") +includeBuild("../inspection_basics") +includeBuild("../kotlin_demo") +includeBuild("../live_templates") +includeBuild("../max_opened_projects") +includeBuild("../module") +includeBuild("../project_model") +includeBuild("../project_view_pane") +includeBuild("../project_wizard") +includeBuild("../psi_demo") +includeBuild("../run_configuration") +includeBuild("../settings") +includeBuild("../simple_language_plugin") +includeBuild("../tool_window") +includeBuild("../tree_structure_provider") diff --git a/code_samples/action_basics/build.gradle b/code_samples/action_basics/build.gradle deleted file mode 100644 index 2ee6f3d8c..000000000 --- a/code_samples/action_basics/build.gradle +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -plugins { - id 'java' - id 'org.jetbrains.intellij' version '1.4.0' -} - -group 'org.intellij.sdk' -version '2.0.0' - -sourceCompatibility = 11 - -repositories { - mavenCentral() -} - -// See https://github.com/JetBrains/gradle-intellij-plugin/ -intellij { - version = '2021.1.3' -} - -buildSearchableOptions { - enabled = false -} - -patchPluginXml { - version = project.version - sinceBuild = '211' - untilBuild = '213.*' -} diff --git a/code_samples/action_basics/build.gradle.kts b/code_samples/action_basics/build.gradle.kts new file mode 100644 index 000000000..ca61af869 --- /dev/null +++ b/code_samples/action_basics/build.gradle.kts @@ -0,0 +1,34 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +plugins { + id("java") + id("org.jetbrains.intellij") version "1.4.0" +} + +group = "org.intellij.sdk" +version = "2.0.0" + +repositories { + mavenCentral() +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version.set("2021.1.3") +} + +tasks { + buildSearchableOptions { + enabled = false + } + + patchPluginXml { + version.set("${project.version}") + sinceBuild.set("211") + untilBuild.set("213.*") + } +} diff --git a/code_samples/action_basics/settings.gradle b/code_samples/action_basics/settings.gradle deleted file mode 100644 index 5e6378aec..000000000 --- a/code_samples/action_basics/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -rootProject.name = 'action' diff --git a/code_samples/action_basics/settings.gradle.kts b/code_samples/action_basics/settings.gradle.kts new file mode 100644 index 000000000..fe3c1dfb0 --- /dev/null +++ b/code_samples/action_basics/settings.gradle.kts @@ -0,0 +1,3 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +rootProject.name = "action" diff --git a/code_samples/comparing_references_inspection/build.gradle b/code_samples/comparing_references_inspection/build.gradle deleted file mode 100644 index ad0b7fcd4..000000000 --- a/code_samples/comparing_references_inspection/build.gradle +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -plugins { - id 'java' - id 'org.jetbrains.intellij' version '1.4.0' -} - -group 'org.intellij.sdk' -version '2.0.0' - -sourceCompatibility = 11 - -repositories { - mavenCentral() -} - -dependencies { - testImplementation group: 'junit', name: 'junit', version: '4.13.2' -} - -test { - // Set idea.home.path to the absolute path to the intellij-community source - // on your local machine. - systemProperty "idea.home.path", "/Users/jhake/Documents/source/comm" -} - -// See https://github.com/JetBrains/gradle-intellij-plugin/ -intellij { - version = '2021.1.3' - plugins = ['com.intellij.java'] -} - -buildSearchableOptions { - enabled = false -} - -patchPluginXml { - version = project.version - sinceBuild = '211' - untilBuild = '213.*' -} diff --git a/code_samples/comparing_references_inspection/build.gradle.kts b/code_samples/comparing_references_inspection/build.gradle.kts new file mode 100644 index 000000000..3c837f307 --- /dev/null +++ b/code_samples/comparing_references_inspection/build.gradle.kts @@ -0,0 +1,45 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +plugins { + id("java") + id("org.jetbrains.intellij") version "1.4.0" +} + +group = "org.intellij.sdk" +version = "2.0.0" + +repositories { + mavenCentral() +} + +dependencies { + testImplementation("junit:junit:4.13.2") +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version.set("2021.1.3") + plugins.set(listOf("com.intellij.java")) +} + +tasks { + buildSearchableOptions { + enabled = false + } + + patchPluginXml { + version.set("${project.version}") + sinceBuild.set("211") + untilBuild.set("213.*") + } + + test { + // Set idea.home.path to the absolute path to the intellij-community source + // on your local machine. + systemProperty("idea.home.path", "/Users/jhake/Documents/source/comm") + } +} diff --git a/code_samples/comparing_references_inspection/settings.gradle b/code_samples/comparing_references_inspection/settings.gradle deleted file mode 100644 index 1622bf946..000000000 --- a/code_samples/comparing_references_inspection/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -rootProject.name = 'comparing_references_inspection' diff --git a/code_samples/comparing_references_inspection/settings.gradle.kts b/code_samples/comparing_references_inspection/settings.gradle.kts new file mode 100644 index 000000000..9e1df8ce4 --- /dev/null +++ b/code_samples/comparing_references_inspection/settings.gradle.kts @@ -0,0 +1,3 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +rootProject.name = "comparing_references_inspection" diff --git a/code_samples/comparing_references_inspection/src/test/java/org/intellij/sdk/codeInspection/ComparingReferencesInspectionTest.java b/code_samples/comparing_references_inspection/src/test/java/org/intellij/sdk/codeInspection/ComparingReferencesInspectionTest.java index c464911bf..263a535fc 100644 --- a/code_samples/comparing_references_inspection/src/test/java/org/intellij/sdk/codeInspection/ComparingReferencesInspectionTest.java +++ b/code_samples/comparing_references_inspection/src/test/java/org/intellij/sdk/codeInspection/ComparingReferencesInspectionTest.java @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.intellij.sdk.codeInspection; @@ -11,7 +11,7 @@ import java.util.List; /** * Class for testing ComparingReferencesInspection. - * Requires {@code idea.home.path} to be set in build.gradle. + * Requires {@code idea.home.path} to be set in build.gradle.kts. * doTest() does the work for individual test cases. */ public class ComparingReferencesInspectionTest extends LightJavaCodeInsightFixtureTestCase { diff --git a/code_samples/conditional_operator_intention/build.gradle b/code_samples/conditional_operator_intention/build.gradle deleted file mode 100644 index ad0b7fcd4..000000000 --- a/code_samples/conditional_operator_intention/build.gradle +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -plugins { - id 'java' - id 'org.jetbrains.intellij' version '1.4.0' -} - -group 'org.intellij.sdk' -version '2.0.0' - -sourceCompatibility = 11 - -repositories { - mavenCentral() -} - -dependencies { - testImplementation group: 'junit', name: 'junit', version: '4.13.2' -} - -test { - // Set idea.home.path to the absolute path to the intellij-community source - // on your local machine. - systemProperty "idea.home.path", "/Users/jhake/Documents/source/comm" -} - -// See https://github.com/JetBrains/gradle-intellij-plugin/ -intellij { - version = '2021.1.3' - plugins = ['com.intellij.java'] -} - -buildSearchableOptions { - enabled = false -} - -patchPluginXml { - version = project.version - sinceBuild = '211' - untilBuild = '213.*' -} diff --git a/code_samples/conditional_operator_intention/build.gradle.kts b/code_samples/conditional_operator_intention/build.gradle.kts new file mode 100644 index 000000000..3c837f307 --- /dev/null +++ b/code_samples/conditional_operator_intention/build.gradle.kts @@ -0,0 +1,45 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +plugins { + id("java") + id("org.jetbrains.intellij") version "1.4.0" +} + +group = "org.intellij.sdk" +version = "2.0.0" + +repositories { + mavenCentral() +} + +dependencies { + testImplementation("junit:junit:4.13.2") +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version.set("2021.1.3") + plugins.set(listOf("com.intellij.java")) +} + +tasks { + buildSearchableOptions { + enabled = false + } + + patchPluginXml { + version.set("${project.version}") + sinceBuild.set("211") + untilBuild.set("213.*") + } + + test { + // Set idea.home.path to the absolute path to the intellij-community source + // on your local machine. + systemProperty("idea.home.path", "/Users/jhake/Documents/source/comm") + } +} diff --git a/code_samples/conditional_operator_intention/settings.gradle b/code_samples/conditional_operator_intention/settings.gradle deleted file mode 100644 index 51eeea02e..000000000 --- a/code_samples/conditional_operator_intention/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -rootProject.name = 'conditional_operator_intention' diff --git a/code_samples/conditional_operator_intention/settings.gradle.kts b/code_samples/conditional_operator_intention/settings.gradle.kts new file mode 100644 index 000000000..1ad577c82 --- /dev/null +++ b/code_samples/conditional_operator_intention/settings.gradle.kts @@ -0,0 +1,3 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +rootProject.name = "conditional_operator_intention" diff --git a/code_samples/editor_basics/build.gradle b/code_samples/editor_basics/build.gradle deleted file mode 100644 index 2ee6f3d8c..000000000 --- a/code_samples/editor_basics/build.gradle +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -plugins { - id 'java' - id 'org.jetbrains.intellij' version '1.4.0' -} - -group 'org.intellij.sdk' -version '2.0.0' - -sourceCompatibility = 11 - -repositories { - mavenCentral() -} - -// See https://github.com/JetBrains/gradle-intellij-plugin/ -intellij { - version = '2021.1.3' -} - -buildSearchableOptions { - enabled = false -} - -patchPluginXml { - version = project.version - sinceBuild = '211' - untilBuild = '213.*' -} diff --git a/code_samples/editor_basics/build.gradle.kts b/code_samples/editor_basics/build.gradle.kts new file mode 100644 index 000000000..248523c17 --- /dev/null +++ b/code_samples/editor_basics/build.gradle.kts @@ -0,0 +1,34 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +plugins { + id("java") + id("org.jetbrains.intellij") version "1.4.0" +} + +group = "com.intellij.sdk" +version = "2.0.0" + +repositories { + mavenCentral() +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version.set("2021.1.3") +} + +tasks { + buildSearchableOptions { + enabled = false + } + + patchPluginXml { + version.set("${project.version}") + sinceBuild.set("211") + untilBuild.set("213.*") + } +} diff --git a/code_samples/editor_basics/settings.gradle b/code_samples/editor_basics/settings.gradle deleted file mode 100644 index 77bde7d56..000000000 --- a/code_samples/editor_basics/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -rootProject.name = 'editor' diff --git a/code_samples/editor_basics/settings.gradle.kts b/code_samples/editor_basics/settings.gradle.kts new file mode 100644 index 000000000..da0b63a3c --- /dev/null +++ b/code_samples/editor_basics/settings.gradle.kts @@ -0,0 +1,3 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +rootProject.name = "editor" diff --git a/code_samples/facet_basics/build.gradle b/code_samples/facet_basics/build.gradle deleted file mode 100644 index 2ee6f3d8c..000000000 --- a/code_samples/facet_basics/build.gradle +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -plugins { - id 'java' - id 'org.jetbrains.intellij' version '1.4.0' -} - -group 'org.intellij.sdk' -version '2.0.0' - -sourceCompatibility = 11 - -repositories { - mavenCentral() -} - -// See https://github.com/JetBrains/gradle-intellij-plugin/ -intellij { - version = '2021.1.3' -} - -buildSearchableOptions { - enabled = false -} - -patchPluginXml { - version = project.version - sinceBuild = '211' - untilBuild = '213.*' -} diff --git a/code_samples/facet_basics/build.gradle.kts b/code_samples/facet_basics/build.gradle.kts new file mode 100644 index 000000000..ca61af869 --- /dev/null +++ b/code_samples/facet_basics/build.gradle.kts @@ -0,0 +1,34 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +plugins { + id("java") + id("org.jetbrains.intellij") version "1.4.0" +} + +group = "org.intellij.sdk" +version = "2.0.0" + +repositories { + mavenCentral() +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version.set("2021.1.3") +} + +tasks { + buildSearchableOptions { + enabled = false + } + + patchPluginXml { + version.set("${project.version}") + sinceBuild.set("211") + untilBuild.set("213.*") + } +} diff --git a/code_samples/facet_basics/settings.gradle b/code_samples/facet_basics/settings.gradle deleted file mode 100644 index 636bf7425..000000000 --- a/code_samples/facet_basics/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -rootProject.name = 'facet' diff --git a/code_samples/facet_basics/settings.gradle.kts b/code_samples/facet_basics/settings.gradle.kts new file mode 100644 index 000000000..45dcf4e53 --- /dev/null +++ b/code_samples/facet_basics/settings.gradle.kts @@ -0,0 +1,3 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +rootProject.name = "facet" diff --git a/code_samples/framework_basics/build.gradle b/code_samples/framework_basics/build.gradle deleted file mode 100644 index 671b67a43..000000000 --- a/code_samples/framework_basics/build.gradle +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -plugins { - id 'java' - id 'org.jetbrains.intellij' version '1.4.0' -} - -group 'org.intellij.sdk' -version '2.0.0' - -sourceCompatibility = 11 - -repositories { - mavenCentral() -} - -// See https://github.com/JetBrains/gradle-intellij-plugin/ -intellij { - version = '2021.1.3' - plugins = ['com.intellij.java'] -} - -buildSearchableOptions { - enabled = false -} - -patchPluginXml { - version = project.version - sinceBuild = '202' - untilBuild = '203.*' -} diff --git a/code_samples/framework_basics/build.gradle.kts b/code_samples/framework_basics/build.gradle.kts new file mode 100644 index 000000000..ff214db1f --- /dev/null +++ b/code_samples/framework_basics/build.gradle.kts @@ -0,0 +1,35 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +plugins { + id("java") + id("org.jetbrains.intellij") version "1.4.0" +} + +group = "org.intellij.sdk" +version = "2.0.0" + +repositories { + mavenCentral() +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version.set("2021.1.3") + plugins.set(listOf("com.intellij.java")) +} + +tasks { + buildSearchableOptions { + enabled = false + } + + patchPluginXml { + version.set("${project.version}") + sinceBuild.set("202") + untilBuild.set("203.*") + } +} diff --git a/code_samples/framework_basics/settings.gradle b/code_samples/framework_basics/settings.gradle deleted file mode 100644 index b32c0f834..000000000 --- a/code_samples/framework_basics/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -rootProject.name = 'framework' diff --git a/code_samples/framework_basics/settings.gradle.kts b/code_samples/framework_basics/settings.gradle.kts new file mode 100644 index 000000000..399b203fe --- /dev/null +++ b/code_samples/framework_basics/settings.gradle.kts @@ -0,0 +1,3 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +rootProject.name = "framework" diff --git a/code_samples/inspection_basics/build.gradle b/code_samples/inspection_basics/build.gradle deleted file mode 100644 index 2ee6f3d8c..000000000 --- a/code_samples/inspection_basics/build.gradle +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -plugins { - id 'java' - id 'org.jetbrains.intellij' version '1.4.0' -} - -group 'org.intellij.sdk' -version '2.0.0' - -sourceCompatibility = 11 - -repositories { - mavenCentral() -} - -// See https://github.com/JetBrains/gradle-intellij-plugin/ -intellij { - version = '2021.1.3' -} - -buildSearchableOptions { - enabled = false -} - -patchPluginXml { - version = project.version - sinceBuild = '211' - untilBuild = '213.*' -} diff --git a/code_samples/inspection_basics/build.gradle.kts b/code_samples/inspection_basics/build.gradle.kts new file mode 100644 index 000000000..248523c17 --- /dev/null +++ b/code_samples/inspection_basics/build.gradle.kts @@ -0,0 +1,34 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +plugins { + id("java") + id("org.jetbrains.intellij") version "1.4.0" +} + +group = "com.intellij.sdk" +version = "2.0.0" + +repositories { + mavenCentral() +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version.set("2021.1.3") +} + +tasks { + buildSearchableOptions { + enabled = false + } + + patchPluginXml { + version.set("${project.version}") + sinceBuild.set("211") + untilBuild.set("213.*") + } +} diff --git a/code_samples/inspection_basics/settings.gradle b/code_samples/inspection_basics/settings.gradle deleted file mode 100644 index 21f57b3d1..000000000 --- a/code_samples/inspection_basics/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -rootProject.name = 'inspection' diff --git a/code_samples/inspection_basics/settings.gradle.kts b/code_samples/inspection_basics/settings.gradle.kts new file mode 100644 index 000000000..3d925b850 --- /dev/null +++ b/code_samples/inspection_basics/settings.gradle.kts @@ -0,0 +1,3 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +rootProject.name = "inspection" diff --git a/code_samples/kotlin_demo/build.gradle b/code_samples/kotlin_demo/build.gradle deleted file mode 100644 index 01d7d8d72..000000000 --- a/code_samples/kotlin_demo/build.gradle +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -plugins { - id 'java' - id 'org.jetbrains.intellij' version '1.4.0' - id 'org.jetbrains.kotlin.jvm' version '1.6.10' -} - -group 'org.intellij.sdk' -version '2.0.0' - -sourceCompatibility = 11 - -repositories { - mavenCentral() -} - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" -} - -// See https://github.com/JetBrains/gradle-intellij-plugin/ -intellij { - version = '2021.1.3' -} - -buildSearchableOptions { - enabled = false -} - -patchPluginXml { - version = project.version - sinceBuild = '211' - untilBuild = '213.*' -} - -compileKotlin { - kotlinOptions.jvmTarget = "11" -} -compileTestKotlin { - kotlinOptions.jvmTarget = "11" -} diff --git a/code_samples/kotlin_demo/build.gradle.kts b/code_samples/kotlin_demo/build.gradle.kts new file mode 100644 index 000000000..1bb587b7b --- /dev/null +++ b/code_samples/kotlin_demo/build.gradle.kts @@ -0,0 +1,43 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +plugins { + id("java") + id("org.jetbrains.intellij") version "1.4.0" + id("org.jetbrains.kotlin.jvm") version "1.6.10" +} + +group = "org.intellij.sdk" +version = "2.0.0" + +repositories { + mavenCentral() +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version.set("2021.1.3") +} + +tasks { + buildSearchableOptions { + enabled = false + } + + patchPluginXml { + version.set("${project.version}") + sinceBuild.set("211") + untilBuild.set("213.*") + } + + compileKotlin { + kotlinOptions.jvmTarget = "11" + } + + compileTestKotlin { + kotlinOptions.jvmTarget = "11" + } +} diff --git a/code_samples/kotlin_demo/settings.gradle b/code_samples/kotlin_demo/settings.gradle deleted file mode 100644 index 813e35f73..000000000 --- a/code_samples/kotlin_demo/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -rootProject.name = 'kotlin' diff --git a/code_samples/kotlin_demo/settings.gradle.kts b/code_samples/kotlin_demo/settings.gradle.kts new file mode 100644 index 000000000..10cb8ccf8 --- /dev/null +++ b/code_samples/kotlin_demo/settings.gradle.kts @@ -0,0 +1,3 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +rootProject.name = "kotlin" diff --git a/code_samples/live_templates/build.gradle b/code_samples/live_templates/build.gradle deleted file mode 100644 index 2ee6f3d8c..000000000 --- a/code_samples/live_templates/build.gradle +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -plugins { - id 'java' - id 'org.jetbrains.intellij' version '1.4.0' -} - -group 'org.intellij.sdk' -version '2.0.0' - -sourceCompatibility = 11 - -repositories { - mavenCentral() -} - -// See https://github.com/JetBrains/gradle-intellij-plugin/ -intellij { - version = '2021.1.3' -} - -buildSearchableOptions { - enabled = false -} - -patchPluginXml { - version = project.version - sinceBuild = '211' - untilBuild = '213.*' -} diff --git a/code_samples/live_templates/build.gradle.kts b/code_samples/live_templates/build.gradle.kts new file mode 100644 index 000000000..ca61af869 --- /dev/null +++ b/code_samples/live_templates/build.gradle.kts @@ -0,0 +1,34 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +plugins { + id("java") + id("org.jetbrains.intellij") version "1.4.0" +} + +group = "org.intellij.sdk" +version = "2.0.0" + +repositories { + mavenCentral() +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version.set("2021.1.3") +} + +tasks { + buildSearchableOptions { + enabled = false + } + + patchPluginXml { + version.set("${project.version}") + sinceBuild.set("211") + untilBuild.set("213.*") + } +} diff --git a/code_samples/live_templates/settings.gradle b/code_samples/live_templates/settings.gradle deleted file mode 100644 index 14174622f..000000000 --- a/code_samples/live_templates/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -rootProject.name = 'live_templates' diff --git a/code_samples/live_templates/settings.gradle.kts b/code_samples/live_templates/settings.gradle.kts new file mode 100644 index 000000000..73ac68e18 --- /dev/null +++ b/code_samples/live_templates/settings.gradle.kts @@ -0,0 +1,3 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +rootProject.name = "live_templates" diff --git a/code_samples/max_opened_projects/build.gradle b/code_samples/max_opened_projects/build.gradle deleted file mode 100644 index 2ee6f3d8c..000000000 --- a/code_samples/max_opened_projects/build.gradle +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -plugins { - id 'java' - id 'org.jetbrains.intellij' version '1.4.0' -} - -group 'org.intellij.sdk' -version '2.0.0' - -sourceCompatibility = 11 - -repositories { - mavenCentral() -} - -// See https://github.com/JetBrains/gradle-intellij-plugin/ -intellij { - version = '2021.1.3' -} - -buildSearchableOptions { - enabled = false -} - -patchPluginXml { - version = project.version - sinceBuild = '211' - untilBuild = '213.*' -} diff --git a/code_samples/max_opened_projects/build.gradle.kts b/code_samples/max_opened_projects/build.gradle.kts new file mode 100644 index 000000000..ca61af869 --- /dev/null +++ b/code_samples/max_opened_projects/build.gradle.kts @@ -0,0 +1,34 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +plugins { + id("java") + id("org.jetbrains.intellij") version "1.4.0" +} + +group = "org.intellij.sdk" +version = "2.0.0" + +repositories { + mavenCentral() +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version.set("2021.1.3") +} + +tasks { + buildSearchableOptions { + enabled = false + } + + patchPluginXml { + version.set("${project.version}") + sinceBuild.set("211") + untilBuild.set("213.*") + } +} diff --git a/code_samples/max_opened_projects/settings.gradle b/code_samples/max_opened_projects/settings.gradle deleted file mode 100644 index a3ef7ba52..000000000 --- a/code_samples/max_opened_projects/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -rootProject.name = 'maxOpenProjects' diff --git a/code_samples/max_opened_projects/settings.gradle.kts b/code_samples/max_opened_projects/settings.gradle.kts new file mode 100644 index 000000000..2281ed667 --- /dev/null +++ b/code_samples/max_opened_projects/settings.gradle.kts @@ -0,0 +1,3 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +rootProject.name = "maxOpenProjects" diff --git a/code_samples/module/build.gradle b/code_samples/module/build.gradle deleted file mode 100644 index 2ee6f3d8c..000000000 --- a/code_samples/module/build.gradle +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -plugins { - id 'java' - id 'org.jetbrains.intellij' version '1.4.0' -} - -group 'org.intellij.sdk' -version '2.0.0' - -sourceCompatibility = 11 - -repositories { - mavenCentral() -} - -// See https://github.com/JetBrains/gradle-intellij-plugin/ -intellij { - version = '2021.1.3' -} - -buildSearchableOptions { - enabled = false -} - -patchPluginXml { - version = project.version - sinceBuild = '211' - untilBuild = '213.*' -} diff --git a/code_samples/module/build.gradle.kts b/code_samples/module/build.gradle.kts new file mode 100644 index 000000000..ca61af869 --- /dev/null +++ b/code_samples/module/build.gradle.kts @@ -0,0 +1,34 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +plugins { + id("java") + id("org.jetbrains.intellij") version "1.4.0" +} + +group = "org.intellij.sdk" +version = "2.0.0" + +repositories { + mavenCentral() +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version.set("2021.1.3") +} + +tasks { + buildSearchableOptions { + enabled = false + } + + patchPluginXml { + version.set("${project.version}") + sinceBuild.set("211") + untilBuild.set("213.*") + } +} diff --git a/code_samples/module/settings.gradle b/code_samples/module/settings.gradle deleted file mode 100644 index a14dfefca..000000000 --- a/code_samples/module/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -rootProject.name = 'module' diff --git a/code_samples/module/settings.gradle.kts b/code_samples/module/settings.gradle.kts new file mode 100644 index 000000000..706705298 --- /dev/null +++ b/code_samples/module/settings.gradle.kts @@ -0,0 +1,3 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +rootProject.name = "module" diff --git a/code_samples/product_specific/pycharm_basics/build.gradle b/code_samples/product_specific/pycharm_basics/build.gradle deleted file mode 100644 index 866bed0f1..000000000 --- a/code_samples/product_specific/pycharm_basics/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -plugins { - id 'java' - id 'org.jetbrains.intellij' version '1.4.0' -} - -group 'com.intellij.sdk' -version '0.1.0' - -sourceCompatibility = 11 - -repositories { - mavenCentral() -} - -// See https://github.com/JetBrains/gradle-intellij-plugin/ -intellij { - version = '2021.2' - type = 'PY' - plugins = ["Pythonid"] - downloadSources = false -} - -buildSearchableOptions { - enabled = false -} - -patchPluginXml { - version = project.version - sinceBuild = '212' - untilBuild = '213.*' -} diff --git a/code_samples/product_specific/pycharm_basics/build.gradle.kts b/code_samples/product_specific/pycharm_basics/build.gradle.kts new file mode 100644 index 000000000..44190aaf2 --- /dev/null +++ b/code_samples/product_specific/pycharm_basics/build.gradle.kts @@ -0,0 +1,37 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +plugins { + id("java") + id("org.jetbrains.intellij") version "1.4.0" +} + +group = "com.intellij.sdk" +version = "0.1.0" + +repositories { + mavenCentral() +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version.set("2021.2") + type.set("PY") + plugins.set(listOf("Pythonid")) + downloadSources.set(false) +} + +tasks { + buildSearchableOptions { + enabled = false + } + + patchPluginXml { + version.set("${project.version}") + sinceBuild.set("212") + untilBuild.set("213.*") + } +} diff --git a/code_samples/product_specific/pycharm_basics/settings.gradle b/code_samples/product_specific/pycharm_basics/settings.gradle deleted file mode 100644 index e8737e1b1..000000000 --- a/code_samples/product_specific/pycharm_basics/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -rootProject.name = 'pycharm' diff --git a/code_samples/product_specific/pycharm_basics/settings.gradle.kts b/code_samples/product_specific/pycharm_basics/settings.gradle.kts new file mode 100644 index 000000000..9a6542a40 --- /dev/null +++ b/code_samples/product_specific/pycharm_basics/settings.gradle.kts @@ -0,0 +1,3 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +rootProject.name = "pycharm" diff --git a/code_samples/project_model/build.gradle b/code_samples/project_model/build.gradle deleted file mode 100644 index 188536db1..000000000 --- a/code_samples/project_model/build.gradle +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -plugins { - id 'java' - id 'org.jetbrains.intellij' version '1.4.0' -} - -group 'org.intellij.sdk' -version '2.0.0' - -sourceCompatibility = 11 - -repositories { - mavenCentral() -} - -// See https://github.com/JetBrains/gradle-intellij-plugin/ -intellij { - version = '2021.1.3' - plugins = ['com.intellij.java'] -} - -buildSearchableOptions { - enabled = false -} - -patchPluginXml { - version = project.version - sinceBuild = '211' - untilBuild = '213.*' -} diff --git a/code_samples/project_model/build.gradle.kts b/code_samples/project_model/build.gradle.kts new file mode 100644 index 000000000..a7106bcd6 --- /dev/null +++ b/code_samples/project_model/build.gradle.kts @@ -0,0 +1,35 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +plugins { + id("java") + id("org.jetbrains.intellij") version "1.4.0" +} + +group = "org.intellij.sdk" +version = "2.0.0" + +repositories { + mavenCentral() +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version.set("2021.1.3") + plugins.set(listOf("com.intellij.java")) +} + +tasks { + buildSearchableOptions { + enabled = false + } + + patchPluginXml { + version.set("${project.version}") + sinceBuild.set("211") + untilBuild.set("213.*") + } +} diff --git a/code_samples/project_model/settings.gradle b/code_samples/project_model/settings.gradle deleted file mode 100644 index efd078e9e..000000000 --- a/code_samples/project_model/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -rootProject.name = 'project_model' diff --git a/code_samples/project_model/settings.gradle.kts b/code_samples/project_model/settings.gradle.kts new file mode 100644 index 000000000..23eceb90f --- /dev/null +++ b/code_samples/project_model/settings.gradle.kts @@ -0,0 +1,3 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +rootProject.name = "project_model" diff --git a/code_samples/project_view_pane/build.gradle b/code_samples/project_view_pane/build.gradle deleted file mode 100644 index 2ee6f3d8c..000000000 --- a/code_samples/project_view_pane/build.gradle +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -plugins { - id 'java' - id 'org.jetbrains.intellij' version '1.4.0' -} - -group 'org.intellij.sdk' -version '2.0.0' - -sourceCompatibility = 11 - -repositories { - mavenCentral() -} - -// See https://github.com/JetBrains/gradle-intellij-plugin/ -intellij { - version = '2021.1.3' -} - -buildSearchableOptions { - enabled = false -} - -patchPluginXml { - version = project.version - sinceBuild = '211' - untilBuild = '213.*' -} diff --git a/code_samples/project_view_pane/build.gradle.kts b/code_samples/project_view_pane/build.gradle.kts new file mode 100644 index 000000000..ca61af869 --- /dev/null +++ b/code_samples/project_view_pane/build.gradle.kts @@ -0,0 +1,34 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +plugins { + id("java") + id("org.jetbrains.intellij") version "1.4.0" +} + +group = "org.intellij.sdk" +version = "2.0.0" + +repositories { + mavenCentral() +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version.set("2021.1.3") +} + +tasks { + buildSearchableOptions { + enabled = false + } + + patchPluginXml { + version.set("${project.version}") + sinceBuild.set("211") + untilBuild.set("213.*") + } +} diff --git a/code_samples/project_view_pane/settings.gradle b/code_samples/project_view_pane/settings.gradle deleted file mode 100644 index fc4bce9bd..000000000 --- a/code_samples/project_view_pane/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -rootProject.name = 'project_view_pane' diff --git a/code_samples/project_view_pane/settings.gradle.kts b/code_samples/project_view_pane/settings.gradle.kts new file mode 100644 index 000000000..318702db7 --- /dev/null +++ b/code_samples/project_view_pane/settings.gradle.kts @@ -0,0 +1,3 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +rootProject.name = "project_view_pane" diff --git a/code_samples/project_wizard/build.gradle b/code_samples/project_wizard/build.gradle deleted file mode 100644 index 2ee6f3d8c..000000000 --- a/code_samples/project_wizard/build.gradle +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -plugins { - id 'java' - id 'org.jetbrains.intellij' version '1.4.0' -} - -group 'org.intellij.sdk' -version '2.0.0' - -sourceCompatibility = 11 - -repositories { - mavenCentral() -} - -// See https://github.com/JetBrains/gradle-intellij-plugin/ -intellij { - version = '2021.1.3' -} - -buildSearchableOptions { - enabled = false -} - -patchPluginXml { - version = project.version - sinceBuild = '211' - untilBuild = '213.*' -} diff --git a/code_samples/project_wizard/build.gradle.kts b/code_samples/project_wizard/build.gradle.kts new file mode 100644 index 000000000..ca61af869 --- /dev/null +++ b/code_samples/project_wizard/build.gradle.kts @@ -0,0 +1,34 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +plugins { + id("java") + id("org.jetbrains.intellij") version "1.4.0" +} + +group = "org.intellij.sdk" +version = "2.0.0" + +repositories { + mavenCentral() +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version.set("2021.1.3") +} + +tasks { + buildSearchableOptions { + enabled = false + } + + patchPluginXml { + version.set("${project.version}") + sinceBuild.set("211") + untilBuild.set("213.*") + } +} diff --git a/code_samples/project_wizard/settings.gradle b/code_samples/project_wizard/settings.gradle deleted file mode 100644 index d4638bef0..000000000 --- a/code_samples/project_wizard/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -rootProject.name = 'projectWizard' diff --git a/code_samples/project_wizard/settings.gradle.kts b/code_samples/project_wizard/settings.gradle.kts new file mode 100644 index 000000000..291e5ca3b --- /dev/null +++ b/code_samples/project_wizard/settings.gradle.kts @@ -0,0 +1,3 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +rootProject.name = "projectWizard" diff --git a/code_samples/psi_demo/build.gradle b/code_samples/psi_demo/build.gradle deleted file mode 100644 index 188536db1..000000000 --- a/code_samples/psi_demo/build.gradle +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -plugins { - id 'java' - id 'org.jetbrains.intellij' version '1.4.0' -} - -group 'org.intellij.sdk' -version '2.0.0' - -sourceCompatibility = 11 - -repositories { - mavenCentral() -} - -// See https://github.com/JetBrains/gradle-intellij-plugin/ -intellij { - version = '2021.1.3' - plugins = ['com.intellij.java'] -} - -buildSearchableOptions { - enabled = false -} - -patchPluginXml { - version = project.version - sinceBuild = '211' - untilBuild = '213.*' -} diff --git a/code_samples/psi_demo/build.gradle.kts b/code_samples/psi_demo/build.gradle.kts new file mode 100644 index 000000000..7d74b0e95 --- /dev/null +++ b/code_samples/psi_demo/build.gradle.kts @@ -0,0 +1,35 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +plugins { + id("java") + id("org.jetbrains.intellij") version "1.4.0" +} + +group = "com.intellij.sdk" +version = "2.0.0" + +repositories { + mavenCentral() +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version.set("2021.1.3") + plugins.set(listOf("com.intellij.java")) +} + +tasks { + buildSearchableOptions { + enabled = false + } + + patchPluginXml { + version.set("${project.version}") + sinceBuild.set("211") + untilBuild.set("213.*") + } +} diff --git a/code_samples/psi_demo/settings.gradle b/code_samples/psi_demo/settings.gradle deleted file mode 100644 index e606f61d8..000000000 --- a/code_samples/psi_demo/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -rootProject.name = 'psi' diff --git a/code_samples/psi_demo/settings.gradle.kts b/code_samples/psi_demo/settings.gradle.kts new file mode 100644 index 000000000..5577a9099 --- /dev/null +++ b/code_samples/psi_demo/settings.gradle.kts @@ -0,0 +1,3 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +rootProject.name = "psi" diff --git a/code_samples/run_configuration/build.gradle b/code_samples/run_configuration/build.gradle deleted file mode 100644 index 2ee6f3d8c..000000000 --- a/code_samples/run_configuration/build.gradle +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -plugins { - id 'java' - id 'org.jetbrains.intellij' version '1.4.0' -} - -group 'org.intellij.sdk' -version '2.0.0' - -sourceCompatibility = 11 - -repositories { - mavenCentral() -} - -// See https://github.com/JetBrains/gradle-intellij-plugin/ -intellij { - version = '2021.1.3' -} - -buildSearchableOptions { - enabled = false -} - -patchPluginXml { - version = project.version - sinceBuild = '211' - untilBuild = '213.*' -} diff --git a/code_samples/run_configuration/build.gradle.kts b/code_samples/run_configuration/build.gradle.kts new file mode 100644 index 000000000..248523c17 --- /dev/null +++ b/code_samples/run_configuration/build.gradle.kts @@ -0,0 +1,34 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +plugins { + id("java") + id("org.jetbrains.intellij") version "1.4.0" +} + +group = "com.intellij.sdk" +version = "2.0.0" + +repositories { + mavenCentral() +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version.set("2021.1.3") +} + +tasks { + buildSearchableOptions { + enabled = false + } + + patchPluginXml { + version.set("${project.version}") + sinceBuild.set("211") + untilBuild.set("213.*") + } +} diff --git a/code_samples/run_configuration/settings.gradle b/code_samples/run_configuration/settings.gradle deleted file mode 100644 index 551ab4057..000000000 --- a/code_samples/run_configuration/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -rootProject.name = 'runConfiguration' diff --git a/code_samples/run_configuration/settings.gradle.kts b/code_samples/run_configuration/settings.gradle.kts new file mode 100644 index 000000000..89bd5b71f --- /dev/null +++ b/code_samples/run_configuration/settings.gradle.kts @@ -0,0 +1,3 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +rootProject.name = "runConfiguration" diff --git a/code_samples/settings/build.gradle b/code_samples/settings/build.gradle deleted file mode 100644 index 2ee6f3d8c..000000000 --- a/code_samples/settings/build.gradle +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -plugins { - id 'java' - id 'org.jetbrains.intellij' version '1.4.0' -} - -group 'org.intellij.sdk' -version '2.0.0' - -sourceCompatibility = 11 - -repositories { - mavenCentral() -} - -// See https://github.com/JetBrains/gradle-intellij-plugin/ -intellij { - version = '2021.1.3' -} - -buildSearchableOptions { - enabled = false -} - -patchPluginXml { - version = project.version - sinceBuild = '211' - untilBuild = '213.*' -} diff --git a/code_samples/settings/build.gradle.kts b/code_samples/settings/build.gradle.kts new file mode 100644 index 000000000..ca61af869 --- /dev/null +++ b/code_samples/settings/build.gradle.kts @@ -0,0 +1,34 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +plugins { + id("java") + id("org.jetbrains.intellij") version "1.4.0" +} + +group = "org.intellij.sdk" +version = "2.0.0" + +repositories { + mavenCentral() +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version.set("2021.1.3") +} + +tasks { + buildSearchableOptions { + enabled = false + } + + patchPluginXml { + version.set("${project.version}") + sinceBuild.set("211") + untilBuild.set("213.*") + } +} diff --git a/code_samples/settings/settings.gradle b/code_samples/settings/settings.gradle deleted file mode 100644 index bd70031ec..000000000 --- a/code_samples/settings/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'settings' diff --git a/code_samples/settings/settings.gradle.kts b/code_samples/settings/settings.gradle.kts new file mode 100644 index 000000000..84ddf4565 --- /dev/null +++ b/code_samples/settings/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "settings" diff --git a/code_samples/simple_language_plugin/build.gradle b/code_samples/simple_language_plugin/build.gradle deleted file mode 100644 index 7396dcc1b..000000000 --- a/code_samples/simple_language_plugin/build.gradle +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -plugins { - id 'java' - id 'org.jetbrains.intellij' version '1.4.0' -} - -group 'org.intellij.sdk' -version '2.0.0' - -sourceCompatibility = 11 - -repositories { - mavenCentral() -} - -test { - // This path value is machine-specific placeholder text. - // Set idea.home.path to the absolute path to the intellij-community source - // on your local machine. - // Use variants described in https://docs.gradle.org/current/userguide/build_environment.html - // for real world projects. - systemProperty "idea.home.path", "/Users/jhake/Documents/source/comm" -} - -// Include the generated files in the source set -sourceSets.main.java.srcDirs 'src/main/gen' - -dependencies { - testImplementation group: 'junit', name: 'junit', version: '4.13.2' -} - -// See https://github.com/JetBrains/gradle-intellij-plugin/ -intellij { - version = '2021.1.3' - plugins = ['com.intellij.java'] -} - -buildSearchableOptions { - enabled = false -} - -patchPluginXml { - version = project.version - sinceBuild = '211' - untilBuild = '213.*' -} diff --git a/code_samples/simple_language_plugin/build.gradle.kts b/code_samples/simple_language_plugin/build.gradle.kts new file mode 100644 index 000000000..9e166be9c --- /dev/null +++ b/code_samples/simple_language_plugin/build.gradle.kts @@ -0,0 +1,56 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +plugins { + id("java") + id("org.jetbrains.intellij") version "1.4.0" +} + +group = "org.intellij.sdk" +version = "2.0.0" + +repositories { + mavenCentral() +} + +// Include the generated files in the source set +sourceSets { + main { + java { + srcDirs("src/main/gen") + } + } +} + +dependencies { + testImplementation("junit:junit:4.13.2") +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version.set("2021.1.3") + plugins.set(listOf("com.intellij.java")) +} + +tasks { + buildSearchableOptions { + enabled = false + } + + patchPluginXml { + version.set("${project.version}") + sinceBuild.set("211") + untilBuild.set("213.*") + } + + test { + // This path value is a machine-specific placeholder text. + // Set idea.home.path to the absolute path to the intellij-community source + // on your local machine. For real world projects, use variants described in: + // https://docs.gradle.org/current/userguide/build_environment.html + systemProperty("idea.home.path", "/Users/jhake/Documents/source/comm") + } +} diff --git a/code_samples/simple_language_plugin/settings.gradle b/code_samples/simple_language_plugin/settings.gradle deleted file mode 100644 index 0b0665f2e..000000000 --- a/code_samples/simple_language_plugin/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -rootProject.name = 'simple_language_plugin' diff --git a/code_samples/simple_language_plugin/settings.gradle.kts b/code_samples/simple_language_plugin/settings.gradle.kts new file mode 100644 index 000000000..0a8415f5b --- /dev/null +++ b/code_samples/simple_language_plugin/settings.gradle.kts @@ -0,0 +1,3 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +rootProject.name = "simple_language_plugin" diff --git a/code_samples/tool_window/build.gradle b/code_samples/tool_window/build.gradle deleted file mode 100644 index 2ee6f3d8c..000000000 --- a/code_samples/tool_window/build.gradle +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -plugins { - id 'java' - id 'org.jetbrains.intellij' version '1.4.0' -} - -group 'org.intellij.sdk' -version '2.0.0' - -sourceCompatibility = 11 - -repositories { - mavenCentral() -} - -// See https://github.com/JetBrains/gradle-intellij-plugin/ -intellij { - version = '2021.1.3' -} - -buildSearchableOptions { - enabled = false -} - -patchPluginXml { - version = project.version - sinceBuild = '211' - untilBuild = '213.*' -} diff --git a/code_samples/tool_window/build.gradle.kts b/code_samples/tool_window/build.gradle.kts new file mode 100644 index 000000000..ca61af869 --- /dev/null +++ b/code_samples/tool_window/build.gradle.kts @@ -0,0 +1,34 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +plugins { + id("java") + id("org.jetbrains.intellij") version "1.4.0" +} + +group = "org.intellij.sdk" +version = "2.0.0" + +repositories { + mavenCentral() +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version.set("2021.1.3") +} + +tasks { + buildSearchableOptions { + enabled = false + } + + patchPluginXml { + version.set("${project.version}") + sinceBuild.set("211") + untilBuild.set("213.*") + } +} diff --git a/code_samples/tool_window/settings.gradle b/code_samples/tool_window/settings.gradle deleted file mode 100644 index 5eca40f4d..000000000 --- a/code_samples/tool_window/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -rootProject.name = 'toolWindow' diff --git a/code_samples/tool_window/settings.gradle.kts b/code_samples/tool_window/settings.gradle.kts new file mode 100644 index 000000000..05f367fdb --- /dev/null +++ b/code_samples/tool_window/settings.gradle.kts @@ -0,0 +1,3 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +rootProject.name = "toolWindow" diff --git a/code_samples/tree_structure_provider/build.gradle b/code_samples/tree_structure_provider/build.gradle deleted file mode 100644 index 2ee6f3d8c..000000000 --- a/code_samples/tree_structure_provider/build.gradle +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -plugins { - id 'java' - id 'org.jetbrains.intellij' version '1.4.0' -} - -group 'org.intellij.sdk' -version '2.0.0' - -sourceCompatibility = 11 - -repositories { - mavenCentral() -} - -// See https://github.com/JetBrains/gradle-intellij-plugin/ -intellij { - version = '2021.1.3' -} - -buildSearchableOptions { - enabled = false -} - -patchPluginXml { - version = project.version - sinceBuild = '211' - untilBuild = '213.*' -} diff --git a/code_samples/tree_structure_provider/build.gradle.kts b/code_samples/tree_structure_provider/build.gradle.kts new file mode 100644 index 000000000..ca61af869 --- /dev/null +++ b/code_samples/tree_structure_provider/build.gradle.kts @@ -0,0 +1,34 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +plugins { + id("java") + id("org.jetbrains.intellij") version "1.4.0" +} + +group = "org.intellij.sdk" +version = "2.0.0" + +repositories { + mavenCentral() +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version.set("2021.1.3") +} + +tasks { + buildSearchableOptions { + enabled = false + } + + patchPluginXml { + version.set("${project.version}") + sinceBuild.set("211") + untilBuild.set("213.*") + } +} diff --git a/code_samples/tree_structure_provider/settings.gradle b/code_samples/tree_structure_provider/settings.gradle deleted file mode 100644 index 73745ea4b..000000000 --- a/code_samples/tree_structure_provider/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - -rootProject.name = 'treeStructureProvider' diff --git a/code_samples/tree_structure_provider/settings.gradle.kts b/code_samples/tree_structure_provider/settings.gradle.kts new file mode 100644 index 000000000..6ca88bc20 --- /dev/null +++ b/code_samples/tree_structure_provider/settings.gradle.kts @@ -0,0 +1,3 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +rootProject.name = "treeStructureProvider" diff --git a/topics/intro/content_updates.md b/topics/intro/content_updates.md index 7c21ada06..cbf31620d 100644 --- a/topics/intro/content_updates.md +++ b/topics/intro/content_updates.md @@ -11,6 +11,9 @@ See [GitHub Changelog](https://github.com/JetBrains/intellij-sdk-docs/commits/ma ### March-22 +Code Samples Build Scripts Migrated to Kotlin +: [All samples](https://github.com/JetBrains/intellij-sdk-docs/tree/main/code_samples) now use Kotlin DSL in Gradle build scripts. + Android Studio Releases List : Add [](android_studio_releases_list.md) section containing a complete list of the Android Studio releases with the relevant IntelliJ IDEA release version specified. diff --git a/topics/intro/sdk_code_guidelines.md b/topics/intro/sdk_code_guidelines.md index 5780577e9..49eaf57cd 100644 --- a/topics/intro/sdk_code_guidelines.md +++ b/topics/intro/sdk_code_guidelines.md @@ -116,35 +116,35 @@ code_samples/ java/ org.intellij.sdk.foo/ resources/ - build.gradle + build.gradle.kts gradlew gradle.bat - settings.gradle + settings.gradle.kts README.md ``` -## build.gradle Conventions +## Gradle Build Script Conventions SDK code samples should be developed [using Gradle](gradle_build_system.md). As of this writing, the use of Gradle in SDK code samples still relies heavily on the plugin.xml for specifying the plugin configuration. At a later, second phase, the SDK code samples will transition to rely more on the Gradle configuration. -The default contents of a build.gradle file are produced by the [New Project Wizard](gradle_prerequisites.md#creating-a-gradle-based-intellij-platform-plugin-with-new-project-wizard). -A consistent structure for an SDK code sample's build.gradle file is essential for clarity and is based on the default produced by the project wizard. -Comments in SDK code sample build.gradle files should only draw attention to the parts of the Gradle configuration that are unique for a plugin. +The default contents of a Gradle build script file are produced by the [New Project Wizard](gradle_prerequisites.md#creating-a-gradle-based-intellij-platform-plugin-with-new-project-wizard). +A consistent structure for an SDK code sample's Gradle build script file is essential for clarity and is based on the default produced by the project wizard. +Comments in SDK code sample Gradle build scripts should only draw attention to the parts of the Gradle configuration that are unique for a plugin. -For SDK code samples, a few alterations are needed to the default build.gradle file produced by the plugin wizard: +For SDK code samples, a few alterations are needed to the default build.gradle.kts file produced by the plugin wizard: * Maintain the Gradle properties `version` (`project.version`) and `group` (`project.group`). See the [Plugin Gradle Properties](gradle_prerequisites.md#plugin-gradle-properties-and-plugin-configuration-file-elements) section for how these Gradle properties relate to the elements in plugin.xml. -* Add the following statement to the [Setup DSL](https://github.com/JetBrains/gradle-intellij-plugin#setup-dsl) (`intellij{}`) section: - ```groovy - // Prevents patching attributes in plugin.xml - updateSinceUntilBuild = false +* Add the following statement to the [Setup DSL](https://github.com/JetBrains/gradle-intellij-plugin#setup-dsl) (`intellij {...}`) section: + ```kotlin + // Prevents patching attributes in plugin.xml + updateSinceUntilBuild.set(false) ``` -* Add the following statement to the [Patching DSL](https://github.com/JetBrains/gradle-intellij-plugin#patching-dsl) (`patchPluginXml{}`) section: - ```groovy - // Patches value in plugin.xml - version = project.version +* Add the following statement to the [Patching DSL](https://github.com/JetBrains/gradle-intellij-plugin#patching-dsl) (`patchPluginXml {...}`) section: + ```kotlin + // Patches value in plugin.xml + version.set(project.version) ``` ## plugin.xml Conventions diff --git a/topics/tutorials/kotlin.md b/topics/tutorials/kotlin.md index 1f51cecf7..bb1779545 100644 --- a/topics/tutorials/kotlin.md +++ b/topics/tutorials/kotlin.md @@ -84,11 +84,11 @@ Please see [Third-Party Software and Licenses](https://www.jetbrains.com/legal/t Plugins using the [Gradle Build System](gradle_build_system.md) use the [Kotlin JVM Gradle plugin](https://kotlinlang.org/docs/gradle.html#targeting-the-jvm). -See the build.gradle from [kotlin_demo](https://github.com/JetBrains/intellij-sdk-code-samples/tree/main/kotlin_demo) sample plugin: +See the build.gradle.kts from [kotlin_demo](https://github.com/JetBrains/intellij-sdk-code-samples/tree/main/kotlin_demo) sample plugin: -```groovy +```kotlin ``` -{src="kotlin_demo/build.gradle"} +{src="kotlin_demo/build.gradle.kts" lines="2-"} ### Use Kotlin for Gradle Build Scripts