Skip to content

Converted client library to JAR without generating AAR #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Layoric merged 3 commits into from
Oct 11, 2015
Merged

Converted client library to JAR without generating AAR #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d92911
Convert client to jar
Layoric Oct 10, 2015
fa090d8
Fix tests
Layoric Oct 10, 2015
2d8305d
Fix version for client.
Layoric Oct 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ src/ServiceStackEclipse/**/.idea
src/ServiceStackEclipse/**/target
src/ServiceStackEclipse/**/.settings

src/AndroidClient/client/pom.xml
5 changes: 3 additions & 2 deletions src/AndroidClient/.idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/AndroidClient/.idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/AndroidClient/AndroidClient.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
</component>
Expand Down
12 changes: 7 additions & 5 deletions src/AndroidClient/android/android.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<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">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
Expand All @@ -12,9 +12,8 @@
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
Expand Down Expand Up @@ -83,14 +82,17 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
<orderEntry type="module" module-name="client" exported="" />
</component>
</module>
17 changes: 14 additions & 3 deletions src/AndroidClient/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.jfrog.bintray'

version = "1.0.19"
version = "1.0.20"

android {
compileSdkVersion 21
Expand All @@ -20,6 +20,13 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
packagingOptions {
exclude 'META-INF/DEPENDENCIES'
exclude 'META-INF/NOTICE'
exclude 'META-INF/NOTICE.txt'
exclude 'META-INF/LICENSE'
exclude 'META-INF/LICENSE.txt'
}
}

Properties properties = System.properties;
Expand All @@ -42,7 +49,7 @@ bintray {
websiteUrl = siteUrl
vcsUrl = gitUrl
licenses = ["BSD 3-Clause"]
publish = true
publish = properties.getProperty('bintray.publish') == 'true'
userOrg = 'servicestack'
}
}
Expand Down Expand Up @@ -92,7 +99,11 @@ install {


dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:21.0.3'
compile project(':client')
compile fileTree(dir: 'libs', include: '*.jar')
testCompile 'junit:junit:4.11'
testCompile 'org.mockito:mockito-core:1.9.5'
}

configurations.compile.exclude group: 'org.apache.httpcomponents'
2 changes: 1 addition & 1 deletion ...idClient/android/src/androidTest/java/net/servicestack/android/TestServiceTestsAsync.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public void complete() {

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

assertEquals("not here", status.getErrorCode());
assertEquals("NotFound", status.getErrorCode());
Copy link
Copy Markdown
Member Author

@Layoric Layoric Oct 10, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed to "NotFound" which looks correct to me. @mythz could you review?

Copy link
Copy Markdown
Member

@mythz mythz Oct 10, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah this was a recent change to use the StatusCode as the ErrorCode instead of re-using the ErrorMessage.

assertEquals("not here", status.getMessage());
assertNotNull(status.getStackTrace());
}
Expand Down
1 change: 1 addition & 0 deletions src/AndroidClient/android/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
<application android:allowBackup="true" android:label="@string/app_name">

</application>
<uses-permission android:name="android.permission.INTERNET" />

</manifest>
8 changes: 4 additions & 4 deletions src/AndroidClient/app/app.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
Expand Down Expand Up @@ -86,10 +85,11 @@
</content>
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
<orderEntry type="module" module-name="android" exported="" />
<orderEntry type="module" module-name="client" exported="" />
</component>
</module>
15 changes: 15 additions & 0 deletions src/AndroidClient/client-new/client-new.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":client-new" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
149 changes: 56 additions & 93 deletions src/AndroidClient/client/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,67 @@
apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.jfrog.bintray'
apply plugin: 'java'
apply plugin: 'idea'
apply plugin: 'maven'

version = "1.0.19"
group = "net.servicestack" // Maven Group ID for the artifact
String packageId = "client"

