Skip to content

Commit 6558a80

Browse files
LayoricLayoric
committed
Split client into client and android so they can be released as individual libraries.
1 parent cf4329a commit 6558a80

File tree

16 files changed

+266
-6
lines changed

16 files changed

+266
-6
lines changed

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

Lines changed: 1 addition & 0 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: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/AndroidClient/.idea/vcs.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/AndroidClient/android/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

‎src/AndroidClient/android/android.iml‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module 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="0.0.2" 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=":android" />
7+
</configuration>
8+
</facet>
9+
<facet type="android" name="Android">
10+
<configuration>
11+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12+
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
13+
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
14+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16+
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
17+
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
18+
<option name="ALLOW_USER_CONFIGURATION" value="false" />
19+
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
20+
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
21+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
22+
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
23+
<option name="LIBRARY_PROJECT" value="true" />
24+
</configuration>
25+
</facet>
26+
</component>
27+
<component name="NewModuleRootManager" inherit-compiler-output="false">
28+
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
29+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
30+
<exclude-output />
31+
<content url="file://$MODULE_DIR$">
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
46+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
65+
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
66+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
67+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
69+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
70+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
71+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
72+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
73+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
77+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
78+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
86+
<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" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
91+
</content>
92+
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
93+
<orderEntry type="sourceFolder" forTests="false" />
94+
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
95+
<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" />
97+
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
98+
<orderEntry type="module" module-name="client" exported="" />
99+
</component>
100+
</module>
101+

‎src/AndroidClient/android/build.gradle‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
apply plugin: 'com.android.library'
2+
apply plugin: 'com.github.dcendents.android-maven'
3+
apply plugin: 'com.jfrog.bintray'
4+
5+
version = "0.0.2"
6+
7+
android {
8+
compileSdkVersion 21
9+
buildToolsVersion "21.1.2"
10+
11+
defaultConfig {
12+
minSdkVersion 15
13+
targetSdkVersion 21
14+
versionCode 1
15+
versionName version
16+
}
17+
buildTypes {
18+
release {
19+
minifyEnabled false
20+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
21+
}
22+
}
23+
}
24+
25+
Properties properties = new Properties()
26+
properties.load(project.file('./local.properties').newDataInputStream())
27+
28+
def siteUrl = 'https://github.com/ServiceStack/ServiceStack.Java' // Homepage URL of the library
29+
def gitUrl = 'https://github.com/ServiceStack/ServiceStack.Java.git' // Git repository URL
30+
group = "net.servicestack" // Maven Group ID for the artifact
31+
32+
bintray {
33+
user = properties.getProperty("bintray.user")
34+
key = properties.getProperty("bintray.apiKey")
35+
36+
configurations = ['archives']
37+
pkg {
38+
repo = "maven"
39+
name = "ServiceStack.Android"
40+
websiteUrl = siteUrl
41+
vcsUrl = gitUrl
42+
licenses = ["Apache-2.0"]
43+
publish = true
44+
userOrg = 'servicestack'
45+
}
46+
}
47+
48+
install {
49+
repositories.mavenInstaller {
50+
// This generates POM.xml with proper parameters
51+
pom {
52+
project {
53+
packaging 'aar'
54+
55+
// Add your description here
56+
name 'A client library to call your ServiceStack webservices.'
57+
url siteUrl
58+
59+
// Set your license
60+
licenses {
61+
license {
62+
name 'The Apache Software License, Version 2.0'
63+
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
64+
}
65+
}
66+
67+
developers {
68+
developer {
69+
id 'mythz'
70+
name 'Demis Bellot'
71+
email 'team@servicestack.net'
72+
}
73+
}
74+
scm {
75+
connection 'https://github.com/ServiceStack/ServiceStack.Java'
76+
developerConnection 'https://github.com/ServiceStack/ServiceStack.Java'
77+
url 'https://github.com/ServiceStack/ServiceStack.Java'
78+
79+
}
80+
}
81+
}
82+
}
83+
}
84+
85+
86+
dependencies {
87+
compile fileTree(dir: 'libs', include: ['*.jar'])
88+
compile 'com.android.support:appcompat-v7:21.0.3'
89+
compile project(':client')
90+
}
91+
92+
task sourcesJar(type: Jar) {
93+
from android.sourceSets.main.java.srcDirs
94+
classifier = 'sources'
95+
}
96+
97+
task javadoc(type: Javadoc) {
98+
source = android.sourceSets.main.java.srcDirs
99+
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
100+
}
101+
102+
task javadocJar(type: Jar, dependsOn: javadoc) {
103+
classifier = 'javadoc'
104+
from javadoc.destinationDir
105+
}
106+
artifacts {
107+
archives javadocJar
108+
archives sourcesJar
109+
}
110+
111+
task findConventions << {
112+
println project.getConvention()
113+
}

‎src/AndroidClient/android/proguard-rules.pro‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Add project specific ProGuard rules here.
2+
# By default, the flags in this file are appended to flags specified
3+
# in C:/Users/Layoric/AppData/Local/Android/sdk/tools/proguard/proguard-android.txt
4+
# You can edit the include path and order by changing the proguardFiles
5+
# directive in build.gradle.
6+
#
7+
# For more details, see
8+
# http://developer.android.com/guide/developing/tools/proguard.html
9+
10+
# Add any project specific keep options here:
11+
12+
# If your project uses WebView with JS, uncomment the following
13+
# and specify the fully qualified class name to the JavaScript interface
14+
# class:
15+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
16+
# public *;
17+
#}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package net.servicestack.android;
2+
3+
import android.app.Application;
4+
import android.test.ApplicationTestCase;
5+
6+
/**
7+
* <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
8+
*/
9+
public class ApplicationTest extends ApplicationTestCase<Application> {
10+
public ApplicationTest() {
11+
super(Application.class);
12+
}
13+
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
package="net.servicestack.android">
3+
4+
<application android:allowBackup="true" android:label="@string/app_name">
5+
6+
</application>
7+
8+
</manifest>

src/AndroidClient/client/src/main/java/net/servicestack/android/AndroidLogProvider.java renamed to src/AndroidClient/android/src/main/java/net/servicestack/android/AndroidLogProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import net.servicestack.client.LogProvider;
66
import net.servicestack.client.LogType;
77

8+
import static net.servicestack.client.LogType.*;
9+
810
public class AndroidLogProvider extends LogProvider {
911

1012
public AndroidLogProvider(){

0 commit comments

Comments
 (0)