diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2016-04-11 23:50:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-11 23:50:01 +0000 |
| commit | de955f364fb694e44bc7bc42c9ccb06e7f3787ad (patch) | |
| tree | a9020e17ee3419496f1db1a332350aae66555492 | |
| parent | e574072e5f6429a43b8834700a311a081b80a970 (diff) | |
| parent | c716aea906b0cb457851b1bdecc7d4ecdd050a95 (diff) | |
| download | data-binding-de955f364fb694e44bc7bc42c9ccb06e7f3787ad.tar.gz | |
Update iml files (org.antlr move)
am: c716aea
* commit 'c716aea906b0cb457851b1bdecc7d4ecdd050a95':
Update iml files (org.antlr move)
Change-Id: I91d293059493d08d9e324c76bac5212c68566ab8
28 files changed, 318 insertions, 213 deletions
diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43ef..0103dd1c 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -18,5 +18,15 @@ <processorPath useClasspath="true" /> </profile> </annotationProcessing> + <bytecodeTargetLevel> + <module name="baseLibrary_main" target="1.6" /> + <module name="baseLibrary_test" target="1.6" /> + <module name="compilationTests_main" target="1.6" /> + <module name="compilationTests_test" target="1.6" /> + <module name="compiler_main" target="1.8" /> + <module name="compiler_test" target="1.8" /> + <module name="compilerCommon_main" target="1.8" /> + <module name="compilerCommon_test" target="1.8" /> + </bytecodeTargetLevel> </component> </project>
\ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index c9e59e10..0dce8633 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,7 +5,7 @@ <GradleProjectSettings> <option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="externalProjectPath" value="$PROJECT_DIR$" /> - <option name="gradleJvm" value="1.6" /> + <option name="gradleJvm" value="1.8" /> <option name="modules"> <set> <option value="$PROJECT_DIR$" /> @@ -17,16 +17,6 @@ </set> </option> <option name="useAutoImport" value="true" /> - <option name="myModules"> - <set> - <option value="$PROJECT_DIR$" /> - <option value="$PROJECT_DIR$/baseLibrary" /> - <option value="$PROJECT_DIR$/compilationTests" /> - <option value="$PROJECT_DIR$/compiler" /> - <option value="$PROJECT_DIR$/compilerCommon" /> - <option value="$PROJECT_DIR$/dataBinding" /> - </set> - </option> </GradleProjectSettings> </option> </component> diff --git a/.idea/misc.xml b/.idea/misc.xml index caac6524..e48072ee 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> - <component name="EntryPointsManager"> - <entry_points version="2.0" /> + <component name="ProjectInspectionProfilesVisibleTreeState"> + <entry key="Project Default"> + <profile-state> + <expanded-state> + <State> + <id /> + </State> + <State> + <id>Class structureJava</id> + </State> + <State> + <id>Code maturity issuesJava</id> + </State> + <State> + <id>Java</id> + </State> + <State> + <id>Java language level migration aidsJava</id> + </State> + <State> + <id>Javadoc issuesJava</id> + </State> + <State> + <id>Performance issuesJava</id> + </State> + <State> + <id>Threading issuesJava</id> + </State> + </expanded-state> + <selected-state> + <State> + <id>BashSupport</id> + </State> + </selected-state> + </profile-state> + </entry> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="false"> <OptionsSetting value="true" id="Add" /> @@ -13,7 +47,7 @@ <ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Remove" /> </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK"> - <output url="file://$PROJECT_DIR$/classes" /> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> + <output url="file://$PROJECT_DIR$/build/classes" /> </component> </project>
\ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 7eefe600..a3acbc51 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,12 +2,20 @@ <project version="4"> <component name="ProjectModuleManager"> <modules> - <module fileurl="file://$PROJECT_DIR$/baseLibrary/baseLibrary.iml" filepath="$PROJECT_DIR$/baseLibrary/baseLibrary.iml" /> - <module fileurl="file://$PROJECT_DIR$/compilationTests/compilationTests.iml" filepath="$PROJECT_DIR$/compilationTests/compilationTests.iml" /> - <module fileurl="file://$PROJECT_DIR$/compiler/compiler.iml" filepath="$PROJECT_DIR$/compiler/compiler.iml" /> - <module fileurl="file://$PROJECT_DIR$/compilerCommon/compilerCommon.iml" filepath="$PROJECT_DIR$/compilerCommon/compilerCommon.iml" /> - <module fileurl="file://$PROJECT_DIR$/data-binding.iml" filepath="$PROJECT_DIR$/data-binding.iml" /> - <module fileurl="file://$PROJECT_DIR$/dataBinding/dataBinding.iml" filepath="$PROJECT_DIR$/dataBinding/dataBinding.iml" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/baseLibrary/baseLibrary.iml" filepath="$PROJECT_DIR$/.idea/modules/baseLibrary/baseLibrary.iml" group="dataBinding/baseLibrary" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/baseLibrary/baseLibrary_main.iml" filepath="$PROJECT_DIR$/.idea/modules/baseLibrary/baseLibrary_main.iml" group="dataBinding/baseLibrary" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/baseLibrary/baseLibrary_test.iml" filepath="$PROJECT_DIR$/.idea/modules/baseLibrary/baseLibrary_test.iml" group="dataBinding/baseLibrary" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/compilationTests/compilationTests.iml" filepath="$PROJECT_DIR$/.idea/modules/compilationTests/compilationTests.iml" group="dataBinding/compilationTests" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/compilationTests/compilationTests_main.iml" filepath="$PROJECT_DIR$/.idea/modules/compilationTests/compilationTests_main.iml" group="dataBinding/compilationTests" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/compilationTests/compilationTests_test.iml" filepath="$PROJECT_DIR$/.idea/modules/compilationTests/compilationTests_test.iml" group="dataBinding/compilationTests" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/compiler/compiler.iml" filepath="$PROJECT_DIR$/.idea/modules/compiler/compiler.iml" group="dataBinding/compiler" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/compilerCommon/compilerCommon.iml" filepath="$PROJECT_DIR$/.idea/modules/compilerCommon/compilerCommon.iml" group="dataBinding/compilerCommon" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/compilerCommon/compilerCommon_main.iml" filepath="$PROJECT_DIR$/.idea/modules/compilerCommon/compilerCommon_main.iml" group="dataBinding/compilerCommon" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/compilerCommon/compilerCommon_test.iml" filepath="$PROJECT_DIR$/.idea/modules/compilerCommon/compilerCommon_test.iml" group="dataBinding/compilerCommon" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/compiler/compiler_main.iml" filepath="$PROJECT_DIR$/.idea/modules/compiler/compiler_main.iml" group="dataBinding/compiler" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/compiler/compiler_test.iml" filepath="$PROJECT_DIR$/.idea/modules/compiler/compiler_test.iml" group="dataBinding/compiler" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/data-binding.iml" filepath="$PROJECT_DIR$/.idea/modules/data-binding.iml" /> + <module fileurl="file://$PROJECT_DIR$/.idea/modules/dataBinding/dataBinding.iml" filepath="$PROJECT_DIR$/.idea/modules/dataBinding/dataBinding.iml" group="dataBinding" /> </modules> </component> </project>
\ No newline at end of file diff --git a/.idea/modules/baseLibrary/baseLibrary.iml b/.idea/modules/baseLibrary/baseLibrary.iml new file mode 100644 index 00000000..019a989b --- /dev/null +++ b/.idea/modules/baseLibrary/baseLibrary.iml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.id=":dataBinding:baseLibrary" external.linked.project.path="$MODULE_DIR$/../../../baseLibrary" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="com.android.databinding" external.system.module.version="2.2.0-dev" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$/../../../baseLibrary"> + <excludeFolder url="file://$MODULE_DIR$/../../../baseLibrary/.gradle" /> + <excludeFolder url="file://$MODULE_DIR$/../../../baseLibrary/build" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module>
\ No newline at end of file diff --git a/.idea/modules/baseLibrary/baseLibrary_main.iml b/.idea/modules/baseLibrary/baseLibrary_main.iml new file mode 100644 index 00000000..4d93153a --- /dev/null +++ b/.idea/modules/baseLibrary/baseLibrary_main.iml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.id=":dataBinding:baseLibrary:main" external.linked.project.path="$MODULE_DIR$/../../../baseLibrary" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="com.android.databinding" external.system.module.type="sourceSet" external.system.module.version="2.2.0-dev" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/../../../baseLibrary/build/classes/main" /> + <exclude-output /> + <content url="file://$MODULE_DIR$/../../../baseLibrary/src/main"> + <sourceFolder url="file://$MODULE_DIR$/../../../baseLibrary/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../baseLibrary/src/main/resources" type="java-resource" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module>
\ No newline at end of file diff --git a/.idea/modules/baseLibrary/baseLibrary_test.iml b/.idea/modules/baseLibrary/baseLibrary_test.iml new file mode 100644 index 00000000..bc70242f --- /dev/null +++ b/.idea/modules/baseLibrary/baseLibrary_test.iml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.id=":dataBinding:baseLibrary:test" external.linked.project.path="$MODULE_DIR$/../../../baseLibrary" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="com.android.databinding" external.system.module.type="sourceSet" external.system.module.version="2.2.0-dev" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> + <output-test url="file://$MODULE_DIR$/../../../baseLibrary/build/classes/test" /> + <exclude-output /> + <content url="file://$MODULE_DIR$/../../../baseLibrary/src/test"> + <sourceFolder url="file://$MODULE_DIR$/../../../baseLibrary/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../baseLibrary/src/test/resources" type="java-test-resource" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="baseLibrary_main" /> + <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" /> + <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" /> + </component> + <component name="TestModuleProperties" production-module="baseLibrary_main" /> +</module>
\ No newline at end of file diff --git a/.idea/modules/compilationTests/compilationTests.iml b/.idea/modules/compilationTests/compilationTests.iml new file mode 100644 index 00000000..bedf7d94 --- /dev/null +++ b/.idea/modules/compilationTests/compilationTests.iml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.id=":dataBinding:compilationTests" external.linked.project.path="$MODULE_DIR$/../../../compilationTests" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="data-binding.dataBinding" external.system.module.version="1.0" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$/../../../compilationTests"> + <excludeFolder url="file://$MODULE_DIR$/../../../compilationTests/.gradle" /> + <excludeFolder url="file://$MODULE_DIR$/../../../compilationTests/build" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module>
\ No newline at end of file diff --git a/.idea/modules/compilationTests/compilationTests_main.iml b/.idea/modules/compilationTests/compilationTests_main.iml new file mode 100644 index 00000000..def742ce --- /dev/null +++ b/.idea/modules/compilationTests/compilationTests_main.iml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.id=":dataBinding:compilationTests:main" external.linked.project.path="$MODULE_DIR$/../../../compilationTests" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="data-binding.dataBinding" external.system.module.type="sourceSet" external.system.module.version="1.0" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/../../../compilationTests/build/classes/main" /> + <exclude-output /> + <content url="file://$MODULE_DIR$/../../../compilationTests/src/main"> + <sourceFolder url="file://$MODULE_DIR$/../../../compilationTests/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../compilationTests/src/main/resources" type="java-resource" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module>
\ No newline at end of file diff --git a/.idea/modules/compilationTests/compilationTests_test.iml b/.idea/modules/compilationTests/compilationTests_test.iml new file mode 100644 index 00000000..5241cc7f --- /dev/null +++ b/.idea/modules/compilationTests/compilationTests_test.iml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.id=":dataBinding:compilationTests:test" external.linked.project.path="$MODULE_DIR$/../../../compilationTests" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="data-binding.dataBinding" external.system.module.type="sourceSet" external.system.module.version="1.0" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> + <output-test url="file://$MODULE_DIR$/../../../compilationTests/build/classes/test" /> + <exclude-output /> + <content url="file://$MODULE_DIR$/../../../compilationTests/src/test"> + <sourceFolder url="file://$MODULE_DIR$/../../../compilationTests/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../compilationTests/src/test/resources" type="java-test-resource" /> + </content> + <content url="file://$MODULE_DIR$/../../../compiler/src/test/java/android"> + <sourceFolder url="file://$MODULE_DIR$/../../../compiler/src/test/java/android/databinding/tool/reflection/java" isTestSource="true" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="compilationTests_main" /> + <orderEntry type="module" module-name="baseLibrary_main" /> + <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" /> + <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.3.2" level="project" /> + <orderEntry type="library" name="Gradle: commons-io:commons-io:2.4" level="project" /> + <orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.10" level="project" /> + <orderEntry type="module" module-name="compilerCommon_main" /> + <orderEntry type="module" module-name="compiler_main" /> + <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" /> + <orderEntry type="library" name="Gradle: org.antlr:antlr4:4.5.3" level="project" /> + <orderEntry type="library" name="Gradle: com.googlecode.juniversalchardet:juniversalchardet:1.0.3" level="project" /> + <orderEntry type="library" name="Gradle: com.google.guava:guava:17.0" level="project" /> + <orderEntry type="library" name="Gradle: com.android.tools:annotations:24.5.0" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.0.0" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.0.0" level="project" /> + </component> + <component name="TestModuleProperties" production-module="compilationTests_main" /> +</module>
\ No newline at end of file diff --git a/.idea/modules/compiler/compiler.iml b/.idea/modules/compiler/compiler.iml new file mode 100644 index 00000000..50b5884c --- /dev/null +++ b/.idea/modules/compiler/compiler.iml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.id=":dataBinding:compiler" external.linked.project.path="$MODULE_DIR$/../../../compiler" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="com.android.databinding" external.system.module.version="2.2.0-dev" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$/../../../compiler"> + <excludeFolder url="file://$MODULE_DIR$/../../../compiler/.gradle" /> + <excludeFolder url="file://$MODULE_DIR$/../../../compiler/build" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module>
\ No newline at end of file diff --git a/.idea/modules/compiler/compiler_main.iml b/.idea/modules/compiler/compiler_main.iml new file mode 100644 index 00000000..abf84114 --- /dev/null +++ b/.idea/modules/compiler/compiler_main.iml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.id=":dataBinding:compiler:main" external.linked.project.path="$MODULE_DIR$/../../../compiler" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="com.android.databinding" external.system.module.type="sourceSet" external.system.module.version="2.2.0-dev" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/../../../compiler/build/classes/main" /> + <exclude-output /> + <content url="file://$MODULE_DIR$/../../../compiler/src/main"> + <sourceFolder url="file://$MODULE_DIR$/../../../compiler/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../compiler/src/main/kotlin" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../compiler/src/main/resources" type="java-resource" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="compilerCommon_main" /> + <orderEntry type="module" module-name="baseLibrary_main" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.0.0" level="project" /> + <orderEntry type="library" name="Gradle: commons-io:commons-io:2.4" level="project" /> + <orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.10" level="project" /> + <orderEntry type="library" name="Gradle: org.antlr:antlr4:4.5.3" level="project" /> + <orderEntry type="library" name="Gradle: com.googlecode.juniversalchardet:juniversalchardet:1.0.3" level="project" /> + <orderEntry type="library" name="Gradle: com.google.guava:guava:17.0" level="project" /> + <orderEntry type="library" name="Gradle: com.android.tools:annotations:24.5.0" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.0.0" level="project" /> + </component> +</module>
\ No newline at end of file diff --git a/.idea/modules/compiler/compiler_test.iml b/.idea/modules/compiler/compiler_test.iml new file mode 100644 index 00000000..433185ee --- /dev/null +++ b/.idea/modules/compiler/compiler_test.iml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.id=":dataBinding:compiler:test" external.linked.project.path="$MODULE_DIR$/../../../compiler" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="com.android.databinding" external.system.module.type="sourceSet" external.system.module.version="2.2.0-dev" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false"> + <output-test url="file://$MODULE_DIR$/../../../compiler/build/classes/test" /> + <exclude-output /> + <content url="file://$MODULE_DIR$/../../../compiler/src/test/java"> + <sourceFolder url="file://$MODULE_DIR$/../../../compiler/src/test/java" isTestSource="true" /> + </content> + <content url="file://$MODULE_DIR$/../../../compiler/src/test/kotlin"> + <sourceFolder url="file://$MODULE_DIR$/../../../compiler/src/test/kotlin" isTestSource="true" /> + </content> + <content url="file://$MODULE_DIR$/../../../compiler/src/test/resources"> + <sourceFolder url="file://$MODULE_DIR$/../../../compiler/src/test/resources" type="java-test-resource" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="compiler_main" /> + <orderEntry type="module" module-name="compilerCommon_main" /> + <orderEntry type="module" module-name="baseLibrary_main" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.0.0" level="project" /> + <orderEntry type="library" name="Gradle: commons-io:commons-io:2.4" level="project" /> + <orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.10" level="project" /> + <orderEntry type="library" name="Gradle: org.antlr:antlr4:4.5.3" level="project" /> + <orderEntry type="library" name="Gradle: com.googlecode.juniversalchardet:juniversalchardet:1.0.3" level="project" /> + <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" /> + <orderEntry type="library" name="Gradle: com.google.guava:guava:17.0" level="project" /> + <orderEntry type="library" name="Gradle: com.android.tools:annotations:24.5.0" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.0.0" level="project" /> + <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" /> + </component> + <component name="TestModuleProperties" production-module="compiler_main" /> +</module>
\ No newline at end of file diff --git a/.idea/modules/compilerCommon/compilerCommon.iml b/.idea/modules/compilerCommon/compilerCommon.iml new file mode 100644 index 00000000..27fdbd49 --- /dev/null +++ b/.idea/modules/compilerCommon/compilerCommon.iml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.id=":dataBinding:compilerCommon" external.linked.project.path="$MODULE_DIR$/../../../compilerCommon" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="com.android.databinding" external.system.module.version="2.2.0-dev" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$/../../../compilerCommon"> + <excludeFolder url="file://$MODULE_DIR$/../../../compilerCommon/.gradle" /> + <excludeFolder url="file://$MODULE_DIR$/../../../compilerCommon/build" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module>
\ No newline at end of file diff --git a/.idea/modules/compilerCommon/compilerCommon_main.iml b/.idea/modules/compilerCommon/compilerCommon_main.iml new file mode 100644 index 00000000..4978e298 --- /dev/null +++ b/.idea/modules/compilerCommon/compilerCommon_main.iml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.id=":dataBinding:compilerCommon:main" external.linked.project.path="$MODULE_DIR$/../../../compilerCommon" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="com.android.databinding" external.system.module.type="sourceSet" external.system.module.version="2.2.0-dev" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/../../../compilerCommon/build/classes/main" /> + <exclude-output /> + <content url="file://$MODULE_DIR$/../../../compilerCommon/src/main"> + <sourceFolder url="file://$MODULE_DIR$/../../../compilerCommon/src/main/grammar-gen" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../compilerCommon/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../compilerCommon/src/main/xml-gen" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../compilerCommon/src/main/resources" type="java-resource" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="baseLibrary_main" /> + <orderEntry type="library" name="Gradle: org.antlr:antlr4:4.5.3" level="project" /> + <orderEntry type="library" name="Gradle: commons-io:commons-io:2.4" level="project" /> + <orderEntry type="library" name="Gradle: com.googlecode.juniversalchardet:juniversalchardet:1.0.3" level="project" /> + <orderEntry type="library" name="Gradle: com.google.guava:guava:17.0" level="project" /> + <orderEntry type="library" name="Gradle: com.android.tools:annotations:24.5.0" level="project" /> + </component> +</module>
\ No newline at end of file diff --git a/.idea/modules/compilerCommon/compilerCommon_test.iml b/.idea/modules/compilerCommon/compilerCommon_test.iml new file mode 100644 index 00000000..26e89c6f --- /dev/null +++ b/.idea/modules/compilerCommon/compilerCommon_test.iml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.id=":dataBinding:compilerCommon:test" external.linked.project.path="$MODULE_DIR$/../../../compilerCommon" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="com.android.databinding" external.system.module.type="sourceSet" external.system.module.version="2.2.0-dev" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false"> + <output-test url="file://$MODULE_DIR$/../../../compilerCommon/build/classes/test" /> + <exclude-output /> + <content url="file://$MODULE_DIR$/../../../compilerCommon/src/test"> + <sourceFolder url="file://$MODULE_DIR$/../../../compilerCommon/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/../../../compilerCommon/src/test/resources" type="java-test-resource" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="compilerCommon_main" /> + <orderEntry type="module" module-name="baseLibrary_main" /> + <orderEntry type="library" name="Gradle: org.antlr:antlr4:4.5.3" level="project" /> + <orderEntry type="library" name="Gradle: commons-io:commons-io:2.4" level="project" /> + <orderEntry type="library" name="Gradle: com.googlecode.juniversalchardet:juniversalchardet:1.0.3" level="project" /> + <orderEntry type="library" name="Gradle: com.google.guava:guava:17.0" level="project" /> + <orderEntry type="library" name="Gradle: com.android.tools:annotations:24.5.0" level="project" /> + <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" /> + <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" /> + </component> + <component name="TestModuleProperties" production-module="compilerCommon_main" /> +</module>
\ No newline at end of file diff --git a/.idea/modules/data-binding.iml b/.idea/modules/data-binding.iml new file mode 100644 index 00000000..2bbad644 --- /dev/null +++ b/.idea/modules/data-binding.iml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.id="data-binding" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$/../.."> + <excludeFolder url="file://$MODULE_DIR$/../../.gradle" /> + <excludeFolder url="file://$MODULE_DIR$/../../build" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module>
\ No newline at end of file diff --git a/.idea/modules/dataBinding/dataBinding.iml b/.idea/modules/dataBinding/dataBinding.iml new file mode 100644 index 00000000..d0099f24 --- /dev/null +++ b/.idea/modules/dataBinding/dataBinding.iml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.id=":dataBinding" external.linked.project.path="$MODULE_DIR$/../../../dataBinding" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="com.android.databinding" external.system.module.version="2.2.0-dev" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$/../../../dataBinding"> + <excludeFolder url="file://$MODULE_DIR$/../../../dataBinding/.gradle" /> + <excludeFolder url="file://$MODULE_DIR$/../../../dataBinding/build" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module>
\ No newline at end of file diff --git a/baseLibrary/baseLibrary.iml b/baseLibrary/baseLibrary.iml deleted file mode 100644 index c6163c1f..00000000 --- a/baseLibrary/baseLibrary.iml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.id=":dataBinding:baseLibrary" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.android.databinding" external.system.module.version="1.1" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/build/classes/main" /> - <output-test url="file://$MODULE_DIR$/build/classes/test" /> - <exclude-output /> - <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" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> - <excludeFolder url="file://$MODULE_DIR$/.gradle" /> - <excludeFolder url="file://$MODULE_DIR$/build" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" /> - <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" /> - </component> -</module>
\ No newline at end of file diff --git a/baseLibrary/db-baseLibrary.iml b/baseLibrary/db-baseLibrary.iml index 7cf99832..1804bc90 100644 --- a/baseLibrary/db-baseLibrary.iml +++ b/baseLibrary/db-baseLibrary.iml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> diff --git a/compilationTests/compilationTests.iml b/compilationTests/compilationTests.iml deleted file mode 100644 index 751bf1e8..00000000 --- a/compilationTests/compilationTests.iml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.id=":dataBinding:compilationTests" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="data-binding.dataBinding" external.system.module.version="1.0" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/build/classes/main" /> - <output-test url="file://$MODULE_DIR$/build/classes/test" /> - <exclude-output /> - <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" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> - <excludeFolder url="file://$MODULE_DIR$/.gradle" /> - <excludeFolder url="file://$MODULE_DIR$/build" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="compilerCommon" scope="TEST" /> - <orderEntry type="module" module-name="baseLibrary" scope="TEST" /> - <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" /> - <orderEntry type="library" scope="TEST" name="Gradle: org.apache.commons:commons-lang3:3.3.2" level="project" /> - <orderEntry type="library" scope="TEST" name="Gradle: commons-io:commons-io:2.4" level="project" /> - <orderEntry type="library" scope="TEST" name="Gradle: commons-codec:commons-codec:1.10" level="project" /> - <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Gradle: com.tunnelvisionlabs:antlr4:4.5" level="project" /> - <orderEntry type="library" scope="TEST" name="Gradle: com.googlecode.juniversalchardet:juniversalchardet:1.0.3" level="project" /> - <orderEntry type="library" scope="TEST" name="Gradle: com.tunnelvisionlabs:antlr4-runtime:4.5" level="project" /> - <orderEntry type="library" scope="TEST" name="Gradle: com.tunnelvisionlabs:antlr4-annotations:4.5" level="project" /> - <orderEntry type="library" scope="TEST" name="Gradle: org.antlr:antlr-runtime:3.5.2" level="project" /> - <orderEntry type="library" scope="TEST" name="Gradle: org.antlr:ST4:4.0.8" level="project" /> - <orderEntry type="library" scope="TEST" name="Gradle: org.abego.treelayout:org.abego.treelayout.core:1.0.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Gradle: com.google.guava:guava:17.0" level="project" /> - </component> -</module>
\ No newline at end of file diff --git a/compiler/compiler.iml b/compiler/compiler.iml deleted file mode 100644 index adf86190..00000000 --- a/compiler/compiler.iml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.id=":dataBinding:compiler" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.android.databinding" external.system.module.version="1.1" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/build/classes/main" /> - <output-test url="file://$MODULE_DIR$/build/classes/test" /> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/kotlin" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> - <excludeFolder url="file://$MODULE_DIR$/.gradle" /> - <excludeFolder url="file://$MODULE_DIR$/build" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="compilerCommon" /> - <orderEntry type="module" module-name="baseLibrary" /> - <orderEntry type="library" name="Gradle: commons-io:commons-io:2.4" level="project" /> - <orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.10" level="project" /> - <orderEntry type="library" name="Gradle: com.tunnelvisionlabs:antlr4:4.5" level="project" /> - <orderEntry type="library" name="Gradle: com.googlecode.juniversalchardet:juniversalchardet:1.0.3" level="project" /> - <orderEntry type="library" name="Gradle: com.tunnelvisionlabs:antlr4-runtime:4.5" level="project" /> - <orderEntry type="library" name="Gradle: com.tunnelvisionlabs:antlr4-annotations:4.5" level="project" /> - <orderEntry type="library" name="Gradle: org.antlr:antlr-runtime:3.5.2" level="project" /> - <orderEntry type="library" name="Gradle: org.antlr:ST4:4.0.8" level="project" /> - <orderEntry type="library" name="Gradle: org.abego.treelayout:org.abego.treelayout.core:1.0.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" /> - <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" name="Gradle: com.google.guava:guava:17.0" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-4584" level="project" /> - <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.0.0-beta-4584" level="project" /> - </component> -</module>
\ No newline at end of file diff --git a/compiler/db-compiler.iml b/compiler/db-compiler.iml index 2f3a0d27..d47a5828 100644 --- a/compiler/db-compiler.iml +++ b/compiler/db-compiler.iml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> diff --git a/compilerCommon/compilerCommon.iml b/compilerCommon/compilerCommon.iml deleted file mode 100644 index d9cc2c61..00000000 --- a/compilerCommon/compilerCommon.iml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.id=":dataBinding:compilerCommon" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.android.databinding" external.system.module.version="1.1" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/build/classes/main" /> - <output-test url="file://$MODULE_DIR$/build/classes/test" /> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/grammar-gen" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/xml-gen" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> - <excludeFolder url="file://$MODULE_DIR$/.gradle" /> - <excludeFolder url="file://$MODULE_DIR$/build" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="baseLibrary" /> - <orderEntry type="library" name="Gradle: com.tunnelvisionlabs:antlr4:4.5" level="project" /> - <orderEntry type="library" name="Gradle: commons-io:commons-io:2.4" level="project" /> - <orderEntry type="library" name="Gradle: com.googlecode.juniversalchardet:juniversalchardet:1.0.3" level="project" /> - <orderEntry type="library" name="Gradle: com.tunnelvisionlabs:antlr4-runtime:4.5" level="project" /> - <orderEntry type="library" name="Gradle: com.tunnelvisionlabs:antlr4-annotations:4.5" level="project" /> - <orderEntry type="library" name="Gradle: org.antlr:antlr-runtime:3.5.2" level="project" /> - <orderEntry type="library" name="Gradle: org.antlr:ST4:4.0.8" level="project" /> - <orderEntry type="library" name="Gradle: org.abego.treelayout:org.abego.treelayout.core:1.0.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" /> - <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" /> - <orderEntry type="library" name="Gradle: com.google.guava:guava:17.0" level="project" /> - </component> -</module>
\ No newline at end of file diff --git a/compilerCommon/db-compilerCommon-base.iml b/compilerCommon/db-compilerCommon-base.iml index 38f8122f..bc880d54 100644 --- a/compilerCommon/db-compilerCommon-base.iml +++ b/compilerCommon/db-compilerCommon-base.iml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> @@ -16,7 +16,7 @@ <orderEntry type="module-library" exported=""> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../prebuilts/tools/common/m2/repository/com/tunnelvisionlabs/antlr4/4.5/antlr4-4.5.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../prebuilts/tools/common/m2/repository/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -45,42 +45,6 @@ <orderEntry type="module-library" exported=""> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../prebuilts/tools/common/m2/repository/com/tunnelvisionlabs/antlr4-runtime/4.5/antlr4-runtime-4.5.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../prebuilts/tools/common/m2/repository/com/tunnelvisionlabs/antlr4-annotations/4.5/antlr4-annotations-4.5.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../prebuilts/tools/common/m2/repository/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../prebuilts/tools/common/m2/repository/org/antlr/ST4/4.0.8/ST4-4.0.8.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/../../../prebuilts/tools/common/m2/repository/org/abego/treelayout/org.abego.treelayout.core/1.0.1/org.abego.treelayout.core-1.0.1.jar!/" /> </CLASSES> <JAVADOC /> @@ -110,5 +74,6 @@ </library> </orderEntry> <orderEntry type="library" exported="" name="guava-tools" level="project" /> + <orderEntry type="module" module-name="android-annotations" /> </component> </module>
\ No newline at end of file diff --git a/compilerCommon/db-compilerCommon.iml b/compilerCommon/db-compilerCommon.iml index 3b18b8a9..eb533639 100644 --- a/compilerCommon/db-compilerCommon.iml +++ b/compilerCommon/db-compilerCommon.iml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> @@ -25,8 +25,7 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="library" exported="" name="antlr4-runtime-4.5" level="project" /> - <orderEntry type="library" exported="" name="antlr4-annotations-4.5" level="project" /> + <orderEntry type="library" exported="" name="antlr4-runtime-4.5.3" level="project" /> <orderEntry type="module-library" scope="TEST"> <library> <CLASSES> @@ -49,5 +48,6 @@ </SOURCES> </library> </orderEntry> + <orderEntry type="module" module-name="android-annotations" exported="" /> </component> </module>
\ No newline at end of file diff --git a/data-binding.iml b/data-binding.iml deleted file mode 100644 index bebe401a..00000000 --- a/data-binding.iml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.id="data-binding" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/build" /> - <output-test url="file://$MODULE_DIR$/build" /> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <excludeFolder url="file://$MODULE_DIR$/.gradle" /> - <excludeFolder url="file://$MODULE_DIR$/build" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - </component> -</module>
\ No newline at end of file diff --git a/dataBinding/dataBinding.iml b/dataBinding/dataBinding.iml deleted file mode 100644 index 0d65182c..00000000 --- a/dataBinding/dataBinding.iml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.id=":dataBinding" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.android.databinding" external.system.module.version="1.1" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/build" /> - <output-test url="file://$MODULE_DIR$/build" /> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <excludeFolder url="file://$MODULE_DIR$/.gradle" /> - <excludeFolder url="file://$MODULE_DIR$/build" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - </component> -</module>
\ No newline at end of file |