On Fri, Mar 18, 2016 at 08:41:32PM +0100, Caspar Schutijser wrote:
> Below is an update to a new major version of IntelliJ.
> 
> It now bundles a JRE for Linux which isn't useful on OpenBSD so I
> updated the do-install target to remove that.
> 
> Also, I changed MODJAVA_VER to 1.8. Using Java 1.8, IntelliJ seems to
> work a little bit faster but I don't have any numbers to back up that
> claim. Not sure if you guys agree on this decision.

Revised diff below (fixes $V).

Thanks,
Caspar Schutijser


Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/intellij/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile    7 Mar 2016 13:25:17 -0000       1.31
+++ Makefile    20 Mar 2016 21:01:10 -0000
@@ -4,7 +4,7 @@ SHARED_ONLY=            Yes
 
 COMMENT=               IntelliJ IDEA Java IDE
 
-V=                     15.0.4
+V=                     2016.1
 DISTNAME=              ideaIC-${V}
 PKGNAME=               intellij-${V}
 CATEGORIES=            devel
@@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM= Yes
 MASTER_SITES=          http://download.jetbrains.com/idea/
 
 MODULES=               java
-MODJAVA_VER=           1.7
+MODJAVA_VER=           1.8
 
 BUILD_DEPENDS=         ${MODJAVA_RUN_DEPENDS}
 
@@ -28,7 +28,7 @@ NO_TEST=              Yes
 
 SUBST_VARS+=           JAVA_HOME
 
-WRKDIST=               ${WRKDIR}/idea-IC-143.2287.1
+WRKDIST=               ${WRKDIR}/idea-IC-145.258.11
 IJ=                    ${PREFIX}/intellij
 
 # If NO_BUILD is set, JAVA_HOME doesn't get defined. So do
@@ -39,6 +39,7 @@ do-build:
 do-install:
        ${INSTALL_DATA_DIR} ${IJ}
        @tar -czf - -C ${WRKDIST} . | tar xzf - -C ${IJ}
+       @rm -rf ${IJ}/jre
        @${SUBST_PROGRAM} ${FILESDIR}/idea ${PREFIX}/bin/idea
        @chmod ${BINMODE} ${PREFIX}/bin/idea
        @ln -s ${TRUEPREFIX}/bin/idea ${PREFIX}/bin/intellij
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/intellij/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo    7 Mar 2016 13:25:17 -0000       1.13
+++ distinfo    20 Mar 2016 21:01:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (ideaIC-15.0.4.tar.gz) = dlPt0Gh95pSLPFsSjAaDyW+J3qlr7dmVonn001mBahY=
-SIZE (ideaIC-15.0.4.tar.gz) = 234258484
+SHA256 (ideaIC-2016.1.tar.gz) = 2NiJxC394fQQMOnT9YUNNkEJ33Omo1CB7cctfZXyL78=
+SIZE (ideaIC-2016.1.tar.gz) = 290002787
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/intellij/pkg/PLIST,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST
--- pkg/PLIST   7 Mar 2016 13:25:17 -0000       1.17
+++ pkg/PLIST   20 Mar 2016 21:01:10 -0000
@@ -86,6 +86,7 @@ intellij/lib/asm-commons.jar
 intellij/lib/asm.jar
 intellij/lib/asm4-all.jar
 intellij/lib/automaton.jar
+intellij/lib/batik-all.jar
 intellij/lib/boot.jar
 intellij/lib/bootstrap.jar
 intellij/lib/cglib-2.2.2.jar
@@ -97,12 +98,13 @@ intellij/lib/commons-net-3.3.jar
 intellij/lib/coverage-agent.jar
 intellij/lib/coverage-instrumenter.jar
 intellij/lib/coverage-util.jar
-intellij/lib/ecj-4.4.jar
+intellij/lib/ecj-4.4.2.jar
 intellij/lib/extensions.jar
+intellij/lib/external-system-rt.jar
 intellij/lib/fluent-hc-4.4.1.jar
 intellij/lib/forms_rt.jar
-intellij/lib/groovy-all-2.3.9.jar
-intellij/lib/gson-2.3.1.jar
+intellij/lib/groovy-all-2.4.6.jar
+intellij/lib/gson-2.5.jar
 intellij/lib/guava-17.0.jar
 intellij/lib/hamcrest-core-1.3.jar
 intellij/lib/httpclient-4.4.1.jar
@@ -179,7 +181,7 @@ intellij/lib/oromatcher.jar
 intellij/lib/picocontainer.jar
 intellij/lib/protobuf-2.5.0.jar
 intellij/lib/proxy-vole_20131209.jar
-intellij/lib/pty4j-0.5.jar
+intellij/lib/pty4j-0.6.jar
 intellij/lib/purejavacomm.jar
 intellij/lib/resolver.jar
 intellij/lib/resources.jar
@@ -204,10 +206,12 @@ intellij/lib/velocity.jar
 intellij/lib/winp-1.23.jar
 intellij/lib/xbean.jar
 intellij/lib/xercesImpl.jar
+intellij/lib/xml-apis-ext.jar
 intellij/lib/xml-apis.jar
+intellij/lib/xmlgraphics-commons-1.5.jar
 intellij/lib/xmlrpc-2.0.jar
 intellij/lib/xpp3-1.1.4-min.jar
-intellij/lib/xstream-1.4.3.jar
+intellij/lib/xstream-1.4.8.jar
 intellij/license/
 intellij/license/XStream_license.txt
 intellij/license/ant_license.txt
