Skip to content

Commit b8d1f11

Browse files
LayoricLayoric
committed
Apply fix for JsonServiceClient and add unit test
Create dist folder for testing outside maven repo on bintray.
1 parent ca978da commit b8d1f11

File tree

13 files changed

+69
-38
lines changed

13 files changed

+69
-38
lines changed

‎dist/android-debug.aar‎

34.3 KB
Binary file not shown.

‎dist/android-release.aar‎

34.2 KB
Binary file not shown.

‎dist/client-debug.aar‎

43.7 KB
Binary file not shown.

‎dist/client-release.aar‎

43.6 KB
Binary file not shown.

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

Lines changed: 2 additions & 2 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
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>
@@ -15,5 +16,4 @@
1516
<orderEntry type="inheritedJdk" />
1617
<orderEntry type="sourceFolder" forTests="false" />
1718
</component>
18-
</module>
19-
19+
</module>

‎src/AndroidClient/android/android.iml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
1615
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
17+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1718
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
1819
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1920
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -82,15 +83,16 @@
8283
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8384
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
8485
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
8588
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8689
</content>
8790
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
8891
<orderEntry type="sourceFolder" forTests="false" />
89-
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
9092
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
91-
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
93+
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
9294
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
95+
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
9396
<orderEntry type="module" module-name="client" exported="" />
9497
</component>
95-
</module>
96-
98+
</module>

‎src/AndroidClient/app/app.iml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
1615
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
17+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1718
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
1819
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1920
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -81,15 +82,16 @@
8182
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8283
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
8384
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
8487
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8588
</content>
8689
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
8790
<orderEntry type="sourceFolder" forTests="false" />
88-
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
8991
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
90-
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
92+
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
9193
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
94+
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
9295
<orderEntry type="module" module-name="android" exported="" />
9396
</component>
94-
</module>
95-
97+
</module>

‎src/AndroidClient/client/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ android {
2424
}
2525
}
2626

27+
dependencies {
28+
compile fileTree(dir: 'libs', include: ['*.jar'])
29+
compile 'com.google.code.gson:gson:2.3.1'
30+
}
31+
2732
Properties properties = new Properties()
2833
properties.load(project.file('./local.properties').newDataInputStream())
2934

@@ -95,11 +100,6 @@ install {
95100
}
96101
}.dependsOn makeJar
97102

98-
dependencies {
99-
compile fileTree(dir: 'libs', include: ['*.jar'])
100-
compile 'com.google.code.gson:gson:2.3.1'
101-
}
102-
103103
task sourcesJar(type: Jar) {
104104
from android.sourceSets.main.java.srcDirs
105105
classifier = 'sources'

‎src/AndroidClient/client/client.iml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
1615
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
17+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1718
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
1819
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1920
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -62,6 +63,7 @@
6263
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6364
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6465
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
66+
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
6567
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6668
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6769
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -81,12 +83,14 @@
8183
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8284
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8385
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
8487
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
8590
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8691
</content>
8792
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
8893
<orderEntry type="sourceFolder" forTests="false" />
8994
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
9095
</component>
91-
</module>
92-
96+
</module>

0 commit comments

Comments
 (0)