diff --git a/action_basics/build.gradle b/action_basics/build.gradle
index 7cb52ea20..0e0dad415 100644
--- a/action_basics/build.gradle
+++ b/action_basics/build.gradle
@@ -1,32 +1,36 @@
 plugins {
-    id 'java'
-    id 'org.jetbrains.intellij' version '0.4.7'
+  id 'java'
+  id 'org.jetbrains.intellij' version '0.4.7'
 }
 
-group 'org.intellij.sdk'
-version '2.0.0'
-
+project.version '2.0.0'
 sourceCompatibility = 1.8
 
 repositories {
-    mavenCentral()
+  mavenCentral()
 }
 
 dependencies {
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+  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'
+  // Define a communal sandbox directory for running code sample plugins within an IDE.
+  sandboxDirectory = file("${project.projectDir}/../Build/idea-sandbox")
 }
+
 patchPluginXml {
+  version = project.version     // <version> tag value
+  // Fix limited until-build default value.
+  sinceBuild = '191'          // <idea-version> tag since-build attribute
+  untilBuild = '201.*'          // <idea-version> tag until-build attribute - until v2020.1
 }
 
 // Define javadoc paths, force rebuild before jar is built
 javadoc {
-  // Set of source files to include
-  source = sourceSets.main.java.srcDirs
   // Include all class files, e.g. from libraries
   classpath = sourceSets.main.compileClasspath
 }
diff --git a/action_basics/src/main/resources/META-INF/plugin.xml b/action_basics/src/main/resources/META-INF/plugin.xml
index 13793426a..bf5f31775 100644
--- a/action_basics/src/main/resources/META-INF/plugin.xml
+++ b/action_basics/src/main/resources/META-INF/plugin.xml
@@ -8,10 +8,11 @@
   <name>SDK Action Sample Project</name>
 
   <!-- The version of this plugin -->
-  <version>2.0.0</version>
+  <!--  <version>Replaced by patchPluginXml.version in build.gradle</version>-->
 
   <!-- Compatible with the following versions of IntelliJ Platform -->
-  <idea-version since-build="173"/>
+  <!-- The <idea-version> attributes are updated by intellij.updateSinceUntilBuild,
+    patchPluginXml.sinceBuild and patchPlugin.untilBuild in build.gradle -->
 
   <!-- Text to display as description on Preferences/Settings | Plugin page  -->
   <description>
@@ -30,7 +31,7 @@
   </change-notes>
 
   <!-- Text to display as company information on Preferences/Settings | Plugin page -->
-  <vendor email="sdk-example@jetbrains.com" url="https://plugins.jetbrains.com">IntelliJ Platform SDK</vendor>
+  <vendor email="faux-email@jetbrains.com" url="https://plugins.jetbrains.com">IntelliJ Platform SDK</vendor>
 
   <actions>
     <!-- The <action> element defines an action to register.