@@ -336,7 +340,8 @@ intellij/plugins/android/lib/asm-analysi
 intellij/plugins/android/lib/asm-tree-5.0.3.jar
 intellij/plugins/android/lib/bcpkix-jdk15on-1.48.jar
 intellij/plugins/android/lib/bcprov-jdk15on-1.48.jar
-intellij/plugins/android/lib/builder-model-1.3.0.jar
+intellij/plugins/android/lib/builder-model-1.4.0-beta2.jar
+intellij/plugins/android/lib/builder-model-1.5.0-beta2.jar
 intellij/plugins/android/lib/common.jar
 intellij/plugins/android/lib/commons-compress-1.0.jar
 intellij/plugins/android/lib/device-art-resources/
@@ -376,6 +381,14 @@ intellij/plugins/android/lib/device-art-
 intellij/plugins/android/lib/device-art-resources/nexus_5/port_back.png
 intellij/plugins/android/lib/device-art-resources/nexus_5/port_fore.png
 intellij/plugins/android/lib/device-art-resources/nexus_5/port_shadow.png
+intellij/plugins/android/lib/device-art-resources/nexus_5x/
+intellij/plugins/android/lib/device-art-resources/nexus_5x/land_back.png
+intellij/plugins/android/lib/device-art-resources/nexus_5x/land_fore.png
+intellij/plugins/android/lib/device-art-resources/nexus_5x/land_shadow.png
+intellij/plugins/android/lib/device-art-resources/nexus_5x/layout
+intellij/plugins/android/lib/device-art-resources/nexus_5x/port_back.png
+intellij/plugins/android/lib/device-art-resources/nexus_5x/port_fore.png
+intellij/plugins/android/lib/device-art-resources/nexus_5x/port_shadow.png
 intellij/plugins/android/lib/device-art-resources/nexus_6/
 intellij/plugins/android/lib/device-art-resources/nexus_6/land_back.png
 intellij/plugins/android/lib/device-art-resources/nexus_6/land_fore.png
@@ -384,6 +397,14 @@ intellij/plugins/android/lib/device-art-
 intellij/plugins/android/lib/device-art-resources/nexus_6/port_back.png
 intellij/plugins/android/lib/device-art-resources/nexus_6/port_fore.png
 intellij/plugins/android/lib/device-art-resources/nexus_6/port_shadow.png
+intellij/plugins/android/lib/device-art-resources/nexus_6p/
+intellij/plugins/android/lib/device-art-resources/nexus_6p/land_back.png
+intellij/plugins/android/lib/device-art-resources/nexus_6p/land_fore.png
+intellij/plugins/android/lib/device-art-resources/nexus_6p/land_shadow.png
+intellij/plugins/android/lib/device-art-resources/nexus_6p/layout
+intellij/plugins/android/lib/device-art-resources/nexus_6p/port_back.png
+intellij/plugins/android/lib/device-art-resources/nexus_6p/port_fore.png
+intellij/plugins/android/lib/device-art-resources/nexus_6p/port_shadow.png
 intellij/plugins/android/lib/device-art-resources/nexus_7/
 intellij/plugins/android/lib/device-art-resources/nexus_7/land_back.png
 intellij/plugins/android/lib/device-art-resources/nexus_7/land_fore.png
@@ -514,6 +535,7 @@ intellij/plugins/android/lib/templates/a
 
intellij/plugins/android/lib/templates/activities/AlwaysOnWearActivity/recipe.xml.ftl
 intellij/plugins/android/lib/templates/activities/AlwaysOnWearActivity/root/
 
intellij/plugins/android/lib/templates/activities/AlwaysOnWearActivity/root/AndroidManifest.xml.ftl
+intellij/plugins/android/lib/templates/activities/AlwaysOnWearActivity/root/AndroidManifestPermissions.xml
 
intellij/plugins/android/lib/templates/activities/AlwaysOnWearActivity/root/build.gradle.ftl
 
intellij/plugins/android/lib/templates/activities/AlwaysOnWearActivity/root/res/
 
intellij/plugins/android/lib/templates/activities/AlwaysOnWearActivity/root/res/layout/
@@ -623,46 +645,19 @@ intellij/plugins/android/lib/templates/a
 intellij/plugins/android/lib/templates/activities/BlankActivity/
 intellij/plugins/android/lib/templates/activities/BlankActivity/globals.xml.ftl
 intellij/plugins/android/lib/templates/activities/BlankActivity/recipe.xml.ftl
+intellij/plugins/android/lib/templates/activities/BlankActivity/recipe_fragment.xml.ftl
 intellij/plugins/android/lib/templates/activities/BlankActivity/root/
-intellij/plugins/android/lib/templates/activities/BlankActivity/root/AndroidManifest.xml.ftl
 intellij/plugins/android/lib/templates/activities/BlankActivity/root/res/
 
intellij/plugins/android/lib/templates/activities/BlankActivity/root/res/layout/
-intellij/plugins/android/lib/templates/activities/BlankActivity/root/res/layout/activity_simple.xml.ftl
-intellij/plugins/android/lib/templates/activities/BlankActivity/root/res/menu/
-intellij/plugins/android/lib/templates/activities/BlankActivity/root/res/menu/main.xml.ftl
-intellij/plugins/android/lib/templates/activities/BlankActivity/root/res/values/
-intellij/plugins/android/lib/templates/activities/BlankActivity/root/res/values-w820dp/
-intellij/plugins/android/lib/templates/activities/BlankActivity/root/res/values-w820dp/dimens.xml
-intellij/plugins/android/lib/templates/activities/BlankActivity/root/res/values/dimens.xml.ftl
-intellij/plugins/android/lib/templates/activities/BlankActivity/root/res/values/strings.xml.ftl
+intellij/plugins/android/lib/templates/activities/BlankActivity/root/res/layout/activity_fragment_container.xml.ftl
+intellij/plugins/android/lib/templates/activities/BlankActivity/root/res/layout/fragment_simple.xml.ftl
 intellij/plugins/android/lib/templates/activities/BlankActivity/root/src/
 
