diff --git a/.gitignore b/.gitignore index 2b08c709..6c8cf89b 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ src/ServiceStackEclipse/**/.idea src/ServiceStackEclipse/**/target src/ServiceStackEclipse/**/.settings +src/AndroidClient/client/pom.xml diff --git a/src/AndroidClient/.idea/gradle.xml b/src/AndroidClient/.idea/gradle.xml index 7df5e3d2..0da7cbc1 100644 --- a/src/AndroidClient/.idea/gradle.xml +++ b/src/AndroidClient/.idea/gradle.xml @@ -3,9 +3,9 @@ - - + \ No newline at end of file diff --git a/src/AndroidClient/AndroidClient.iml b/src/AndroidClient/AndroidClient.iml index 813b5b3e..d55edf77 100644 --- a/src/AndroidClient/AndroidClient.iml +++ b/src/AndroidClient/AndroidClient.iml @@ -4,7 +4,6 @@ diff --git a/src/AndroidClient/android/android.iml b/src/AndroidClient/android/android.iml index 6e558443..04997b14 100644 --- a/src/AndroidClient/android/android.iml +++ b/src/AndroidClient/android/android.iml @@ -1,5 +1,5 @@ - + @@ -12,9 +12,8 @@ \ No newline at end of file diff --git a/src/AndroidClient/android/build.gradle b/src/AndroidClient/android/build.gradle index 446c2286..8bcc12db 100644 --- a/src/AndroidClient/android/build.gradle +++ b/src/AndroidClient/android/build.gradle @@ -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 @@ -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; @@ -42,7 +49,7 @@ bintray { websiteUrl = siteUrl vcsUrl = gitUrl licenses = ["BSD 3-Clause"] - publish = true + publish = properties.getProperty('bintray.publish') == 'true' userOrg = 'servicestack' } } @@ -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' diff --git a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/TestServiceTestsAsync.java b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/TestServiceTestsAsync.java index 333187ab..13988747 100644 --- a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/TestServiceTestsAsync.java +++ b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/TestServiceTestsAsync.java @@ -187,7 +187,7 @@ public void complete() { ResponseStatus status = thrownError[0].getResponseStatus(); - assertEquals("not here", status.getErrorCode()); + assertEquals("NotFound", status.getErrorCode()); assertEquals("not here", status.getMessage()); assertNotNull(status.getStackTrace()); } diff --git a/src/AndroidClient/android/src/main/AndroidManifest.xml b/src/AndroidClient/android/src/main/AndroidManifest.xml index 0a739c08..d9314e9a 100644 --- a/src/AndroidClient/android/src/main/AndroidManifest.xml +++ b/src/AndroidClient/android/src/main/AndroidManifest.xml @@ -4,5 +4,6 @@ + diff --git a/src/AndroidClient/app/app.iml b/src/AndroidClient/app/app.iml index 19a1a1db..d353442c 100644 --- a/src/AndroidClient/app/app.iml +++ b/src/AndroidClient/app/app.iml @@ -12,9 +12,8 @@ \ No newline at end of file diff --git a/src/AndroidClient/client-new/client-new.iml b/src/AndroidClient/client-new/client-new.iml new file mode 100644 index 00000000..11a525dd --- /dev/null +++ b/src/AndroidClient/client-new/client-new.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/AndroidClient/client/build.gradle b/src/AndroidClient/client/build.gradle index cb89d827..fee08a76 100644 --- a/src/AndroidClient/client/build.gradle +++ b/src/AndroidClient/client/build.gradle @@ -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") @@ -49,67 +75,13 @@ 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) { @@ -117,16 +89,7 @@ task javadocJar(type: Jar, dependsOn: 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 +} \ No newline at end of file diff --git a/src/AndroidClient/client/client.iml b/src/AndroidClient/client/client.iml index 9d35ea69..d4421402 100644 --- a/src/AndroidClient/client/client.iml +++ b/src/AndroidClient/client/client.iml @@ -1,92 +1,37 @@ - + - + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/src/AndroidClient/client/pom.xml b/src/AndroidClient/client/pom.xml new file mode 100644 index 00000000..a7d85e44 --- /dev/null +++ b/src/AndroidClient/client/pom.xml @@ -0,0 +1,60 @@ + + + 4.0.0 + net.servicestack + client + 1.0.20 + ServiceStack.Client + A client library to call your ServiceStack webservices. + https://github.com/ServiceStack/ServiceStack.Java + + + The BSD 3-Clause License + https://raw.githubusercontent.com/ServiceStack/Assets/master/docs/license/LICENSE-BSD3.txt + + + + + mythz + Demis Bellot + team@servicestack.net + + + layoric + Darren Reid + team@servicestack.net + + + + https://github.com/ServiceStack/ServiceStack.Java + https://github.com/ServiceStack/ServiceStack.Java + https://github.com/ServiceStack/ServiceStack.Java + + + + com.google.code.gson + gson + 2.3.1 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.apache.httpcomponents + httpmime + 4.2.3 + compile + + + junit + junit + 4.11 + test + + + diff --git a/src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/ApplicationTest.java b/src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/ApplicationTest.java deleted file mode 100644 index 5e90429f..00000000 --- a/src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package net.servicestack.client.tests; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file diff --git a/src/AndroidClient/client/src/androidTest/java/io/techstacks/dto.java b/src/AndroidClient/client/src/test/java/io/techstacks/dto.java similarity index 100% rename from src/AndroidClient/client/src/androidTest/java/io/techstacks/dto.java rename to src/AndroidClient/client/src/test/java/io/techstacks/dto.java diff --git a/src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/GsonTests.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/tests/GsonTests.java similarity index 88% rename from src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/GsonTests.java rename to src/AndroidClient/client/src/test/java/net/servicestack/client/tests/GsonTests.java index 89ebda47..db582b13 100644 --- a/src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/GsonTests.java +++ b/src/AndroidClient/client/src/test/java/net/servicestack/client/tests/GsonTests.java @@ -2,24 +2,22 @@ package net.servicestack.client.tests; -import android.app.Application; -import android.test.ApplicationTestCase; -import android.util.Log; - import com.google.gson.Gson; import java.util.ArrayList; import java.util.List; + +import junit.framework.TestCase; import net.servicestack.client.tests.dto.*; -public class GsonTests extends ApplicationTestCase { +public class GsonTests extends TestCase { public GsonTests() { - super(Application.class); + } public void test_Gson() { - Log.i("LOG", "=========== HELLO JSON ============"); + System.out.println("=========== HELLO JSON ============"); String json = "{\n" + " \"posts\": [\n" + @@ -43,7 +41,7 @@ public void test_Gson() { Gson gson = new Gson(); PostList list = gson.fromJson(json, PostList.class); - Log.i("LOG", "JSON: " + gson.toJson(list)); + System.out.println("JSON: " + gson.toJson(list)); } public class PostList { @@ -111,7 +109,7 @@ public void test_Can_serialize_nested_classes() { list.add(o); Gson gson = new Gson(); - Log.i("LOG", "JSON LIST: " + gson.toJson(list)); + System.out.println("JSON LIST: " + gson.toJson(list)); Class a = NestedPojo.class; } diff --git a/src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/JsonServiceClientTests.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/tests/JsonServiceClientTests.java similarity index 88% rename from src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/JsonServiceClientTests.java rename to src/AndroidClient/client/src/test/java/net/servicestack/client/tests/JsonServiceClientTests.java index 12bffaf5..64baea79 100644 --- a/src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/JsonServiceClientTests.java +++ b/src/AndroidClient/client/src/test/java/net/servicestack/client/tests/JsonServiceClientTests.java @@ -2,9 +2,7 @@ package net.servicestack.client.tests; -import android.app.Application; -import android.test.ApplicationTestCase; - +import junit.framework.TestCase; import net.servicestack.client.ConnectionFilter; import net.servicestack.client.JsonServiceClient; @@ -12,10 +10,10 @@ import java.net.HttpURLConnection; -public class JsonServiceClientTests extends ApplicationTestCase { +public class JsonServiceClientTests extends TestCase { public JsonServiceClientTests() { - super(Application.class); + } //10.0.2.2 = loopback //http://developer.android.com/tools/devices/emulator.html diff --git a/src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/JsonTests.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/tests/JsonTests.java similarity index 92% rename from src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/JsonTests.java rename to src/AndroidClient/client/src/test/java/net/servicestack/client/tests/JsonTests.java index 4f9c53f3..631c8fd5 100644 --- a/src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/JsonTests.java +++ b/src/AndroidClient/client/src/test/java/net/servicestack/client/tests/JsonTests.java @@ -2,14 +2,12 @@ package net.servicestack.client.tests; -import android.app.Application; -import android.test.ApplicationTestCase; - +import junit.framework.TestCase; import net.servicestack.client.TimeSpan; -public class JsonTests extends ApplicationTestCase { +public class JsonTests extends TestCase { public JsonTests() { - super(Application.class); + } public void test_Does_serialize_TimeSpan(){ diff --git a/src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/TechStacksServiceTests.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/tests/TechStacksServiceTests.java similarity index 97% rename from src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/TechStacksServiceTests.java rename to src/AndroidClient/client/src/test/java/net/servicestack/client/tests/TechStacksServiceTests.java index 42601c94..da63b50e 100644 --- a/src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/TechStacksServiceTests.java +++ b/src/AndroidClient/client/src/test/java/net/servicestack/client/tests/TechStacksServiceTests.java @@ -1,9 +1,6 @@ package net.servicestack.client.tests; -import android.app.Application; -import android.test.ApplicationTestCase; -import android.util.Log; - +import junit.framework.TestCase; import net.servicestack.client.JsonServiceClient; import net.servicestack.client.Utils; @@ -13,9 +10,9 @@ import io.techstacks.dto.*; -public class TechStacksServiceTests extends ApplicationTestCase { +public class TechStacksServiceTests extends TestCase { public TechStacksServiceTests() { - super(Application.class); + } JsonServiceClient client = new JsonServiceClient("http://techstacks.io"); diff --git a/src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/TestInterfaceMarkerTests.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/tests/TestInterfaceMarkerTests.java similarity index 91% rename from src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/TestInterfaceMarkerTests.java rename to src/AndroidClient/client/src/test/java/net/servicestack/client/tests/TestInterfaceMarkerTests.java index 09324ac1..4ea03757 100644 --- a/src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/TestInterfaceMarkerTests.java +++ b/src/AndroidClient/client/src/test/java/net/servicestack/client/tests/TestInterfaceMarkerTests.java @@ -1,8 +1,6 @@ package net.servicestack.client.tests; -import android.app.Application; -import android.test.ApplicationTestCase; - +import junit.framework.TestCase; import net.servicestack.client.HttpMethods; import net.servicestack.client.JsonServiceClient; @@ -11,9 +9,9 @@ /** * Created by mythz on 9/11/2015. */ -public class TestInterfaceMarkerTests extends ApplicationTestCase { +public class TestInterfaceMarkerTests extends TestCase { public TestInterfaceMarkerTests() { - super(Application.class); + } JsonServiceClient client = new JsonServiceClient("http://test.servicestack.net"); diff --git a/src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/TestServiceTests.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/tests/TestServiceTests.java similarity index 93% rename from src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/TestServiceTests.java rename to src/AndroidClient/client/src/test/java/net/servicestack/client/tests/TestServiceTests.java index f3fa0f00..5c545fb7 100644 --- a/src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/TestServiceTests.java +++ b/src/AndroidClient/client/src/test/java/net/servicestack/client/tests/TestServiceTests.java @@ -2,40 +2,18 @@ package net.servicestack.client.tests; -import android.app.Application; -import android.test.ApplicationTestCase; -import android.text.TextUtils; - -import net.servicestack.client.ConnectionFilter; -import net.servicestack.client.ExceptionFilter; -import net.servicestack.client.HttpMethods; -import net.servicestack.client.JsonServiceClient; -import net.servicestack.client.Log; -import net.servicestack.client.MimeTypes; -import net.servicestack.client.ResponseStatus; -import net.servicestack.client.TimeSpan; -import net.servicestack.client.Utils; -import net.servicestack.client.WebServiceException; - +import io.techstacks.dto; +import junit.framework.TestCase; +import net.servicestack.client.*; import net.servicestack.client.tests.testdtos.*; -import java.io.UnsupportedEncodingException; import java.math.BigDecimal; import java.math.BigInteger; import java.net.HttpURLConnection; -import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.UUID; - -import io.techstacks.*; -import io.techstacks.dto; +import java.util.*; -public class TestServiceTests extends ApplicationTestCase { +public class TestServiceTests extends TestCase { public TestServiceTests() { - super(Application.class); //Log.Instance = new AndroidLogProvider("ZZZ"); } @@ -86,7 +64,7 @@ public void test_does_fire_Request_and_Response_Filters(){ assertEquals("Hello, World!", response.getResult()); - String results = TextUtils.join(", ", events); + String results = strJoin(", ", events); assertEquals("RequestFilter, GlobalRequestFilter, ResponseFilter, GlobalResponseFilter", results); } @@ -172,7 +150,7 @@ public void exec(HttpURLConnection res, Exception ex) { ResponseStatus status = thrownError.getResponseStatus(); - assertEquals("not here", status.getErrorCode()); + assertEquals("NotFound", status.getErrorCode()); assertEquals("not here", status.getMessage()); assertNotNull(status.getStackTrace()); } @@ -405,4 +383,14 @@ public static void assertPocoEquals(Poco expected, Poco actual){ assertNotNull(actual); assertEquals(actual.getName(), expected.getName()); } + + public static String strJoin(String sSep,ArrayList aArr) { + StringBuilder sbStr = new StringBuilder(); + for (int i = 0, il = aArr.size(); i < il; i++) { + if (i > 0) + sbStr.append(sSep); + sbStr.append(aArr.get(i)); + } + return sbStr.toString(); + } } diff --git a/src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/UtilsTests.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/tests/UtilsTests.java similarity index 87% rename from src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/UtilsTests.java rename to src/AndroidClient/client/src/test/java/net/servicestack/client/tests/UtilsTests.java index 359e4e55..eb866413 100644 --- a/src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/UtilsTests.java +++ b/src/AndroidClient/client/src/test/java/net/servicestack/client/tests/UtilsTests.java @@ -1,24 +1,22 @@ package net.servicestack.client.tests; -import android.app.Application; -import android.test.ApplicationTestCase; - +import junit.framework.TestCase; import net.servicestack.client.Utils; import java.text.SimpleDateFormat; import java.util.Date; import java.util.UUID; -public class UtilsTests extends ApplicationTestCase { +public class UtilsTests extends TestCase { public UtilsTests() { - super(Application.class); + } public void test_Can_parse_Date_with_SubMillis(){ Date date = Utils.parseDate("2015-03-27T03:41:41.987375+00:00"); SimpleDateFormat dateFmt = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS"); - assertEquals("2015-03-26T20:41:41.983", dateFmt.format(date)); + assertEquals("2015-03-27T03:41:41.987", dateFmt.format(date)); } public void test_Can_stripSubMillis(){ diff --git a/src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/dto.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/tests/dto.java similarity index 100% rename from src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/dto.java rename to src/AndroidClient/client/src/test/java/net/servicestack/client/tests/dto.java diff --git a/src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/testdtos.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/tests/testdtos.java similarity index 100% rename from src/AndroidClient/client/src/androidTest/java/net/servicestack/client/tests/testdtos.java rename to src/AndroidClient/client/src/test/java/net/servicestack/client/tests/testdtos.java diff --git a/src/AndroidClient/client/src/androidTest/java/test/dto.java b/src/AndroidClient/client/src/test/java/test/dto.java similarity index 100% rename from src/AndroidClient/client/src/androidTest/java/test/dto.java rename to src/AndroidClient/client/src/test/java/test/dto.java diff --git a/src/AndroidClient/client/src/androidTest/resources/overview.json b/src/AndroidClient/client/src/test/resources/overview.json similarity index 100% rename from src/AndroidClient/client/src/androidTest/resources/overview.json rename to src/AndroidClient/client/src/test/resources/overview.json diff --git a/src/AndroidClient/gradle/wrapper/gradle-wrapper.jar b/src/AndroidClient/gradle/wrapper/gradle-wrapper.jar index 8c0fb64a..c97a8bdb 100644 Binary files a/src/AndroidClient/gradle/wrapper/gradle-wrapper.jar and b/src/AndroidClient/gradle/wrapper/gradle-wrapper.jar differ diff --git a/src/AndroidClient/gradle/wrapper/gradle-wrapper.properties b/src/AndroidClient/gradle/wrapper/gradle-wrapper.properties index 0c71e760..1700bebc 100644 --- a/src/AndroidClient/gradle/wrapper/gradle-wrapper.properties +++ b/src/AndroidClient/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 10 15:27:10 PDT 2013 +#Sat Oct 10 14:17:01 EST 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip diff --git a/src/AndroidClient/settings.gradle b/src/AndroidClient/settings.gradle index 6c6d4fc8..3704e80d 100644 --- a/src/AndroidClient/settings.gradle +++ b/src/AndroidClient/settings.gradle @@ -1 +1,3 @@ include ':app', ':client', ':android', ':techstacks' +include 'client-new' + diff --git a/src/AndroidClient/techstacks/techstacks.iml b/src/AndroidClient/techstacks/techstacks.iml index 2598cda6..9b26839e 100644 --- a/src/AndroidClient/techstacks/techstacks.iml +++ b/src/AndroidClient/techstacks/techstacks.iml @@ -13,11 +13,8 @@ \ No newline at end of file