Skip to content

Commit 69d99fc

Browse files
LayoricLayoric
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into eclipse-to-maven
2 parents 7b482ab + 920d7fd commit 69d99fc

File tree

30 files changed

+227
-267
lines changed

30 files changed

+227
-267
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,4 @@ src/ServiceStackEclipse/**/.idea
4040
src/ServiceStackEclipse/**/target
4141
src/ServiceStackEclipse/**/.settings
4242

43+
src/AndroidClient/client/pom.xml

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

Lines changed: 3 additions & 2 deletions
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: 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: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
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" />
87
</configuration>
98
</facet>
109
</component>

‎src/AndroidClient/android/android.iml‎

Lines changed: 7 additions & 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$/.." external.system.id="GRADLE" external.system.module.group="net.servicestack" external.system.module.version="1.0.10" 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>
@@ -12,9 +12,8 @@
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="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
1615
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
17-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
16+
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
1817
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
1918
<option name="ALLOW_USER_CONFIGURATION" value="false" />
2019
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -83,14 +82,17 @@
8382
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8483
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
8584
<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" />
8688
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8789
</content>
8890
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
8991
<orderEntry type="sourceFolder" forTests="false" />
90-
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
9192
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
92-
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
93+
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
9394
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
95+
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
9496
<orderEntry type="module" module-name="client" exported="" />
9597
</component>
9698
</module>

‎src/AndroidClient/android/build.gradle‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
22
apply plugin: 'com.github.dcendents.android-maven'
33
apply plugin: 'com.jfrog.bintray'
44

5-
version = "1.0.19"
5+
version = "1.0.20"
66

77
android {
88
compileSdkVersion 21
@@ -20,6 +20,13 @@ android {
2020
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2121
}
2222
}
23+
packagingOptions {
24+
exclude 'META-INF/DEPENDENCIES'
25+
exclude 'META-INF/NOTICE'
26+
exclude 'META-INF/NOTICE.txt'
27+
exclude 'META-INF/LICENSE'
28+
exclude 'META-INF/LICENSE.txt'
29+
}
2330
}
2431

2532
Properties properties = System.properties;
@@ -42,7 +49,7 @@ bintray {
4249
websiteUrl = siteUrl
4350
vcsUrl = gitUrl
4451
licenses = ["BSD 3-Clause"]
45-
publish = true
52+
publish = properties.getProperty('bintray.publish') == 'true'
4653
userOrg = 'servicestack'
4754
}
4855
}
@@ -92,7 +99,11 @@ install {
9299

93100

94101
dependencies {
95-
compile fileTree(dir: 'libs', include: ['*.jar'])
96102
compile 'com.android.support:appcompat-v7:21.0.3'
97103
compile project(':client')
104+
compile fileTree(dir: 'libs', include: '*.jar')
105+
testCompile 'junit:junit:4.11'
106+
testCompile 'org.mockito:mockito-core:1.9.5'
98107
}
108+
109+
configurations.compile.exclude group: 'org.apache.httpcomponents'

‎src/AndroidClient/android/src/androidTest/java/net/servicestack/android/TestServiceTestsAsync.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public void complete() {
187187

188188
ResponseStatus status = thrownError[0].getResponseStatus();
189189

190-
assertEquals("not here", status.getErrorCode());
190+
assertEquals("NotFound", status.getErrorCode());
191191
assertEquals("not here", status.getMessage());
192192
assertNotNull(status.getStackTrace());
193193
}

‎src/AndroidClient/android/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
<application android:allowBackup="true" android:label="@string/app_name">
55

66
</application>
7+
<uses-permission android:name="android.permission.INTERNET" />
78

89
</manifest>

‎src/AndroidClient/app/app.iml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
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="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
1615
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
17-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
16+
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
1817
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
1918
<option name="ALLOW_USER_CONFIGURATION" value="false" />
2019
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -86,10 +85,11 @@
8685
</content>
8786
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
8887
<orderEntry type="sourceFolder" forTests="false" />
89-
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
9088
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
91-
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
89+
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
9290
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
91+
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
9392
<orderEntry type="module" module-name="android" exported="" />
93+
<orderEntry type="module" module-name="client" exported="" />
9494
</component>
9595
</module>

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?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">
3+
<component name="FacetManager">
4+
<facet type="android-gradle" name="Android-Gradle">
5+
<configuration>
6+
<option name="GRADLE_PROJECT_PATH" value=":client-new" />
7+
</configuration>
8+
</facet>
9+
</component>
10+
<component name="NewModuleRootManager" inherit-compiler-output="true">
11+
<exclude-output />
12+
<orderEntry type="inheritedJdk" />
13+
<orderEntry type="sourceFolder" forTests="false" />
14+
</component>
15+
</module>

0 commit comments

Comments
 (0)