summaryrefslogtreecommitdiff
path: root/android/src
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2014-12-09 10:15:08 -0330
committerMatthew Newhook <matthew@zeroc.com>2014-12-09 10:15:08 -0330
commit48116da0f08c663fcfbb5f07796cdc23cdc1258d (patch)
tree1d47d8e8e583080b9fd4660ac1e1d153224514ab /android/src
parentFixed ICE-6094: IceGrid demo README issues (diff)
downloadice-48116da0f08c663fcfbb5f07796cdc23cdc1258d.tar.bz2
ice-48116da0f08c663fcfbb5f07796cdc23cdc1258d.tar.xz
ice-48116da0f08c663fcfbb5f07796cdc23cdc1258d.zip
Fixes for android studio 1.0.
Diffstat (limited to 'android/src')
-rw-r--r--android/src/Glacier2/glacier2.iml10
-rw-r--r--android/src/Ice/ice.iml9
-rw-r--r--android/src/IceBox/icebox.iml10
-rw-r--r--android/src/IceDiscovery/icediscovery.iml9
-rw-r--r--android/src/IceGrid/icegrid.iml10
-rw-r--r--android/src/IcePatch2/icepatch2.iml8
-rw-r--r--android/src/IceStorm/icestorm.iml8
7 files changed, 17 insertions, 47 deletions
diff --git a/android/src/Glacier2/glacier2.iml b/android/src/Glacier2/glacier2.iml
index 42c077f2345..6f89a0335ae 100644
--- a/android/src/Glacier2/glacier2.iml
+++ b/android/src/Glacier2/glacier2.iml
@@ -17,16 +17,12 @@
<output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
+ <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/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/classes" />
- <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
- <excludeFolder url="file://$MODULE_DIR$/build/set1.d.xml" />
- <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<content url="file://$MODULE_DIR$/../../../java/src/Glacier2/src/main/java">
<sourceFolder url="file://$MODULE_DIR$/../../../java/src/Glacier2/src/main/java" isTestSource="false" />
diff --git a/android/src/Ice/ice.iml b/android/src/Ice/ice.iml
index 6930a46aff4..78e13f7a622 100644
--- a/android/src/Ice/ice.iml
+++ b/android/src/Ice/ice.iml
@@ -17,17 +17,12 @@
<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/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/classes" />
- <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
- <excludeFolder url="file://$MODULE_DIR$/build/nostream.d.xml" />
- <excludeFolder url="file://$MODULE_DIR$/build/stream.d.xml" />
- <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<content url="file://$MODULE_DIR$/../../../java/src/Ice/src/main/java">
<sourceFolder url="file://$MODULE_DIR$/../../../java/src/Ice/src/main/java" isTestSource="false" />
diff --git a/android/src/IceBox/icebox.iml b/android/src/IceBox/icebox.iml
index 2ef993257c2..991a5000884 100644
--- a/android/src/IceBox/icebox.iml
+++ b/android/src/IceBox/icebox.iml
@@ -17,16 +17,12 @@
<output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
+ <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/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/classes" />
- <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
- <excludeFolder url="file://$MODULE_DIR$/build/set1.d.xml" />
- <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<content url="file://$MODULE_DIR$/../../../java/src/IceBox/src/main/java">
<sourceFolder url="file://$MODULE_DIR$/../../../java/src/IceBox/src/main/java" isTestSource="false" />
diff --git a/android/src/IceDiscovery/icediscovery.iml b/android/src/IceDiscovery/icediscovery.iml
index 855cc75aa1d..a3cc5ba99ae 100644
--- a/android/src/IceDiscovery/icediscovery.iml
+++ b/android/src/IceDiscovery/icediscovery.iml
@@ -17,17 +17,12 @@
<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/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/classes" />
- <excludeFolder url="file://$MODULE_DIR$/build/default.d.xml" />
- <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
- <excludeFolder url="file://$MODULE_DIR$/build/set1.d.xml" />
- <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<content url="file://$MODULE_DIR$/../../../java/src/IceDiscovery/src/main/java">
<sourceFolder url="file://$MODULE_DIR$/../../../java/src/IceDiscovery/src/main/java" isTestSource="false" />
diff --git a/android/src/IceGrid/icegrid.iml b/android/src/IceGrid/icegrid.iml
index 9c76e036755..6098eede0d6 100644
--- a/android/src/IceGrid/icegrid.iml
+++ b/android/src/IceGrid/icegrid.iml
@@ -17,16 +17,12 @@
<output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/build/generated-src" isTestSource="false" />
+ <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/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/classes" />
- <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
- <excludeFolder url="file://$MODULE_DIR$/build/set1.d.xml" />
- <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<content url="file://$MODULE_DIR$/../../../java/src/IceGrid/src/main/java">
<sourceFolder url="file://$MODULE_DIR$/../../../java/src/IceGrid/src/main/java" isTestSource="false" />
diff --git a/android/src/IcePatch2/icepatch2.iml b/android/src/IcePatch2/icepatch2.iml
index 46363f1eb50..5fdec746e55 100644
--- a/android/src/IcePatch2/icepatch2.iml
+++ b/android/src/IcePatch2/icepatch2.iml
@@ -17,16 +17,12 @@
<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/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/classes" />
- <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
- <excludeFolder url="file://$MODULE_DIR$/build/set1.d.xml" />
- <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<content url="file://$MODULE_DIR$/../../../java/src/IcePatch2/src/main/java">
<sourceFolder url="file://$MODULE_DIR$/../../../java/src/IcePatch2/src/main/java" isTestSource="false" />
diff --git a/android/src/IceStorm/icestorm.iml b/android/src/IceStorm/icestorm.iml
index 57c7dc0bf99..236a971007b 100644
--- a/android/src/IceStorm/icestorm.iml
+++ b/android/src/IceStorm/icestorm.iml
@@ -17,16 +17,12 @@
<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/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/classes" />
- <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
- <excludeFolder url="file://$MODULE_DIR$/build/set1.d.xml" />
- <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<content url="file://$MODULE_DIR$/../../../java/src/IceStorm/src/main/java">
<sourceFolder url="file://$MODULE_DIR$/../../../java/src/IceStorm/src/main/java" isTestSource="false" />
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 19:31:33 +0000