intellij/plugins/android/lib/templates/activities/BlankActivity/root/src/app_package/
 
intellij/plugins/android/lib/templates/activities/BlankActivity/root/src/app_package/SimpleActivity.java.ftl
+intellij/plugins/android/lib/templates/activities/BlankActivity/root/src/app_package/SimpleActivityFragment.ftl
 intellij/plugins/android/lib/templates/activities/BlankActivity/template.xml
 
intellij/plugins/android/lib/templates/activities/BlankActivity/template_blank_activity.png
-intellij/plugins/android/lib/templates/activities/BlankActivityWithFragment/
-intellij/plugins/android/lib/templates/activities/BlankActivityWithFragment/globals.xml.ftl
-intellij/plugins/android/lib/templates/activities/BlankActivityWithFragment/recipe.xml.ftl
-intellij/plugins/android/lib/templates/activities/BlankActivityWithFragment/root/
-intellij/plugins/android/lib/templates/activities/BlankActivityWithFragment/root/AndroidManifest.xml.ftl
-intellij/plugins/android/lib/templates/activities/BlankActivityWithFragment/root/res/
-intellij/plugins/android/lib/templates/activities/BlankActivityWithFragment/root/res/layout/
-intellij/plugins/android/lib/templates/activities/BlankActivityWithFragment/root/res/layout/activity_fragment_container.xml.ftl
-intellij/plugins/android/lib/templates/activities/BlankActivityWithFragment/root/res/layout/fragment_simple.xml.ftl
-intellij/plugins/android/lib/templates/activities/BlankActivityWithFragment/root/res/menu/
-intellij/plugins/android/lib/templates/activities/BlankActivityWithFragment/root/res/menu/main.xml.ftl
-intellij/plugins/android/lib/templates/activities/BlankActivityWithFragment/root/res/values/
-intellij/plugins/android/lib/templates/activities/BlankActivityWithFragment/root/res/values-w820dp/
-intellij/plugins/android/lib/templates/activities/BlankActivityWithFragment/root/res/values-w820dp/dimens.xml
-intellij/plugins/android/lib/templates/activities/BlankActivityWithFragment/root/res/values/dimens.xml.ftl
-intellij/plugins/android/lib/templates/activities/BlankActivityWithFragment/root/res/values/strings.xml.ftl
-intellij/plugins/android/lib/templates/activities/BlankActivityWithFragment/root/src/
-intellij/plugins/android/lib/templates/activities/BlankActivityWithFragment/root/src/app_package/
-intellij/plugins/android/lib/templates/activities/BlankActivityWithFragment/root/src/app_package/SimpleActivity.java.ftl
-intellij/plugins/android/lib/templates/activities/BlankActivityWithFragment/root/src/app_package/SimpleActivityFragment.ftl
-intellij/plugins/android/lib/templates/activities/BlankActivityWithFragment/root/src/app_package/include_options_menu.java.ftl
-intellij/plugins/android/lib/templates/activities/BlankActivityWithFragment/template.xml
-intellij/plugins/android/lib/templates/activities/BlankActivityWithFragment/template_blank_activity_fragment.png
+intellij/plugins/android/lib/templates/activities/BlankActivity/template_blank_activity_fragment.png
 intellij/plugins/android/lib/templates/activities/BlankWearActivity/
 
intellij/plugins/android/lib/templates/activities/BlankWearActivity/globals.xml.ftl
 
intellij/plugins/android/lib/templates/activities/BlankWearActivity/recipe.xml.ftl
@@ -684,12 +679,6 @@ intellij/plugins/android/lib/templates/a
 intellij/plugins/android/lib/templates/activities/EmptyActivity/globals.xml.ftl
 intellij/plugins/android/lib/templates/activities/EmptyActivity/recipe.xml.ftl
 intellij/plugins/android/lib/templates/activities/EmptyActivity/root/
-intellij/plugins/android/lib/templates/activities/EmptyActivity/root/AndroidManifest.xml.ftl
-intellij/plugins/android/lib/templates/activities/EmptyActivity/root/res/
-intellij/plugins/android/lib/templates/activities/EmptyActivity/root/res/layout/
-intellij/plugins/android/lib/templates/activities/EmptyActivity/root/res/layout/activity_simple.xml
-intellij/plugins/android/lib/templates/activities/EmptyActivity/root/res/values/
-intellij/plugins/android/lib/templates/activities/EmptyActivity/root/res/values/strings.xml.ftl
 intellij/plugins/android/lib/templates/activities/EmptyActivity/root/src/
 
intellij/plugins/android/lib/templates/activities/EmptyActivity/root/src/app_package/
 
intellij/plugins/android/lib/templates/activities/EmptyActivity/root/src/app_package/SimpleActivity.java.ftl
@@ -704,19 +693,13 @@ intellij/plugins/android/lib/templates/a
 
intellij/plugins/android/lib/templates/activities/FullscreenActivity/root/res/layout/
 
intellij/plugins/android/lib/templates/activities/FullscreenActivity/root/res/layout/activity_fullscreen.xml.ftl
 
intellij/plugins/android/lib/templates/activities/FullscreenActivity/root/res/values/
-intellij/plugins/android/lib/templates/activities/FullscreenActivity/root/res/values-v11/
-intellij/plugins/android/lib/templates/activities/FullscreenActivity/root/res/values-v11/styles.xml
 
