diff options
| author | Joe George <joe@zeroc.com> | 2015-05-12 10:27:12 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2015-05-12 11:49:04 -0400 |
| commit | 47750718c8b85744b059082477e899e2f3fbc18f (patch) | |
| tree | 2978e51d856383b0f01901e859a4b51beba742fa /android/test | |
| parent | Fixed ICE-6501: android SSL test failure and other minor Android test failures (diff) | |
| download | ice-47750718c8b85744b059082477e899e2f3fbc18f.tar.bz2 ice-47750718c8b85744b059082477e899e2f3fbc18f.tar.xz ice-47750718c8b85744b059082477e899e2f3fbc18f.zip | |
Update and cleanup Android Studio build
Diffstat (limited to 'android/test')
| -rw-r--r-- | android/test/android/testApp.iml | 11 | ||||
| -rw-r--r-- | android/test/plugins/testPlugins.iml | 14 | ||||
| -rw-r--r-- | android/test/test.iml | 12 |
3 files changed, 19 insertions, 18 deletions
diff --git a/android/test/android/testApp.iml b/android/test/android/testApp.iml index e66d198f1a5..a22f1e21272 100644 --- a/android/test/android/testApp.iml +++ b/android/test/android/testApp.iml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="com.zeroc" external.system.module.version="3.6.0" type="JAVA_MODULE" version="4"> +<module external.linked.project.id=":testApp" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="com.zeroc" external.system.module.version="3.6.0" type="JAVA_MODULE" version="4"> <component name="FacetManager"> <facet type="android-gradle" name="Android-Gradle"> <configuration> @@ -9,10 +9,12 @@ <facet type="android" name="Android"> <configuration> <option name="SELECTED_BUILD_VARIANT" value="debug" /> + <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" /> <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> - <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" /> <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" /> + <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" /> + <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" /> <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" /> <option name="ALLOW_USER_CONFIGURATION" value="false" /> <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> @@ -24,6 +26,7 @@ </component> <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" /> + <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" /> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" /> @@ -59,7 +62,6 @@ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" /> - <excludeFolder url="file://$MODULE_DIR$/build/generated-src" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" /> @@ -88,5 +90,4 @@ <orderEntry type="module" module-name="test" exported="" /> <orderEntry type="module" module-name="testPlugins" exported="" /> </component> -</module> - +</module>
\ No newline at end of file diff --git a/android/test/plugins/testPlugins.iml b/android/test/plugins/testPlugins.iml index 0f683bdf790..57f56baafb7 100644 --- a/android/test/plugins/testPlugins.iml +++ b/android/test/plugins/testPlugins.iml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="com.zeroc" external.system.module.version="3.6.0" type="JAVA_MODULE" version="4"> +<module external.linked.project.id=":testPlugins" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="com.zeroc" external.system.module.version="3.6.0" type="JAVA_MODULE" version="4"> <component name="FacetManager"> <facet type="android-gradle" name="Android-Gradle"> <configuration> @@ -8,7 +8,8 @@ </facet> <facet type="java-gradle" name="Java-Gradle"> <configuration> - <option name="BUILD_FOLDER_PATH" /> + <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" /> + <option name="BUILDABLE" value="true" /> </configuration> </facet> </component> @@ -17,11 +18,11 @@ <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> <excludeFolder url="file://$MODULE_DIR$/.gradle" /> </content> <content url="file://$MODULE_DIR$/../../../java/test/plugins/src/main/java"> @@ -31,5 +32,4 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="ice" exported="" /> </component> -</module> - +</module>
\ No newline at end of file diff --git a/android/test/test.iml b/android/test/test.iml index a661ca53b1c..05d9c63ac96 100644 --- a/android/test/test.iml +++ b/android/test/test.iml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.zeroc" external.system.module.version="3.6.0" type="JAVA_MODULE" version="4"> +<module external.linked.project.id=":test" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.zeroc" external.system.module.version="3.6.0" type="JAVA_MODULE" version="4"> <component name="FacetManager"> <facet type="android-gradle" name="Android-Gradle"> <configuration> @@ -8,7 +8,8 @@ </facet> <facet type="java-gradle" name="Java-Gradle"> <configuration> - <option name="BUILD_FOLDER_PATH" /> + <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" /> + <option name="BUILDABLE" value="true" /> </configuration> </facet> </component> @@ -17,11 +18,11 @@ <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> <excludeFolder url="file://$MODULE_DIR$/.gradle" /> </content> <content url="file://$MODULE_DIR$/../../java/test/src/main/java"> @@ -31,5 +32,4 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="ice" exported="" /> </component> -</module> - +</module>
\ No newline at end of file |