Skip to content

Commit 563d449

Browse files
LayoricLayoric
committed
Fixed package name for tests.
Updated build.gradle for client to automatically produce maven central ready binaries that can auto sync from bintray. Incremented versions required due to published versions on maven central. ServiceStackIDEA plugin to be updated to match versions. net.servicestack:android to also be updated to have same versions.
1 parent de806bf commit 563d449

19 files changed

+272
-136
lines changed

‎src/AndroidClient/.idea/uiDesigner.xml‎

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

‎src/AndroidClient/android/android.iml‎

Lines changed: 6 additions & 1 deletion
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.0" 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.1" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -62,6 +62,7 @@
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" />
6566
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6667
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6768
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -81,7 +82,11 @@
8182
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8283
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8384
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
8486
<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" />
8590
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8691
</content>
8792
<orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />

‎src/AndroidClient/client/build.gradle‎

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

5-
version = "1.0.1"
5+
version = "1.0.5"
6+
group = "net.servicestack" // Maven Group ID for the artifact
7+
String packageId = "client"
68

79
android {
810
compileSdkVersion 21
@@ -27,7 +29,6 @@ properties.load(project.file('./local.properties').newDataInputStream())
2729

2830
def siteUrl = 'https://github.com/ServiceStack/ServiceStack.Java' // Homepage URL of the library
2931
def gitUrl = 'https://github.com/ServiceStack/ServiceStack.Java.git' // Git repository URL
30-
group = "net.servicestack" // Maven Group ID for the artifact
3132

3233
bintray {
3334
user = properties.getProperty("bintray.user")
@@ -45,12 +46,19 @@ bintray {
4546
}
4647
}
4748

49+
task makeJar(type: Copy) {
50+
from('build/intermediates/bundles/release/')
51+
into('build/libs/')
52+
include('classes.jar')
53+
rename ('classes.jar', packageId + '-' + version + '.jar')
54+
}
55+
4856
install {
4957
repositories.mavenInstaller {
5058
// This generates POM.xml with proper parameters
5159
pom {
5260
project {
53-
packaging 'aar'
61+
packaging 'jar'
5462

5563
// Add your description here
5664
name 'ServiceStack.Client'
@@ -85,11 +93,39 @@ install {
8593
}
8694
}
8795
}
88-
}
89-
96+
}.dependsOn makeJar
9097

9198
dependencies {
9299
compile fileTree(dir: 'libs', include: ['*.jar'])
93100
compile 'com.android.support:appcompat-v7:21.0.3'
94101
compile 'com.google.code.gson:gson:2.3.1'
95102
}
103+
104+
task sourcesJar(type: Jar) {
105+
from android.sourceSets.main.java.srcDirs
106+
classifier = 'sources'
107+
}
108+
109+
task javadoc(type: Javadoc) {
110+
source = android.sourceSets.main.java.srcDirs
111+
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
112+
}
113+
114+
task javadocJar(type: Jar, dependsOn: javadoc) {
115+
classifier = 'javadoc'
116+
from javadoc.destinationDir
117+
}
118+
119+
task clearJar(type: Delete) {
120+
delete ("build/libs/" + packageId + '-' + version + '.jar')
121+
}
122+
123+
artifacts {
124+
archives javadocJar
125+
archives sourcesJar
126+
archives file: new File('build/libs/' + packageId + '-' + version + '.jar'), name: packageId, type: 'jar'
127+
}
128+
129+
task findConventions << {
130+
println project.getConvention()
131+
}

‎src/AndroidClient/client/client.iml‎

Lines changed: 1 addition & 1 deletion
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.0" 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.5" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>

src/AndroidClient/client/src/androidTest/java/servicestack/net/client/tests/AndroidServiceClientTests.java renamed to src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/AndroidServiceClientTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package servicestack.net.client.tests;
1+
package net.servicestack.client.tests;
22

33
import android.app.Application;
44
import android.test.ApplicationTestCase;

src/AndroidClient/client/src/androidTest/java/servicestack/net/client/tests/ApplicationTest.java renamed to src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/ApplicationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package servicestack.net.client.tests;
1+
package net.servicestack.client.tests;
22

33
import android.app.Application;
44
import android.test.ApplicationTestCase;

src/AndroidClient/client/src/androidTest/java/servicestack/net/client/tests/GsonTests.java renamed to src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/GsonTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2015 ServiceStack LLC. All rights reserved.
22

3-
package servicestack.net.client.tests;
3+
package net.servicestack.client.tests;
44

55
import android.app.Application;
66
import android.test.ApplicationTestCase;
@@ -10,7 +10,7 @@
1010

1111
import java.util.ArrayList;
1212
import java.util.List;
13-
import servicestack.net.client.tests.dto.*;
13+
import net.servicestack.client.tests.dto.*;
1414

1515
public class GsonTests extends ApplicationTestCase<Application> {
1616

src/AndroidClient/client/src/androidTest/java/servicestack/net/client/tests/JsonServiceClientTests.java renamed to src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/JsonServiceClientTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Copyright (c) 2015 ServiceStack LLC. All rights reserved.
22

3-
package servicestack.net.client.tests;
3+
package net.servicestack.client.tests;
44

55
import android.app.Application;
66
import android.test.ApplicationTestCase;
77

88
import net.servicestack.client.JsonServiceClient;
99

10-
import servicestack.net.client.tests.dto.*;
10+
import net.servicestack.client.tests.dto.*;
1111

1212
public class JsonServiceClientTests extends ApplicationTestCase<Application> {
1313

src/AndroidClient/client/src/androidTest/java/servicestack/net/client/tests/JsonTests.java renamed to src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/JsonTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2015 ServiceStack LLC. All rights reserved.
22

3-
package servicestack.net.client.tests;
3+
package net.servicestack.client.tests;
44

55
import android.app.Application;
66
import android.test.ApplicationTestCase;

src/AndroidClient/client/src/androidTest/java/servicestack/net/client/tests/TechStacksServiceTests.java renamed to src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/TechStacksServiceTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package servicestack.net.client.tests;
1+
package net.servicestack.client.tests;
22

33
import android.app.Application;
44
import android.test.ApplicationTestCase;
@@ -10,7 +10,6 @@
1010
import java.io.IOException;
1111
import java.io.InputStream;
1212
import java.util.ArrayList;
13-
import java.util.HashMap;
1413

1514
import io.techstacks.dto.*;
1615

0 commit comments

Comments
 (0)