Skip to content

Commit 0a1ea4a

Browse files
mythzmythz
committed
import client project into new Android Studio 1.5 solution which created a gradle wrapper so JUnit tests could run
1 parent 918bf00 commit 0a1ea4a

36 files changed

+3961
-78
lines changed

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

Lines changed: 2 additions & 12 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: 26 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/AndroidClient/AndroidClient.iml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
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$" 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$/client" 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>
10-
<component name="NewModuleRootManager" inherit-compiler-output="true">
11+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
1112
<exclude-output />
1213
<content url="file://$MODULE_DIR$">
1314
<excludeFolder url="file://$MODULE_DIR$/.gradle" />

‎src/AndroidClient/android/android.iml‎

Lines changed: 10 additions & 14 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$/.." 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$/../client" 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,8 +13,11 @@
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1515
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16-
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
17-
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
16+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
17+
<afterSyncTasks>
18+
<task>generateDebugAndroidTestSources</task>
19+
<task>generateDebugSources</task>
20+
</afterSyncTasks>
1821
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1922
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
2023
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -24,7 +27,7 @@
2427
</configuration>
2528
</facet>
2629
</component>
27-
<component name="NewModuleRootManager" inherit-compiler-output="false">
30+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
2831
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
2932
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
3033
<exclude-output />
@@ -62,29 +65,22 @@
6265
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6366
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6467
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
6569
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6670
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6771
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
6972
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7073
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
71-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
7274
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
7675
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
7776
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
7977
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
8178
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
8280
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8381
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
8483
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
8884
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8985
</content>
9086
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />

‎src/AndroidClient/app/app.iml‎

Lines changed: 8 additions & 15 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$/.." 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$/../client" 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>
@@ -13,17 +13,19 @@
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1515
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16-
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
17-
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
16+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
17+
<afterSyncTasks>
18+
<task>generateDebugAndroidTestSources</task>
19+
<task>generateDebugSources</task>
20+
</afterSyncTasks>
1821
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1922
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
2023
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
21-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
2224
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2325
</configuration>
2426
</facet>
2527
</component>
26-
<component name="NewModuleRootManager" inherit-compiler-output="false">
28+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
2729
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
2830
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
2931
<exclude-output />
@@ -62,22 +64,13 @@
6264
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6365
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
6466
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
65-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6667
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
67-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
6868
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
69-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
7169
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
72-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
7670
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
7871
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
8072
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
73+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
8174
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8275
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
8376
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />

‎src/AndroidClient/client-new/client-new.iml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id=":client-new" 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">
2+
<module external.linked.project.id=":client-new" 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">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
66
<option name="GRADLE_PROJECT_PATH" value=":client-new" />
77
</configuration>
88
</facet>
9+
<facet type="java-gradle" name="Java-Gradle">
10+
<configuration>
11+
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
12+
<option name="BUILDABLE" value="false" />
13+
</configuration>
14+
</facet>
915
</component>
10-
<component name="NewModuleRootManager" inherit-compiler-output="true">
16+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
1117
<exclude-output />
18+
<content url="file://$MODULE_DIR$">
19+
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
20+
<excludeFolder url="file://$MODULE_DIR$/build" />
21+
</content>
1222
<orderEntry type="inheritedJdk" />
1323
<orderEntry type="sourceFolder" forTests="false" />
1424
</component>

‎src/AndroidClient/client/.idea/.name‎

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

‎src/AndroidClient/client/.idea/compiler.xml‎

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

‎src/AndroidClient/client/.idea/copyright/profiles_settings.xml‎

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

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

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

0 commit comments

Comments
 (0)