intellij/plugins/android/lib/templates/activities/FullscreenActivity/root/res/values/attrs.xml
 
intellij/plugins/android/lib/templates/activities/FullscreenActivity/root/res/values/colors.xml
 
intellij/plugins/android/lib/templates/activities/FullscreenActivity/root/res/values/strings.xml.ftl
-intellij/plugins/android/lib/templates/activities/FullscreenActivity/root/res/values/styles.xml
+intellij/plugins/android/lib/templates/activities/FullscreenActivity/root/res/values/styles.xml.ftl
 intellij/plugins/android/lib/templates/activities/FullscreenActivity/root/src/
 
intellij/plugins/android/lib/templates/activities/FullscreenActivity/root/src/app_package/
 
intellij/plugins/android/lib/templates/activities/FullscreenActivity/root/src/app_package/FullscreenActivity.java.ftl
-intellij/plugins/android/lib/templates/activities/FullscreenActivity/root/src/app_package/util/
-intellij/plugins/android/lib/templates/activities/FullscreenActivity/root/src/app_package/util/SystemUiHider.java.ftl
-intellij/plugins/android/lib/templates/activities/FullscreenActivity/root/src/app_package/util/SystemUiHiderBase.java.ftl
-intellij/plugins/android/lib/templates/activities/FullscreenActivity/root/src/app_package/util/SystemUiHiderHoneycomb.java.ftl
 
intellij/plugins/android/lib/templates/activities/FullscreenActivity/template.xml
 
intellij/plugins/android/lib/templates/activities/FullscreenActivity/template_fullscreen_activity.png
 intellij/plugins/android/lib/templates/activities/GoogleAdMobAdsActivity/
@@ -763,19 +746,28 @@ intellij/plugins/android/lib/templates/a
 
intellij/plugins/android/lib/templates/activities/GoogleMapsActivity/root/src/app_package/MapActivity.java.ftl
 
intellij/plugins/android/lib/templates/activities/GoogleMapsActivity/template.xml
 
intellij/plugins/android/lib/templates/activities/GoogleMapsActivity/template_map_activity.png
-intellij/plugins/android/lib/templates/activities/GooglePlayServicesActivity/
-intellij/plugins/android/lib/templates/activities/GooglePlayServicesActivity/globals.xml.ftl
-intellij/plugins/android/lib/templates/activities/GooglePlayServicesActivity/recipe.xml.ftl
-intellij/plugins/android/lib/templates/activities/GooglePlayServicesActivity/root/
-intellij/plugins/android/lib/templates/activities/GooglePlayServicesActivity/root/AndroidManifest.xml.ftl
-intellij/plugins/android/lib/templates/activities/GooglePlayServicesActivity/root/res/
-intellij/plugins/android/lib/templates/activities/GooglePlayServicesActivity/root/res/values/
-intellij/plugins/android/lib/templates/activities/GooglePlayServicesActivity/root/res/values/strings.xml.ftl
-intellij/plugins/android/lib/templates/activities/GooglePlayServicesActivity/root/src/
-intellij/plugins/android/lib/templates/activities/GooglePlayServicesActivity/root/src/app_package/
-intellij/plugins/android/lib/templates/activities/GooglePlayServicesActivity/root/src/app_package/activity.java.ftl
-intellij/plugins/android/lib/templates/activities/GooglePlayServicesActivity/template.xml
-intellij/plugins/android/lib/templates/activities/GooglePlayServicesActivity/template_play_services_activity.png
+intellij/plugins/android/lib/templates/activities/GoogleMapsWearActivity/
+intellij/plugins/android/lib/templates/activities/GoogleMapsWearActivity/globals.xml.ftl
+intellij/plugins/android/lib/templates/activities/GoogleMapsWearActivity/recipe.xml.ftl
+intellij/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/
+intellij/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/AndroidManifest.xml.ftl
+intellij/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/AndroidManifestPermissions.xml
+intellij/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/debugRes/
+intellij/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/debugRes/values/
+intellij/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/debugRes/values/google_maps_api.xml.ftl
+intellij/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/releaseRes/
+intellij/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/releaseRes/values/
+intellij/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/releaseRes/values/google_maps_api.xml.ftl
+intellij/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/res/
+intellij/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/res/layout/
+intellij/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/res/layout/activity_map.xml.ftl
+intellij/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/res/values/
+intellij/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/res/values/strings.xml.ftl
+intellij/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/src/
+intellij/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/src/app_package/
+intellij/plugins/android/lib/templates/activities/GoogleMapsWearActivity/root/src/app_package/MapActivity.java.ftl
+intellij/plugins/android/lib/templates/activities/GoogleMapsWearActivity/template.xml
+intellij/plugins/android/lib/templates/activities/GoogleMapsWearActivity/template_thumb.png
 intellij/plugins/android/lib/templates/activities/LoginActivity/
 intellij/plugins/android/lib/templates/activities/LoginActivity/globals.xml.ftl
 intellij/plugins/android/lib/templates/activities/LoginActivity/recipe.xml.ftl
@@ -790,7 +782,6 @@ intellij/plugins/android/lib/templates/a
 intellij/plugins/android/lib/templates/activities/LoginActivity/root/src/
 
intellij/plugins/android/lib/templates/activities/LoginActivity/root/src/app_package/
 
intellij/plugins/android/lib/templates/activities/LoginActivity/root/src/app_package/LoginActivity.java.ftl
-intellij/plugins/android/lib/templates/activities/LoginActivity/root/src/app_package/PlusBaseActivity.java.ftl
 intellij/plugins/android/lib/templates/activities/LoginActivity/template.xml
 
