Skip to content

Commit aaa0cbc

Browse files
mythzmythz
committed
Android Studio project updates
1 parent 6b8e703 commit aaa0cbc

File tree

9 files changed

+24
-32
lines changed

9 files changed

+24
-32
lines changed

‎src/AndroidClient/.idea/gradle.xml‎

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

‎src/AndroidClient/.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/AndroidClient/.idea/modules.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/AndroidClient/AndroidClient.iml‎

Lines changed: 1 addition & 1 deletion
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.id="AndroidClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/client" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id="AndroidClient" 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>

‎src/AndroidClient/android/android.iml‎

Lines changed: 1 addition & 5 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.id=":android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../client" external.system.id="GRADLE" external.system.module.group="net.servicestack" external.system.module.version="1.0.20" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="net.servicestack" external.system.module.version="1.0.20" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -71,17 +71,13 @@
7171
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
7272
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
7373
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
7574
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
7675
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
7776
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
7977
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
8078
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
8279
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8380
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
8581
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
8682
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
8783
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />

‎src/AndroidClient/android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ install {
101101
dependencies {
102102
compile 'com.android.support:appcompat-v7:21.0.3'
103103
compile project(':client')
104-
compile fileTree(dir: 'libs', include: '*.jar')
104+
compile fileTree(include: '*.jar', dir: 'libs')
105105
testCompile 'junit:junit:4.11'
106106
testCompile 'org.mockito:mockito-core:1.9.5'
107107
}

‎src/AndroidClient/app/app.iml‎

Lines changed: 1 addition & 3 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.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../client" external.system.id="GRADLE" external.system.module.group="AndroidClient" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="AndroidClient" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -72,9 +72,7 @@
7272
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/jars" />
7373
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
7474
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
7675
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
7876
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
7977
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
8078
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />

‎src/AndroidClient/client/client.iml‎

Lines changed: 2 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.id=":client" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="net.servicestack" external.system.module.version="1.0.20" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":client" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="net.servicestack" external.system.module.version="1.0.20" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -13,7 +13,7 @@
1313
</configuration>
1414
</facet>
1515
</component>
16-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
16+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
1717
<output url="file://$MODULE_DIR$/build/classes/main" />
1818
<output-test url="file://$MODULE_DIR$/build/classes/test" />
1919
<exclude-output />
@@ -35,7 +35,5 @@
3535
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
3636
<orderEntry type="library" exported="" scope="TEST" name="objenesis-1.0" level="project" />
3737
<orderEntry type="library" exported="" name="client.client-1.0.20" level="project" />
38-
<orderEntry type="library" exported="" name="client.client-1.0.20-sources" level="project" />
39-
<orderEntry type="library" exported="" name="client.client-1.0.20-javadoc" level="project" />
4038
</component>
4139
</module>

‎src/AndroidClient/client/pom.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,6 @@
3232
<url>https://github.com/ServiceStack/ServiceStack.Java</url>
3333
</scm>
3434
<dependencies>
35-
<dependency>
36-
<groupId>junit</groupId>
37-
<artifactId>junit</artifactId>
38-
<version>4.11</version>
39-
<scope>test</scope>
40-
</dependency>
41-
<dependency>
42-
<groupId>org.apache.httpcomponents</groupId>
43-
<artifactId>httpmime</artifactId>
44-
<version>4.2.3</version>
45-
<scope>compile</scope>
46-
</dependency>
4735
<dependency>
4836
<groupId>com.google.code.gson</groupId>
4937
<artifactId>gson</artifactId>
@@ -56,5 +44,17 @@
5644
<version>1.9.5</version>
5745
<scope>test</scope>
5846
</dependency>
47+
<dependency>
48+
<groupId>org.apache.httpcomponents</groupId>
49+
<artifactId>httpmime</artifactId>
50+
<version>4.2.3</version>
51+
<scope>compile</scope>
52+
</dependency>
53+
<dependency>
54+
<groupId>junit</groupId>
55+
<artifactId>junit</artifactId>
56+
<version>4.11</version>
57+
<scope>test</scope>
58+
</dependency>
5959
</dependencies>
6060
</project>

0 commit comments

Comments
 (0)