Skip to content

Commit b8c1af6

Browse files
mythzmythz
committed
Upgrade to latest Android version
1 parent f8ee153 commit b8c1af6

File tree

25 files changed

+9268
-1029
lines changed

25 files changed

+9268
-1029
lines changed

‎src/AndroidClient/.idea/caches/build_file_checksums.ser‎

845 Bytes
Binary file not shown.

‎src/AndroidClient/.idea/codeStyles/Project.xml‎

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

‎src/AndroidClient/.idea/kotlinc.xml‎

Lines changed: 7 additions & 0 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 & 11 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 & 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="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$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="java-gradle" name="Java-Gradle">
55
<configuration>
@@ -13,8 +13,7 @@
1313
<content url="file://$MODULE_DIR$">
1414
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
1515
</content>
16-
<orderEntry type="inheritedJdk" />
16+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
1717
<orderEntry type="sourceFolder" forTests="false" />
1818
</component>
19-
</module>
20-
19+
</module>

‎src/AndroidClient/android/android.iml‎

Lines changed: 46 additions & 43 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.25" 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" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -9,7 +9,6 @@
99
<facet type="android" name="Android">
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12-
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1312
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1413
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1514
<afterSyncTasks>
@@ -20,114 +19,118 @@
2019
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
2120
<option name="RES_FOLDERS_RELATIVE_PATH" value="" />
2221
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
23-
<option name="LIBRARY_PROJECT" value="true" />
22+
<option name="PROJECT_TYPE" value="1" />
2423
</configuration>
2524
</facet>
2625
</component>
27-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
26+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
2827
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
2928
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3029
<exclude-output />
3130
<content url="file://$MODULE_DIR$">
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3232
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3434
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3736
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3837
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
3939
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
4040
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4141
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4242
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
43-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4443
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4544
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
4646
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4747
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4848
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4949
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
5050
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
51-
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5251
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
5352
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
5453
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
5554
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5655
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
5756
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
5857
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
59-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
6058
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
6159
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
6267
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
6368
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
6469
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
6570
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
6671
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6772
<sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6973
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
7074
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
78-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7975
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
8076
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
8177
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
8278
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
8379
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
84-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8580
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8681
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
87+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
88+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8789
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
8891
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8992
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
9094
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test.espresso/espresso-core/2.2.2/jars" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test.espresso/espresso-idling-resource/2.2.2/jars" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test/exposed-instrumentation-api-publish/0.5/jars" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test/rules/0.5/jars" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test/runner/0.5/jars" />
9795
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
9896
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
9999
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
100100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
101101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-aidl" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packagedAssets" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
102105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
106+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
103107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
104108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
105109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
106110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
107111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
108-
<excludeFolder url="file://$MODULE_DIR$/build/kotlin" />
109112
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
110113
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
111114
</content>
112115
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
113116
<orderEntry type="sourceFolder" forTests="false" />
114-
<orderEntry type="library" exported="" scope="TEST" name="espresso-core-2.2.2" level="project" />
115-
<orderEntry type="library" exported="" scope="TEST" name="runner-0.5" level="project" />
116-
<orderEntry type="library" exported="" scope="TEST" name="exposed-instrumentation-api-publish-0.5" level="project" />
117-
<orderEntry type="library" exported="" scope="TEST" name="espresso-idling-resource-2.2.2" level="project" />
118-
<orderEntry type="library" exported="" name="gson-2.8.0" level="project" />
119-
<orderEntry type="library" exported="" scope="TEST" name="rules-0.5" level="project" />
120-
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.3" level="project" />
121-
<orderEntry type="library" exported="" scope="TEST" name="javax.annotation-api-1.2" level="project" />
122-
<orderEntry type="library" exported="" scope="TEST" name="javax.inject-1" level="project" />
123-
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-integration-1.3" level="project" />
124-
<orderEntry type="library" exported="" name="okio-1.11.0" level="project" />
125-
<orderEntry type="library" exported="" name="okhttp-3.6.0" level="project" />
126-
<orderEntry type="library" exported="" scope="TEST" name="javawriter-2.1.1" level="project" />
127-
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
128-
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
129-
<orderEntry type="library" exported="" scope="TEST" name="jsr305-2.0.1" level="project" />
130-
<orderEntry type="library" exported="" scope="TEST" name="support-annotations-25.2.0" level="project" />
131-
<orderEntry type="library" exported="" name="android-android-25" level="project" />
117+
<orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
118+
<orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
119+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource-2.2.2" level="project" />
120+
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.6.0@jar" level="project" />
121+
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
122+
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
123+
<orderEntry type="library" scope="TEST" name="Gradle: javax.annotation:javax.annotation-api:1.2@jar" level="project" />
124+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner-0.5" level="project" />
125+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core-2.2.2" level="project" />
126+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish-0.5" level="project" />
127+
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
128+
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
129+
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
130+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:rules-0.5" level="project" />
131+
<orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.0@jar" level="project" />
132+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support:support-annotations:25.2.0@jar" level="project" />
133+
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.11.0@jar" level="project" />
134+
<orderEntry type="library" name="Gradle: android-android-25" level="project" />
132135
</component>
133136
</module>

‎src/AndroidClient/android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies {
1616

1717
android {
1818
compileSdkVersion 25
19-
buildToolsVersion "25.0.2"
19+
buildToolsVersion '27.0.3'
2020

2121
defaultConfig {
2222
minSdkVersion 15

0 commit comments

Comments
 (0)