intellij/plugins/android/lib/templates/activities/LoginActivity/template_login_activity.png
 intellij/plugins/android/lib/templates/activities/MasterDetailFlow/
@@ -800,33 +791,50 @@ intellij/plugins/android/lib/templates/a
 
intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/AndroidManifest.xml.ftl
 intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/
 
intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/layout/
-intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/layout/activity_content_detail.xml.ftl
-intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/layout/activity_content_list.xml.ftl
-intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/layout/activity_content_twopane.xml.ftl
-intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/layout/fragment_content_detail.xml.ftl
+intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/layout/activity_item_detail.xml.ftl
+intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/layout/activity_item_list_app_bar.xml.ftl
+intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/layout/fragment_item_detail.xml.ftl
+intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/layout/fragment_item_list.xml.ftl
+intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/layout/fragment_item_list_twopane.xml.ftl
+intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/layout/item_list_content.xml.ftl
 
intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/values/
-intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/values-large/
-intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/values-large/refs.xml.ftl
-intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/values-sw600dp/
-intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/values-sw600dp/refs.xml.ftl
+intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/values-w900dp/
+intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/values-w900dp/refs.xml.ftl
+intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/values/dimens.xml.ftl
 
intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/res/values/strings.xml.ftl
 intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/src/
 
intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/src/app_package/
 
intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/src/app_package/ContentDetailActivity.java.ftl
 
intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/src/app_package/ContentDetailFragment.java.ftl
 
intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/src/app_package/ContentListActivity.java.ftl
-intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/src/app_package/ContentListFragment.java.ftl
-intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/src/app_package/dummy/
-intellij/plugins/android/lib/templates/activities/MasterDetailFlow/root/src/app_package/dummy/DummyContent.java.ftl
 intellij/plugins/android/lib/templates/activities/MasterDetailFlow/template.xml
 
intellij/plugins/android/lib/templates/activities/MasterDetailFlow/template_master_detail.png
 intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/
 
intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/globals.xml.ftl
 
intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/recipe.xml.ftl
 
intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/
-intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/AndroidManifest.xml.ftl
 
intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/build.gradle.ftl
 
intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/
+intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/
+intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/drawable/
+intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/drawable-v21/
+intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/drawable-v21/ic_menu_camera.xml
+intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/drawable-v21/ic_menu_gallery.xml
+intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/drawable-v21/ic_menu_manage.xml
+intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/drawable-v21/ic_menu_send.xml
+intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/drawable-v21/ic_menu_share.xml
+intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/drawable-v21/ic_menu_slideshow.xml
+intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/drawable/side_nav_bar.xml
+intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/layout/
+intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/layout/navigation_header.xml.ftl
+intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/layout/navigation_view.xml.ftl
+intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/menu/
+intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/menu/drawer.xml.ftl
+intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/menu/main.xml.ftl
+intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/values/
+intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/values/dimens.xml.ftl
+intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/values/drawables.xml
+intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/values/strings.xml.ftl
 
intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/drawable-hdpi/
 
intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/drawable-hdpi/drawer_shadow.9.png
 
intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/drawable-hdpi/ic_drawer.png
@@ -852,6 +860,9 @@ intellij/plugins/android/lib/templates/a
 
intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/values/dimens.xml.ftl
 
intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res/values/strings.xml.ftl
 
intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/src/
+intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/src-buildApi22/
+intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/src-buildApi22/app_package/
+intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/src-buildApi22/app_package/DrawerActivity.java.ftl
 
intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/src/app_package/
 
intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/src/app_package/DrawerActivity.java.ftl
 
intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/src/app_package/NavigationDrawerFragment.java.ftl
@@ -859,14 +870,53 @@ intellij/plugins/android/lib/templates/a
 
intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/src/app_package/include_options_menu.java.ftl
 
intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/template.xml
 
intellij/plugins/android/lib/templates/activities/NavigationDrawerActivity/template_blank_activity_drawer.png
+intellij/plugins/android/lib/templates/activities/ScrollActivity/
+intellij/plugins/android/lib/templates/activities/ScrollActivity/globals.xml.ftl
+intellij/plugins/android/lib/templates/activities/ScrollActivity/recipe.xml.ftl
+intellij/plugins/android/lib/templates/activities/ScrollActivity/root/
+intellij/plugins/android/lib/templates/activities/ScrollActivity/root/res/
+intellij/plugins/android/lib/templates/activities/ScrollActivity/root/res/layout/
+intellij/plugins/android/lib/templates/activities/ScrollActivity/root/res/layout/app_bar.xml.ftl
+intellij/plugins/android/lib/templates/activities/ScrollActivity/root/res/layout/simple.xml.ftl
+intellij/plugins/android/lib/templates/activities/ScrollActivity/root/res/values/
+intellij/plugins/android/lib/templates/activities/ScrollActivity/root/res/values/dimens.xml.ftl
+intellij/plugins/android/lib/templates/activities/ScrollActivity/root/res/values/strings.xml.ftl
+intellij/plugins/android/lib/templates/activities/ScrollActivity/root/src/
+intellij/plugins/android/lib/templates/activities/ScrollActivity/root/src/app_package/
+intellij/plugins/android/lib/templates/activities/ScrollActivity/root/src/app_package/ScrollActivity.java.ftl
+intellij/plugins/android/lib/templates/activities/ScrollActivity/template.xml
+intellij/plugins/android/lib/templates/activities/ScrollActivity/template_scroll_activity.png
 intellij/plugins/android/lib/templates/activities/SettingsActivity/
 
