Skip to content

Commit 4a60fdd

Browse files
mythzmythz
committed
Upgrade to latest IDE, SDK, deps + JUnit, etc
1 parent a67539f commit 4a60fdd

31 files changed

+4118
-1254
lines changed

‎src/AndroidClient/.idea/caches/build_file_checksums.ser

0 Bytes
Binary file not shown.

‎src/AndroidClient/.idea/compiler.xml

-22
This file was deleted.

‎src/AndroidClient/.idea/copyright/profiles_settings.xml

-3
This file was deleted.

‎src/AndroidClient/.idea/encodings.xml

-6
This file was deleted.

‎src/AndroidClient/.idea/kotlinc.xml

-7
This file was deleted.

‎src/AndroidClient/.idea/misc.xml

+10-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/AndroidClient/android/android.iml

+23-20
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@
2424
</facet>
2525
</component>
2626
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
27-
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
28-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
27+
<output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
28+
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
2929
<exclude-output />
3030
<content url="file://$MODULE_DIR$">
3131
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
32-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out" isTestSource="false" generated="true" />
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3434
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debugAndroidTest/processDebugAndroidTestResources/r" isTestSource="true" generated="true" />
4040
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4141
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4242
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
@@ -86,51 +86,54 @@
8686
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
8787
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8888
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/aapt_friendly_merged_manifests" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations_typedef_file" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations_zip" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
9194
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
9295
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/extractedTypedefs" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/consumer_proguard_file" />
9597
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
9698
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
98100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
99101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_and_local_jars_jni" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-aidl" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_assets" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
103106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-classes" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packagedAssets" />
105107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
108+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
106109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
107-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/publish-proguard" />
108110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
109111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
112+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
110113
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
111114
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
115+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
112116
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
113117
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
114118
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
115119
</content>
116-
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
120+
<orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
117121
<orderEntry type="sourceFolder" forTests="false" />
118122
<orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
123+
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0@jar" level="project" />
119124
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core-3.0.2" level="project" />
120125
<orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
121126
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner-1.0.2" level="project" />
122-
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support:support-annotations:27.1.1@jar" level="project" />
123127
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
124128
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
125129
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:monitor-1.0.2" level="project" />
126130
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource-3.0.2" level="project" />
131+
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.10.0@jar" level="project" />
132+
<orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.2@jar" level="project" />
127133
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
128134
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
129135
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
130-
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.12.0@jar" level="project" />
131-
<orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.0@jar" level="project" />
132-
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.7.0@jar" level="project" />
136+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support:support-annotations:28.0.0@jar" level="project" />
133137
<orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0@jar" level="project" />
134-
<orderEntry type="library" name="Gradle: android-android-25" level="project" />
135138
</component>
136139
</module>

‎src/AndroidClient/android/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@ apply plugin: 'com.jfrog.bintray'
55
version = "1.0.34"
66

77
dependencies {
8-
implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.0'
9-
implementation 'com.squareup.okhttp3:okhttp:3.7.0'
8+
implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.2'
9+
implementation 'com.squareup.okhttp3:okhttp:3.10.0'
1010
implementation fileTree(include: '*.jar', dir: 'libs')
1111
androidTestImplementation 'junit:junit:4.12'
1212
androidTestImplementation 'com.android.support.test:runner:1.0.2'
1313
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
14-
androidTestImplementation 'com.android.support:support-annotations:27.1.1'
14+
androidTestImplementation 'com.android.support:support-annotations:28.0.0'
1515
}
1616

1717
android {
18-
compileSdkVersion 25
19-
buildToolsVersion '27.0.3'
18+
compileSdkVersion 28
19+
buildToolsVersion '28.0.3'
2020

2121
defaultConfig {
2222
minSdkVersion 15
23-
targetSdkVersion 25
23+
targetSdkVersion 28
2424
versionCode 1
2525
versionName version
2626

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

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
package net.servicestack.android;
22

3-
import android.app.Application;
4-
import android.test.ApplicationTestCase;
3+
import android.support.test.runner.AndroidJUnit4;
54

6-
import net.servicestack.android.AndroidLogProvider;
7-
import net.servicestack.android.AndroidServiceClient;
85
import net.servicestack.client.Log;
96

10-
public class AndroidServiceClientTests extends ApplicationTestCase<Application> {
7+
import org.junit.Test;
8+
import org.junit.runner.RunWith;
9+
10+
@RunWith(AndroidJUnit4.class)
11+
public class AndroidServiceClientTests {
1112
public AndroidServiceClientTests() {
12-
super(Application.class);
1313
Log.Instance = new AndroidLogProvider("ZZZ");
1414
}
1515

16-
AndroidServiceClient client = new AndroidServiceClient("http://techstacks.io");
16+
AndroidServiceClient client = new AndroidServiceClient("https://www.techstacks.io");
1717

18+
@Test
1819
public void test(){
1920

2021
}

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

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,34 @@
11
package net.servicestack.android;
22

3-
import android.app.Application;
43
import android.graphics.Bitmap;
54
import android.graphics.BitmapFactory;
6-
import android.test.ApplicationTestCase;
5+
import android.support.test.runner.AndroidJUnit4;
76

87
import com.google.gson.annotations.SerializedName;
98

109
import net.servicestack.client.AsyncResult;
1110
import net.servicestack.client.Flags;
1211
import net.servicestack.client.Utils;
1312

13+
import org.junit.Test;
14+
import org.junit.runner.RunWith;
15+
1416
import java.net.HttpURLConnection;
1517
import java.util.concurrent.CountDownLatch;
1618
import java.util.concurrent.TimeUnit;
1719

20+
import static junit.framework.TestCase.assertTrue;
21+
import static org.junit.Assert.assertEquals;
22+
1823
/**
1924
* <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
2025
*/
21-
public class ApplicationTest extends ApplicationTestCase<Application> {
22-
public ApplicationTest() {
23-
super(Application.class);
24-
}
26+
@RunWith(AndroidJUnit4.class)
27+
public class ApplicationTest {
2528

2629
AndroidServiceClient client = new AndroidServiceClient("http://techstacks.io");
2730

31+
@Test
2832
public void test_Can_download_image_bytes(){
2933
HttpURLConnection httpRes = client.get("https://servicestack.net/img/logo.png");
3034
byte[] imgBytes = Utils.readBytesToEnd(httpRes);
@@ -34,6 +38,7 @@ public void test_Can_download_image_bytes(){
3438
assertEquals(55, img.getHeight());
3539
}
3640

41+
@Test
3742
public void test_Can_download_image_bytes_Async() throws InterruptedException {
3843
final CountDownLatch signal = new CountDownLatch(1);
3944

0 commit comments

Comments
 (0)