Skip to content

Commit 973cf0d

Browse files
committed
Android Studio update.
1 parent c4c9e53 commit 973cf0d

File tree

4 files changed

+16
-13
lines changed

4 files changed

+16
-13
lines changed

.idea/gradle.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

DragLinearLayout.iml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module 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">
2+
<module external.linked.project.id="DragLinearLayout" 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">
33
<component name="FacetManager">
44
<facet type="java-gradle" name="Java-Gradle">
55
<configuration>
66
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
7+
<option name="BUILDABLE" value="false" />
78
</configuration>
89
</facet>
910
</component>
@@ -15,5 +16,4 @@
1516
<orderEntry type="inheritedJdk" />
1617
<orderEntry type="sourceFolder" forTests="false" />
1718
</component>
18-
</module>
19-
19+
</module>

library/library.iml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="DragLinearLayout" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":library" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="DragLinearLayout" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -12,8 +12,9 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
1615
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
17+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
1718
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
1819
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1920
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -62,6 +63,7 @@
6263
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6364
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6465
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
66+
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
6567
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6668
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6769
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -81,7 +83,9 @@
8183
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8284
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8385
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
8487
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/publications" />
8589
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8690
</content>
8791
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
@@ -90,5 +94,4 @@
9094
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
9195
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
9296
</component>
93-
</module>
94-
97+
</module>

sample/sample.iml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="DragLinearLayout" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":sample" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="DragLinearLayout" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -12,8 +12,9 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
1615
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
17+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
1718
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
1819
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1920
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -91,5 +92,4 @@
9192
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
9293
<orderEntry type="module" module-name="library" exported="" />
9394
</component>
94-
</module>
95-
95+
</module>

0 commit comments

Comments
 (0)