intellij/plugins/android/lib/templates/activities/SettingsActivity/globals.xml.ftl
 
intellij/plugins/android/lib/templates/activities/SettingsActivity/recipe.xml.ftl
 intellij/plugins/android/lib/templates/activities/SettingsActivity/root/
-intellij/plugins/android/lib/templates/activities/SettingsActivity/root/AndroidManifest.xml.ftl
 intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-hdpi/
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-hdpi/ic_info_black_24dp.png
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-hdpi/ic_notifications_black_24dp.png
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-hdpi/ic_sync_black_24dp.png
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-mdpi/
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-mdpi/ic_info_black_24dp.png
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-mdpi/ic_notifications_black_24dp.png
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-mdpi/ic_sync_black_24dp.png
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-v21/
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-v21/ic_info_black_24dp.xml
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-v21/ic_notifications_black_24dp.xml
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-v21/ic_sync_black_24dp.xml
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-xhdpi/
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-xhdpi/ic_info_black_24dp.png
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-xhdpi/ic_notifications_black_24dp.png
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-xhdpi/ic_sync_black_24dp.png
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-xxhdpi/
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-xxhdpi/ic_info_black_24dp.png
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-xxhdpi/ic_notifications_black_24dp.png
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-xxhdpi/ic_sync_black_24dp.png
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-xxxhdpi/
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-xxxhdpi/ic_info_black_24dp.png
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-xxxhdpi/ic_notifications_black_24dp.png
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/drawable-xxxhdpi/ic_sync_black_24dp.png
 
intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/values/
-intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/values/strings.xml.ftl
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/values/pref_strings.xml.ftl
 
intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/xml/
 
intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/xml/pref_data_sync.xml
 
intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/xml/pref_general.xml
@@ -874,6 +924,7 @@ intellij/plugins/android/lib/templates/a
 
intellij/plugins/android/lib/templates/activities/SettingsActivity/root/res/xml/pref_notification.xml
 intellij/plugins/android/lib/templates/activities/SettingsActivity/root/src/
 
intellij/plugins/android/lib/templates/activities/SettingsActivity/root/src/app_package/
+intellij/plugins/android/lib/templates/activities/SettingsActivity/root/src/app_package/AppCompatPreferenceActivity.java.ftl
 
intellij/plugins/android/lib/templates/activities/SettingsActivity/root/src/app_package/SettingsActivity.java.ftl
 intellij/plugins/android/lib/templates/activities/SettingsActivity/template.xml
 
intellij/plugins/android/lib/templates/activities/SettingsActivity/template_settings_activity.png
@@ -881,11 +932,11 @@ intellij/plugins/android/lib/templates/a
 
intellij/plugins/android/lib/templates/activities/TabbedActivity/globals.xml.ftl
 intellij/plugins/android/lib/templates/activities/TabbedActivity/recipe.xml.ftl
 intellij/plugins/android/lib/templates/activities/TabbedActivity/root/
-intellij/plugins/android/lib/templates/activities/TabbedActivity/root/AndroidManifest.xml.ftl
 intellij/plugins/android/lib/templates/activities/TabbedActivity/root/res/
 
intellij/plugins/android/lib/templates/activities/TabbedActivity/root/res/layout/
 
intellij/plugins/android/lib/templates/activities/TabbedActivity/root/res/layout/activity_fragment_container.xml.ftl
 
intellij/plugins/android/lib/templates/activities/TabbedActivity/root/res/layout/activity_pager.xml.ftl
+intellij/plugins/android/lib/templates/activities/TabbedActivity/root/res/layout/app_bar_activity.xml.ftl
 
intellij/plugins/android/lib/templates/activities/TabbedActivity/root/res/layout/fragment_simple.xml.ftl
 intellij/plugins/android/lib/templates/activities/TabbedActivity/root/res/menu/
 
intellij/plugins/android/lib/templates/activities/TabbedActivity/root/res/menu/main.xml.ftl
@@ -904,6 +955,38 @@ intellij/plugins/android/lib/templates/a
 
intellij/plugins/android/lib/templates/activities/TabbedActivity/template_blank_activity_dropdown.png
 
intellij/plugins/android/lib/templates/activities/TabbedActivity/template_blank_activity_pager.png
 
