Skip to content

Commit e928b22

Browse files
LayoricLayoric
committed
ServiceStack.Client missing included dependency for org.json:org.json used for exception and JSONObject.
Added to be included in package. Changed ServiceStack.Client to distribute a jar by default which can be used referenced by ServiceStack.Android. Published ServiceStack.Client to Maven Central and JCenter. Published updated ServiceStack.Android to JCenter. Updated plugin to add version 1.0.9 as dependency.
1 parent abaebef commit e928b22

File tree

9 files changed

+89
-57
lines changed

9 files changed

+89
-57
lines changed

‎src/AndroidClient/android/android.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=":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.1" 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.9" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -62,7 +62,6 @@
6262
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6363
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6464
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
65-
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
6665
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6766
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6867
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -82,9 +81,7 @@
8281
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8382
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8483
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
8684
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
8885
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8986
</content>
9087
<orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
@@ -93,6 +90,7 @@
9390
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
9491
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
9592
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
93+
<orderEntry type="library" exported="" name="org.json-chargebee-1.0" level="project" />
9694
<orderEntry type="module" module-name="client" exported="" />
9795
</component>
9896
</module>

‎src/AndroidClient/android/build.gradle‎

Lines changed: 1 addition & 1 deletion
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.6"
5+
version = "1.0.9"
66

77
android {
88
compileSdkVersion 21

‎src/AndroidClient/app/app.iml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
9090
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
9191
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
92+
<orderEntry type="library" exported="" name="org.json-chargebee-1.0" level="project" />
9293
<orderEntry type="module" module-name="android" exported="" />
9394
</component>
9495
</module>

‎src/AndroidClient/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.1.2'
8+
classpath 'com.android.tools.build:gradle:1.1.3'
99
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
1010
classpath 'com.github.dcendents:android-maven-plugin:1.2'
1111
// NOTE: Do not place your application dependencies here; they belong

‎src/AndroidClient/client/build.gradle‎

Lines changed: 4 additions & 4 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.6"
5+
version = "1.0.9"
66
group = "net.servicestack" // Maven Group ID for the artifact
77
String packageId = "client"
88

@@ -58,7 +58,7 @@ install {
5858
// This generates POM.xml with proper parameters
5959
pom {
6060
project {
61-
packaging 'aar'
61+
packaging 'jar'
6262

6363
// Add your description here
6464
name 'ServiceStack.Client'
@@ -97,8 +97,8 @@ install {
9797

9898
dependencies {
9999
compile fileTree(dir: 'libs', include: ['*.jar'])
100-
compile 'com.android.support:appcompat-v7:21.0.3'
101100
compile 'com.google.code.gson:gson:2.3.1'
101+
compile 'org.json:org.json:chargebee-1.0'
102102
}
103103

104104
task sourcesJar(type: Jar) {
@@ -123,7 +123,7 @@ task clearJar(type: Delete) {
123123
artifacts {
124124
archives javadocJar
125125
archives sourcesJar
126-
//archives file: new File('build/libs/' + packageId + '-' + version + '.jar'), name: packageId, type: 'jar'
126+
archives file: new File('build/libs/' + packageId + '-' + version + '.jar'), name: packageId, type: 'jar'
127127
}
128128

129129
task findConventions << {

‎src/AndroidClient/client/client.iml‎

Lines changed: 2 additions & 7 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.5" 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.9" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -62,7 +62,6 @@
6262
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6363
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6464
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
65-
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
6665
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6766
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6867
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -82,16 +81,12 @@
8281
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8382
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8483
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
8684
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
8885
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8986
</content>
9087
<orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
9188
<orderEntry type="sourceFolder" forTests="false" />
92-
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
9389
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
94-
<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" />
90+
<orderEntry type="library" exported="" name="org.json-chargebee-1.0" level="project" />
9691
</component>
9792
</module>

‎src/AndroidClient/techstacks/techstacks.iml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
9090
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
9191
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
92+
<orderEntry type="library" exported="" name="org.json-chargebee-1.0" level="project" />
9293
<orderEntry type="module" module-name="android" exported="" />
9394
</component>
9495
</module>

0 commit comments

Comments
 (0)