Skip to content

Commit 7476e21

Browse files
mythzmythz
committed
Merge pull request #2 from ServiceStack/split-client
Bump build.gradle
2 parents d39862a + 51c4ddf commit 7476e21

File tree

5 files changed

+24
-27
lines changed

5 files changed

+24
-27
lines changed

‎src/AndroidClient/android/android.iml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -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,19 +81,15 @@
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" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
9085
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9186
</content>
9287
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
9388
<orderEntry type="sourceFolder" forTests="false" />
94-
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
9589
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
96-
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
90+
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
9791
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
92+
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
9893
<orderEntry type="module" module-name="client" exported="" />
9994
</component>
10095
</module>

‎src/AndroidClient/android/build.gradle‎

Lines changed: 9 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 = "0.0.2"
5+
version = "0.0.3"
66

77
android {
88
compileSdkVersion 21
@@ -39,7 +39,7 @@ bintray {
3939
name = "ServiceStack.Android"
4040
websiteUrl = siteUrl
4141
vcsUrl = gitUrl
42-
licenses = ["Apache-2.0"]
42+
licenses = ["BSD 3-Clause"]
4343
publish = true
4444
userOrg = 'servicestack'
4545
}
@@ -59,8 +59,8 @@ install {
5959
// Set your license
6060
licenses {
6161
license {
62-
name 'The Apache Software License, Version 2.0'
63-
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
62+
name 'The BSD 3-Clause License'
63+
url 'https://raw.githubusercontent.com/ServiceStack/Assets/master/docs/license/LICENSE-BSD3.txt'
6464
}
6565
}
6666

@@ -70,6 +70,11 @@ install {
7070
name 'Demis Bellot'
7171
email 'team@servicestack.net'
7272
}
73+
developer {
74+
id 'layoric'
75+
name 'Darren Reid'
76+
email 'team@servicestack.net'
77+
}
7378
}
7479
scm {
7580
connection 'https://github.com/ServiceStack/ServiceStack.Java'

‎src/AndroidClient/app/app.iml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,14 @@
8181
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8282
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
8383
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
8684
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8785
</content>
8886
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
8987
<orderEntry type="sourceFolder" forTests="false" />
90-
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
9188
<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" />
89+
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
9390
<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" />
9492
<orderEntry type="module" module-name="android" exported="" />
9593
</component>
9694
</module>

‎src/AndroidClient/client/build.gradle‎

Lines changed: 9 additions & 5 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 = "0.0.2"
5+
version = "0.0.3"
66

77
android {
88
compileSdkVersion 21
@@ -39,7 +39,7 @@ bintray {
3939
name = "ServiceStack.Client"
4040
websiteUrl = siteUrl
4141
vcsUrl = gitUrl
42-
licenses = ["Apache-2.0"]
42+
licenses = ["BSD 3-Clause"]
4343
publish = true
4444
userOrg = 'servicestack'
4545
}
@@ -59,8 +59,8 @@ install {
5959
// Set your license
6060
licenses {
6161
license {
62-
name 'The Apache Software License, Version 2.0'
63-
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
62+
name 'The BSD 3-Clause License'
63+
url 'https://raw.githubusercontent.com/ServiceStack/Assets/master/docs/license/LICENSE-BSD3.txt'
6464
}
6565
}
6666

@@ -70,12 +70,16 @@ install {
7070
name 'Demis Bellot'
7171
email 'team@servicestack.net'
7272
}
73+
developer {
74+
id 'layoric'
75+
name 'Darren Reid'
76+
email 'team@servicestack.net'
77+
}
7378
}
7479
scm {
7580
connection 'https://github.com/ServiceStack/ServiceStack.Java'
7681
developerConnection 'https://github.com/ServiceStack/ServiceStack.Java'
7782
url 'https://github.com/ServiceStack/ServiceStack.Java'
78-
7983
}
8084
}
8185
}

‎src/AndroidClient/client/client.iml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -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,19 +81,15 @@
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" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
9085
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9186
</content>
9287
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
9388
<orderEntry type="sourceFolder" forTests="false" />
94-
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
9589
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
96-
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
90+
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
9791
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
92+
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
9893
</component>
9994
</module>
10095

0 commit comments

Comments
 (0)