intellij/plugins/android/lib/templates/activities/TabbedActivity/template_blank_activity_tabs.png
+intellij/plugins/android/lib/templates/activities/common/
+intellij/plugins/android/lib/templates/activities/common/common_globals.xml.ftl
+intellij/plugins/android/lib/templates/activities/common/recipe_app_bar.xml.ftl
+intellij/plugins/android/lib/templates/activities/common/recipe_dummy_content.xml.ftl
+intellij/plugins/android/lib/templates/activities/common/recipe_manifest.xml.ftl
+intellij/plugins/android/lib/templates/activities/common/recipe_no_actionbar.xml.ftl
+intellij/plugins/android/lib/templates/activities/common/recipe_simple.xml.ftl
+intellij/plugins/android/lib/templates/activities/common/recipe_simple_dimens.xml
+intellij/plugins/android/lib/templates/activities/common/recipe_simple_menu.xml.ftl
+intellij/plugins/android/lib/templates/activities/common/root/
+intellij/plugins/android/lib/templates/activities/common/root/AndroidManifest.xml.ftl
+intellij/plugins/android/lib/templates/activities/common/root/res/
+intellij/plugins/android/lib/templates/activities/common/root/res/layout/
+intellij/plugins/android/lib/templates/activities/common/root/res/layout/app_bar.xml.ftl
+intellij/plugins/android/lib/templates/activities/common/root/res/layout/simple.xml.ftl
+intellij/plugins/android/lib/templates/activities/common/root/res/menu/
+intellij/plugins/android/lib/templates/activities/common/root/res/menu/simple_menu.xml.ftl
+intellij/plugins/android/lib/templates/activities/common/root/res/values/
+intellij/plugins/android/lib/templates/activities/common/root/res/values-v21/
+intellij/plugins/android/lib/templates/activities/common/root/res/values-v21/no_actionbar_styles_v21.xml.ftl
+intellij/plugins/android/lib/templates/activities/common/root/res/values-w820dp/
+intellij/plugins/android/lib/templates/activities/common/root/res/values-w820dp/simple_dimens.xml
+intellij/plugins/android/lib/templates/activities/common/root/res/values/app_bar_dimens.xml
+intellij/plugins/android/lib/templates/activities/common/root/res/values/manifest_strings.xml.ftl
+intellij/plugins/android/lib/templates/activities/common/root/res/values/no_actionbar_styles.xml.ftl
+intellij/plugins/android/lib/templates/activities/common/root/res/values/simple_dimens.xml
+intellij/plugins/android/lib/templates/activities/common/root/res/values/simple_menu_strings.xml.ftl
+intellij/plugins/android/lib/templates/activities/common/root/src/
+intellij/plugins/android/lib/templates/activities/common/root/src/app_package/
+intellij/plugins/android/lib/templates/activities/common/root/src/app_package/dummy/
+intellij/plugins/android/lib/templates/activities/common/root/src/app_package/dummy/DummyContent.java.ftl
+intellij/plugins/android/lib/templates/activities/common/wear_common_globals.xml.ftl
 intellij/plugins/android/lib/templates/build.gradle
 intellij/plugins/android/lib/templates/eclipse/
 intellij/plugins/android/lib/templates/eclipse/activities/
@@ -1490,16 +1573,7 @@ intellij/plugins/android/lib/templates/g
 
intellij/plugins/android/lib/templates/gradle-projects/ImportExistingProject/template.xml
 
intellij/plugins/android/lib/templates/gradle-projects/ImportExistingProject/template_new_project.png
 intellij/plugins/android/lib/templates/gradle-projects/NewAndroidAutoProject/
-intellij/plugins/android/lib/templates/gradle-projects/NewAndroidAutoProject/globals.xml.ftl
-intellij/plugins/android/lib/templates/gradle-projects/NewAndroidAutoProject/recipe.xml.ftl
-intellij/plugins/android/lib/templates/gradle-projects/NewAndroidAutoProject/root/
-intellij/plugins/android/lib/templates/gradle-projects/NewAndroidAutoProject/root/build.gradle.ftl
-intellij/plugins/android/lib/templates/gradle-projects/NewAndroidAutoProject/root/gradle.properties.ftl
-intellij/plugins/android/lib/templates/gradle-projects/NewAndroidAutoProject/root/local.properties.ftl
-intellij/plugins/android/lib/templates/gradle-projects/NewAndroidAutoProject/root/project_ignore
-intellij/plugins/android/lib/templates/gradle-projects/NewAndroidAutoProject/root/settings.gradle.ftl
 
intellij/plugins/android/lib/templates/gradle-projects/NewAndroidAutoProject/template.xml
-intellij/plugins/android/lib/templates/gradle-projects/NewAndroidAutoProject/template_new_project.png
 intellij/plugins/android/lib/templates/gradle-projects/NewAndroidModule/
 
intellij/plugins/android/lib/templates/gradle-projects/NewAndroidModule/globals.xml.ftl
 
intellij/plugins/android/lib/templates/gradle-projects/NewAndroidModule/recipe.xml.ftl
@@ -1509,6 +1583,8 @@ intellij/plugins/android/lib/templates/g
 
intellij/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/module_ignore
 
intellij/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/proguard-rules.txt.ftl
 
intellij/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/
+intellij/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-anydpi/
+intellij/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-anydpi/test.svg
 
intellij/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-hdpi/
 
intellij/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-hdpi/ic_launcher.png
 
intellij/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-mdpi/
@@ -1520,8 +1596,7 @@ intellij/plugins/android/lib/templates/g
 
intellij/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-xxxhdpi/
 
intellij/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-xxxhdpi/ic_launcher.png
 
intellij/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/values/
-intellij/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/values-v21/
-intellij/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/values-v21/styles.xml
+intellij/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/values/colors.xml
 
intellij/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/values/strings.xml.ftl
 
intellij/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/values/styles.xml.ftl
 
intellij/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/settings.gradle.ftl
@@ -1872,20 +1947,14 @@ intellij/plugins/android/lib/templates/o
 intellij/plugins/android/lib/templates/other/ListFragment/root/
 intellij/plugins/android/lib/templates/other/ListFragment/root/res/
 intellij/plugins/android/lib/templates/other/ListFragment/root/res/layout/
-intellij/plugins/android/lib/templates/other/ListFragment/root/res/layout/fragment_grid.xml
 
intellij/plugins/android/lib/templates/other/ListFragment/root/res/layout/fragment_list.xml
+intellij/plugins/android/lib/templates/other/ListFragment/root/res/layout/item_list_content.xml
 intellij/plugins/android/lib/templates/other/ListFragment/root/res/values/