android {
compileSdkVersion 21
buildToolsVersion "21.1.2"

defaultConfig {
minSdkVersion 15
targetSdkVersion 21
versionCode 1
versionName version
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}

dependencies {
compile 'com.google.code.gson:gson:2.3.1'
compile 'org.apache.httpcomponents:httpmime:4.2.3'
testCompile 'junit:junit:4.11'
testCompile 'org.mockito:mockito-core:1.9.5'
}

version = "1.0.20"
group = "net.servicestack" // Maven Group ID for the artifact
String packageId = "client"

String siteUrl = 'https://github.com/ServiceStack/ServiceStack.Java' // Homepage URL of the library
String gitUrl = 'https://github.com/ServiceStack/ServiceStack.Java.git' // Git repository URL

Properties properties = System.properties;
if(properties.getProperty("bintray.user", null) == null) {
properties.load(project.file('./local.properties').newDataInputStream())
}

task createPom {
pom {
project {
packaging 'jar'

// Add your description here
name 'ServiceStack.Client'
description 'A client library to call your ServiceStack webservices.'
url siteUrl

// Set your license
licenses {
license {
name 'The BSD 3-Clause License'
url 'https://raw.githubusercontent.com/ServiceStack/Assets/master/docs/license/LICENSE-BSD3.txt'
}
}

def siteUrl = 'https://github.com/ServiceStack/ServiceStack.Java' // Homepage URL of the library
def gitUrl = 'https://github.com/ServiceStack/ServiceStack.Java.git' // Git repository URL
developers {
developer {
id 'mythz'
name 'Demis Bellot'
email 'team@servicestack.net'
}
developer {
id 'layoric'
name 'Darren Reid'
email 'team@servicestack.net'
}
}
scm {
connection 'https://github.com/ServiceStack/ServiceStack.Java'
developerConnection 'https://github.com/ServiceStack/ServiceStack.Java'
url 'https://github.com/ServiceStack/ServiceStack.Java'
}
}
}.writeTo("pom.xml")
}
build.dependsOn createPom

bintray {
user = properties.getProperty("bintray.user")
Expand All @@ -49,84 +75,21 @@ bintray {
websiteUrl = siteUrl
vcsUrl = gitUrl
licenses = ["BSD 3-Clause"]
publish = true
publish = properties.getProperty('bintray.publish') == 'true'
}
}

task makeJar(type: Copy) {
from('build/intermediates/bundles/release/')
into('build/libs/')
include('classes.jar')
rename ('classes.jar', packageId + '-' + version + '.jar')
}

install {
repositories.mavenInstaller {
// This generates POM.xml with proper parameters
pom {
project {
packaging 'jar'

// Add your description here
name 'ServiceStack.Client'
description 'A client library to call your ServiceStack webservices.'
url siteUrl

// Set your license
licenses {
license {
name 'The BSD 3-Clause License'
url 'https://raw.githubusercontent.com/ServiceStack/Assets/master/docs/license/LICENSE-BSD3.txt'
}
}

developers {
developer {
id 'mythz'
name 'Demis Bellot'
email 'team@servicestack.net'
}
developer {
id 'layoric'
name 'Darren Reid'
email 'team@servicestack.net'
}
}
scm {
connection 'https://github.com/ServiceStack/ServiceStack.Java'
developerConnection 'https://github.com/ServiceStack/ServiceStack.Java'
url 'https://github.com/ServiceStack/ServiceStack.Java'
}
}
}
}
}.dependsOn makeJar

task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
}

task javadoc(type: Javadoc) {
source = android.sourceSets.main.java.srcDirs
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
from sourceSets.main.allSource
}

task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
from javadoc.destinationDir
}

task clearJar(type: Delete) {
delete ("build/libs/" + packageId + '-' + version + '.jar')
}

artifacts {
archives javadocJar
archives sourcesJar
archives file: new File(project.projectDir,'build/libs/' + packageId + '-' + version + '.jar'), name: packageId, type: 'jar'
}

task findConventions << {
println project.getConvention()
}
archives javadocJar
}
Loading