diff --git a/comparing_references_inspection/resources/META-INF/plugin.xml b/comparing_references_inspection/resources/META-INF/plugin.xml index 6823355cb..ba29aa7e8 100644 --- a/comparing_references_inspection/resources/META-INF/plugin.xml +++ b/comparing_references_inspection/resources/META-INF/plugin.xml @@ -13,6 +13,9 @@ + + com.intellij.modules.java + + + com.intellij.modules.java + com.intellij.modules.lang + + com.intellij.modules.platform + + + com.intellij.modules.lang + + diff --git a/framework/resources/META-INF/plugin.xml b/framework/resources/META-INF/plugin.xml index fd9f155d8..4734dfb32 100644 --- a/framework/resources/META-INF/plugin.xml +++ b/framework/resources/META-INF/plugin.xml @@ -8,6 +8,9 @@ + + com.intellij.modules.java + diff --git a/gradle_plugin_demo/build.gradle b/gradle_plugin_demo/build.gradle index 07d203504..5562bfdc3 100644 --- a/gradle_plugin_demo/build.gradle +++ b/gradle_plugin_demo/build.gradle @@ -1,3 +1,24 @@ plugins { - id "org.jetbrains.intellij" version "0.4.8" + id 'java' + id "org.jetbrains.intellij" version "0.4.9" +} + +sourceCompatibility = 1.8 + +repositories { + mavenCentral() +} + +dependencies { + testCompile group: 'junit', name: 'junit', version: '4.12' +} + +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + // Define IntelliJ Platform API version to use for building this plugin + version '2019.1' +} + +patchPluginXml { + untilBuild = '201.*' } diff --git a/gradle_plugin_demo/src/main/resources/META-INF/plugin.xml b/gradle_plugin_demo/src/main/resources/META-INF/plugin.xml index c319e1e07..d079d9d43 100644 --- a/gradle_plugin_demo/src/main/resources/META-INF/plugin.xml +++ b/gradle_plugin_demo/src/main/resources/META-INF/plugin.xml @@ -4,8 +4,9 @@ 0.0.1 dummy - com.intellij.modules.lang + com.intellij.modules.platform + diff --git a/inspection/resources/META-INF/plugin.xml b/inspection/resources/META-INF/plugin.xml index 42d4becf3..2ff75a9c0 100644 --- a/inspection/resources/META-INF/plugin.xml +++ b/inspection/resources/META-INF/plugin.xml @@ -13,6 +13,9 @@ + + com.intellij.modules.platform + - \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/kotlin_demo/gradlew.bat b/kotlin_demo/gradlew.bat new file mode 100644 index 000000000..f9553162f --- /dev/null +++ b/kotlin_demo/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/kotlin_demo/kotlin_demo.iml b/kotlin_demo/kotlin_demo.iml deleted file mode 100644 index 19f024b75..000000000 --- a/kotlin_demo/kotlin_demo.iml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/kotlin_demo/resources/META-INF/plugin.xml b/kotlin_demo/resources/META-INF/plugin.xml deleted file mode 100644 index 86a2aab86..000000000 --- a/kotlin_demo/resources/META-INF/plugin.xml +++ /dev/null @@ -1,38 +0,0 @@ - - org.jetbrains - kotlin_demo - 1.0 - YourCompany - - - most HTML tags may be used - ]]> - - - most HTML tags may be used - ]]> - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/kotlin_demo/settings.gradle b/kotlin_demo/settings.gradle new file mode 100644 index 000000000..540f4adea --- /dev/null +++ b/kotlin_demo/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'kotlin_demo' + diff --git a/kotlin_demo/src/HelloAction.kt b/kotlin_demo/src/main/kotlin/HelloAction.kt similarity index 77% rename from kotlin_demo/src/HelloAction.kt rename to kotlin_demo/src/main/kotlin/HelloAction.kt index 7ddc6d7bb..abb7dd06e 100644 --- a/kotlin_demo/src/HelloAction.kt +++ b/kotlin_demo/src/main/kotlin/HelloAction.kt @@ -1,3 +1,7 @@ +/* + * Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + */ + import com.intellij.openapi.actionSystem.AnAction import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.actionSystem.PlatformDataKeys diff --git a/kotlin_demo/src/main/resources/META-INF/plugin.xml b/kotlin_demo/src/main/resources/META-INF/plugin.xml new file mode 100644 index 000000000..482bf6c5e --- /dev/null +++ b/kotlin_demo/src/main/resources/META-INF/plugin.xml @@ -0,0 +1,53 @@ + + + + + org.intellij.sdk.kotlin_demo + + + SDK: kotlin_demo + + + 2.0.0 + + + + + + com.intellij.modules.platform + org.jetbrains.kotlin + + + + Greeting menu group anchored last in the Main Menu + ]]> + + + + + +
  • 2.0.0 Converted to Gradle project.
    • +
  • 1.0 Release 2019.1 and earlier.
    • + + ]]> +     + + + YourCompany + + + + + + + + +     \ No newline at end of file diff --git a/live_templates/resources/META-INF/plugin.xml b/live_templates/resources/META-INF/plugin.xml index 9d398b9c4..d580b2059 100644 --- a/live_templates/resources/META-INF/plugin.xml +++ b/live_templates/resources/META-INF/plugin.xml @@ -8,6 +8,9 @@ + + com.intellij.modules.platform + diff --git a/max_opened_projects/resources/META-INF/plugin.xml b/max_opened_projects/resources/META-INF/plugin.xml index 0ebd0c576..0ef80748b 100644 --- a/max_opened_projects/resources/META-INF/plugin.xml +++ b/max_opened_projects/resources/META-INF/plugin.xml @@ -5,6 +5,9 @@ JetBrains + + com.intellij.modules.platform + MyPackage.MaxProject diff --git a/module/resources/META-INF/plugin.xml b/module/resources/META-INF/plugin.xml index da14ef442..8a76b1823 100644 --- a/module/resources/META-INF/plugin.xml +++ b/module/resources/META-INF/plugin.xml @@ -8,6 +8,9 @@ + + com.intellij.modules.platform + diff --git a/plugin_sample/resources/META-INF/plugin.xml b/plugin_sample/resources/META-INF/plugin.xml index 3e5c5b65e..d0e33bfc7 100644 --- a/plugin_sample/resources/META-INF/plugin.xml +++ b/plugin_sample/resources/META-INF/plugin.xml @@ -16,8 +16,8 @@ - - com.intellij.modules.lang + + com.intellij.modules.platform diff --git a/project_model/resources/META-INF/plugin.xml b/project_model/resources/META-INF/plugin.xml index 37970ed71..6881b32ae 100644 --- a/project_model/resources/META-INF/plugin.xml +++ b/project_model/resources/META-INF/plugin.xml @@ -7,7 +7,9 @@ Demonstrates various aspects of interacting with project model - com.intellij.modules.lang + + + com.intellij.modules.java Project View Pane Demo listing only image files     - com.intellij.modules.lang + + + com.intellij.modules.platform diff --git a/project_wizard/resources/META-INF/plugin.xml b/project_wizard/resources/META-INF/plugin.xml index f40d9a3d4..a9b2fff7d 100644 --- a/project_wizard/resources/META-INF/plugin.xml +++ b/project_wizard/resources/META-INF/plugin.xml @@ -7,7 +7,7 @@ Illustration of working with Project Wizard - com.intellij.modules.lang + com.intellij.modules.platform + + com.intellij.modules.java + diff --git a/register_actions/resources/META-INF/plugin.xml b/register_actions/resources/META-INF/plugin.xml index 341a81975..76f7dff2c 100644 --- a/register_actions/resources/META-INF/plugin.xml +++ b/register_actions/resources/META-INF/plugin.xml @@ -9,7 +9,7 @@ Refactor to give users feedback when menu items are selected. - com.intellij.modules.lang + com.intellij.modules.platform diff --git a/run_configuration/resources/META-INF/plugin.xml b/run_configuration/resources/META-INF/plugin.xml index c2e7f0426..857d9580d 100644 --- a/run_configuration/resources/META-INF/plugin.xml +++ b/run_configuration/resources/META-INF/plugin.xml @@ -7,7 +7,7 @@ Illustration of working with run configurations - com.intellij.modules.lang + com.intellij.modules.platform diff --git a/simple_language_plugin/resources/META-INF/plugin.xml b/simple_language_plugin/resources/META-INF/plugin.xml index 08375ca0a..0f41aee5e 100644 --- a/simple_language_plugin/resources/META-INF/plugin.xml +++ b/simple_language_plugin/resources/META-INF/plugin.xml @@ -9,6 +9,9 @@ + + com.intellij.modules.java + diff --git a/theme_basics/resources/META-INF/plugin.xml b/theme_basics/resources/META-INF/plugin.xml index 58162c9cd..89953b277 100644 --- a/theme_basics/resources/META-INF/plugin.xml +++ b/theme_basics/resources/META-INF/plugin.xml @@ -17,6 +17,9 @@ + + com.intellij.modules.platform + diff --git a/tool_window/resources/META-INF/plugin.xml b/tool_window/resources/META-INF/plugin.xml index a28d5b6b9..b9a3134a5 100644 --- a/tool_window/resources/META-INF/plugin.xml +++ b/tool_window/resources/META-INF/plugin.xml @@ -7,6 +7,9 @@ + + com.intellij.modules.platform + diff --git a/tree_structure_provider/resources/META-INF/plugin.xml b/tree_structure_provider/resources/META-INF/plugin.xml index 571dace95..03f83ee19 100644 --- a/tree_structure_provider/resources/META-INF/plugin.xml +++ b/tree_structure_provider/resources/META-INF/plugin.xml @@ -7,7 +7,7 @@ Tree Structure Provider Demo showing only plain text files - com.intellij.modules.lang + com.intellij.modules.platform