-intellij/plugins/android/lib/templates/other/ListFragment/root/res/values-large/
-intellij/plugins/android/lib/templates/other/ListFragment/root/res/values-large/refs_lrg.xml.ftl
-intellij/plugins/android/lib/templates/other/ListFragment/root/res/values-sw600dp/
-intellij/plugins/android/lib/templates/other/ListFragment/root/res/values-sw600dp/refs_lrg.xml.ftl
-intellij/plugins/android/lib/templates/other/ListFragment/root/res/values/refs.xml.ftl
-intellij/plugins/android/lib/templates/other/ListFragment/root/res/values/refs_lrg.xml.ftl
+intellij/plugins/android/lib/templates/other/ListFragment/root/res/values/dimens.xml
 intellij/plugins/android/lib/templates/other/ListFragment/root/src/
 intellij/plugins/android/lib/templates/other/ListFragment/root/src/app_package/
 
intellij/plugins/android/lib/templates/other/ListFragment/root/src/app_package/ListFragment.java.ftl
-intellij/plugins/android/lib/templates/other/ListFragment/root/src/app_package/dummy/
-intellij/plugins/android/lib/templates/other/ListFragment/root/src/app_package/dummy/DummyContent.java.ftl
+intellij/plugins/android/lib/templates/other/ListFragment/root/src/app_package/RecyclerViewAdapter.java.ftl
 intellij/plugins/android/lib/templates/other/ListFragment/template.xml
 
intellij/plugins/android/lib/templates/other/ListFragment/templates_list_fragment.png
 intellij/plugins/android/lib/templates/other/Notification/
@@ -1972,6 +2041,7 @@ intellij/plugins/android/lib/templates/o
 intellij/plugins/android/lib/templates/other/WatchFaceService/recipe.xml.ftl
 intellij/plugins/android/lib/templates/other/WatchFaceService/root/
 
intellij/plugins/android/lib/templates/other/WatchFaceService/root/AndroidManifest.xml.ftl
+intellij/plugins/android/lib/templates/other/WatchFaceService/root/AndroidManifestPermissions.xml
 
intellij/plugins/android/lib/templates/other/WatchFaceService/root/build.gradle.ftl
 intellij/plugins/android/lib/templates/other/WatchFaceService/root/res/
 
intellij/plugins/android/lib/templates/other/WatchFaceService/root/res/drawable-nodpi/
@@ -2045,20 +2115,20 @@ intellij/plugins/github/lib/github.jar
 intellij/plugins/gradle/
 intellij/plugins/gradle/lib/
 intellij/plugins/gradle/lib/commons-io-1.4.jar
-intellij/plugins/gradle/lib/gradle-base-services-2.5.jar
-intellij/plugins/gradle/lib/gradle-base-services-groovy-2.5.jar
-intellij/plugins/gradle/lib/gradle-cli-2.5.jar
-intellij/plugins/gradle/lib/gradle-core-2.5.jar
+intellij/plugins/gradle/lib/gradle-base-services-2.9.jar
+intellij/plugins/gradle/lib/gradle-base-services-groovy-2.9.jar
+intellij/plugins/gradle/lib/gradle-cli-2.9.jar
+intellij/plugins/gradle/lib/gradle-core-2.9.jar
 intellij/plugins/gradle/lib/gradle-jps-plugin.jar
-intellij/plugins/gradle/lib/gradle-messaging-2.5.jar
-intellij/plugins/gradle/lib/gradle-model-core-2.5.jar
-intellij/plugins/gradle/lib/gradle-model-groovy-2.5.jar
-intellij/plugins/gradle/lib/gradle-native-2.5.jar
-intellij/plugins/gradle/lib/gradle-resources-2.5.jar
-intellij/plugins/gradle/lib/gradle-tooling-api-2.5.jar
+intellij/plugins/gradle/lib/gradle-messaging-2.9.jar
+intellij/plugins/gradle/lib/gradle-model-core-2.9.jar
+intellij/plugins/gradle/lib/gradle-model-groovy-2.9.jar
+intellij/plugins/gradle/lib/gradle-native-2.9.jar
+intellij/plugins/gradle/lib/gradle-resources-2.9.jar
+intellij/plugins/gradle/lib/gradle-tooling-api-2.9.jar
 intellij/plugins/gradle/lib/gradle-tooling-extension-api.jar
 intellij/plugins/gradle/lib/gradle-tooling-extension-impl.jar
-intellij/plugins/gradle/lib/gradle-wrapper-2.5.jar
+intellij/plugins/gradle/lib/gradle-wrapper-2.9.jar
 intellij/plugins/gradle/lib/gradle.jar
 intellij/plugins/gradle/lib/guava-jdk5-17.0.jar
 intellij/plugins/gradle/lib/jna-3.2.7.jar
@@ -2256,7 +2326,7 @@ intellij/plugins/tasks/lib/tasks-java.ja
 intellij/plugins/tasks/lib/wsdl4j-1.4.jar
 intellij/plugins/terminal/
 intellij/plugins/terminal/lib/
-intellij/plugins/terminal/lib/jediterm-pty-2.0.jar
+intellij/plugins/terminal/lib/jediterm-pty-2.1.jar
 intellij/plugins/terminal/lib/jediterm.in
 intellij/plugins/terminal/lib/resources_en.jar
 intellij/plugins/terminal/lib/terminal.jar
@@ -2289,6 +2359,10 @@ intellij/plugins/xslt-debugger/lib/rt/xa
 intellij/plugins/xslt-debugger/lib/rt/xslt-debugger-engine-impl.jar
 intellij/plugins/xslt-debugger/lib/xslt-debugger-engine.jar
 intellij/plugins/xslt-debugger/lib/xslt-debugger.jar
+intellij/plugins/yaml/
+intellij/plugins/yaml/lib/
+intellij/plugins/yaml/lib/resources_en.jar
+intellij/plugins/yaml/lib/yaml.jar
 intellij/redist/
 intellij/redist/annotations-java8.jar
 @man man/man1/idea.1

Reply via email to