Revert "Revert "Allow Java 8 sources in modules shared with studio.""
This reverts commit cd7792faacc1148dd452267a2c58d1ba86e99624.
Change-Id: If9e52d19ca7b60a770e876f5ef2d552a3293ab28
diff --git a/asset-studio/assetstudio-base.iml b/asset-studio/assetstudio-base.iml
index 3d439e3..9835f9f 100644
--- a/asset-studio/assetstudio-base.iml
+++ b/asset-studio/assetstudio-base.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
diff --git a/build-system/builder-model/builder-model.iml b/build-system/builder-model/builder-model.iml
index 341a799..90fe45c 100644
--- a/build-system/builder-model/builder-model.iml
+++ b/build-system/builder-model/builder-model.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/../../../../out/build/base/builder-model/build/generated">
<sourceFolder url="file://$MODULE_DIR$/../../../../out/build/base/builder-model/build/generated/java" isTestSource="false" />
diff --git a/build-system/builder-test-api/builder-test-api.iml b/build-system/builder-test-api/builder-test-api.iml
index da93b40..b91a834 100644
--- a/build-system/builder-test-api/builder-test-api.iml
+++ b/build-system/builder-test-api/builder-test-api.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
diff --git a/build-system/builder/builder.iml b/build-system/builder/builder.iml
index 899fc41..c5dbee6 100644
--- a/build-system/builder/builder.iml
+++ b/build-system/builder/builder.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/../../../../out/build/base/builder/build/generated/java">
<sourceFolder url="file://$MODULE_DIR$/../../../../out/build/base/builder/build/generated/java" isTestSource="false" />
diff --git a/build-system/manifest-merger/manifest-merger-base.iml b/build-system/manifest-merger/manifest-merger-base.iml
index e4b5f91..7a5aad8 100644
--- a/build-system/manifest-merger/manifest-merger-base.iml
+++ b/build-system/manifest-merger/manifest-merger-base.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
diff --git a/chartlib/chartlib.iml b/chartlib/chartlib.iml
index 1b0e816..bd8b623 100644
--- a/chartlib/chartlib.iml
+++ b/chartlib/chartlib.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
diff --git a/common/common.iml b/common/common.iml
index 6932d9e..7ca21ec 100644
--- a/common/common.iml
+++ b/common/common.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
diff --git a/ddmlib/ddmlib.iml b/ddmlib/ddmlib.iml
index de8ee09..b409e1b 100644
--- a/ddmlib/ddmlib.iml
+++ b/ddmlib/ddmlib.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
diff --git a/device_validator/dvlib/dvlib.iml b/device_validator/dvlib/dvlib.iml
index f75512c..cdb768f 100644
--- a/device_validator/dvlib/dvlib.iml
+++ b/device_validator/dvlib/dvlib.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
diff --git a/draw9patch/draw9patch.iml b/draw9patch/draw9patch.iml
index 86ae443..f5fa795 100644
--- a/draw9patch/draw9patch.iml
+++ b/draw9patch/draw9patch.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
diff --git a/instant-run/instant-run-client/instant-run-client.iml b/instant-run/instant-run-client/instant-run-client.iml
index 1518b0a..75e18c8 100644
--- a/instant-run/instant-run-client/instant-run-client.iml
+++ b/instant-run/instant-run-client/instant-run-client.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
diff --git a/lint/cli/lint-cli.iml b/lint/cli/lint-cli.iml
index 349d593..93aac33 100644
--- a/lint/cli/lint-cli.iml
+++ b/lint/cli/lint-cli.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
diff --git a/lint/libs/lint-api/lint-api-base.iml b/lint/libs/lint-api/lint-api-base.iml
index 6871c29..b7da9a1 100644
--- a/lint/libs/lint-api/lint-api-base.iml
+++ b/lint/libs/lint-api/lint-api-base.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
diff --git a/lint/libs/lint-checks/lint-checks-base.iml b/lint/libs/lint-checks/lint-checks-base.iml
index f609d52..8439b39 100644
--- a/lint/libs/lint-checks/lint-checks-base.iml
+++ b/lint/libs/lint-checks/lint-checks-base.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
diff --git a/lint/libs/lint-tests/lint-tests.iml b/lint/libs/lint-tests/lint-tests.iml
index 1fd95e3..2e740a8 100644
--- a/lint/libs/lint-tests/lint-tests.iml
+++ b/lint/libs/lint-tests/lint-tests.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
diff --git a/ninepatch/ninepatch.iml b/ninepatch/ninepatch.iml
index a50f428..1cdeab7 100644
--- a/ninepatch/ninepatch.iml
+++ b/ninepatch/ninepatch.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
diff --git a/perflib/perflib.iml b/perflib/perflib.iml
index 0284dc4..b0e8e86 100644
--- a/perflib/perflib.iml
+++ b/perflib/perflib.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
diff --git a/repository/repository.iml b/repository/repository.iml
index 4aebee2..3121d20 100644
--- a/repository/repository.iml
+++ b/repository/repository.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
diff --git a/rule-api/rule-api.iml b/rule-api/rule-api.iml
index 0207acf..c616ef9 100644
--- a/rule-api/rule-api.iml
+++ b/rule-api/rule-api.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
diff --git a/sdk-common/generate-locale-data/generate-locale-data.iml b/sdk-common/generate-locale-data/generate-locale-data.iml
index effeeec..5b4b531 100644
--- a/sdk-common/generate-locale-data/generate-locale-data.iml
+++ b/sdk-common/generate-locale-data/generate-locale-data.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
diff --git a/sdk-common/sdk-common-base.iml b/sdk-common/sdk-common-base.iml
index e663c28..a2726e9 100644
--- a/sdk-common/sdk-common-base.iml
+++ b/sdk-common/sdk-common-base.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
diff --git a/sdklib/sdklib-base.iml b/sdklib/sdklib-base.iml
index 7215a29..7b1cdb4 100644
--- a/sdklib/sdklib-base.iml
+++ b/sdklib/sdklib-base.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
diff --git a/testutils/testutils.iml b/testutils/testutils.iml
index 8f5555f..9364e3c 100644
--- a/testutils/testutils.iml
+++ b/testutils/testutils.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
diff --git a/vector-drawable-tool/vector-drawable-tool.iml b/vector-drawable-tool/vector-drawable-tool.iml
index 0879cc2..9f0e3dc 100644
--- a/vector-drawable-tool/vector-drawable-tool.iml
+++ b/vector-drawable-tool/vector-drawable-tool.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
