Skip to content

Commit 0494260

Browse files
mythzmythz
committed
Upgrade to latest Android Studio 2.2, Kotlin and android-maven plugin
1 parent 9f64439 commit 0494260

File tree

18 files changed

+6380
-72
lines changed

18 files changed

+6380
-72
lines changed

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

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

‎src/AndroidClient/.idea/misc.xml‎

Lines changed: 2 additions & 3 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 & 2 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: 35 additions & 8 deletions
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.24" 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.25" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -12,10 +12,7 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1715
<afterSyncTasks>
18-
<task>generateDebugAndroidTestSources</task>
1916
<task>generateDebugSources</task>
2017
</afterSyncTasks>
2118
<option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -29,19 +26,21 @@
2926
</component>
3027
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3128
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
32-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
29+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3330
<exclude-output />
3431
<content url="file://$MODULE_DIR$">
3532
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3633
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3734
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3835
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3937
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
4038
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
4139
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
4240
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4341
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4442
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4544
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4645
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4746
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
@@ -51,42 +50,70 @@
5150
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5251
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5352
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5462
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5563
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5664
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5765
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5866
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" />
5968
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6069
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
6179
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
6280
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6381
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
6482
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6583
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6684
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6785
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
6887
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
6988
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
7089
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
7190
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
7291
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
7392
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7493
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
7595
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
7696
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
7798
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
7899
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
79100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
80102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
81103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/kotlin" />
82105
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
83106
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
84107
</content>
85108
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
86109
<orderEntry type="sourceFolder" forTests="false" />
110+
<orderEntry type="library" exported="" scope="TEST" name="objenesis-1.0" level="project" />
111+
<orderEntry type="library" exported="" name="kotlin-stdlib-1.0.4" level="project" />
87112
<orderEntry type="library" exported="" name="gson-2.4" level="project" />
88-
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
89-
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
90-
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
113+
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
114+
<orderEntry type="library" exported="" name="kotlin-runtime-1.0.4" level="project" />
115+
<orderEntry type="library" exported="" scope="TEST" name="junit-4.11" level="project" />
116+
<orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.9.5" level="project" />
117+
<orderEntry type="library" exported="" name="android-android-23" level="project" />
91118
</component>
92119
</module>

‎src/AndroidClient/android/build.gradle‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
apply plugin: 'com.android.library'
2+
apply plugin: 'kotlin-android'
23
apply plugin: 'com.github.dcendents.android-maven'
34
apply plugin: 'com.jfrog.bintray'
45

@@ -10,7 +11,7 @@ android {
1011

1112
defaultConfig {
1213
minSdkVersion 11
13-
targetSdkVersion 23
14+
targetSdkVersion 24
1415
versionCode 1
1516
versionName version
1617
}
@@ -20,6 +21,9 @@ android {
2021
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2122
}
2223
}
24+
sourceSets {
25+
main.java.srcDirs += 'src/main/kotlin'
26+
}
2327
}
2428

2529
Properties properties = System.properties;
@@ -95,4 +99,8 @@ dependencies {
9599
compile fileTree(include: '*.jar', dir: 'libs')
96100
testCompile 'junit:junit:4.11'
97101
testCompile 'org.mockito:mockito-core:1.9.5'
102+
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
103+
}
104+
repositories {
105+
mavenCentral()
98106
}

‎src/AndroidClient/android/src/androidTest/java/net/servicestack/android/test/dtos.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Options:
2-
Date: 2016-08-11 04:33:47
2+
Date: 2016-09-22 21:35:21
33
Version: 4.00
44
Tip: To override a DTO option, remove "//" prefix before updating
55
BaseUrl: http://test.servicestack.net
@@ -2398,4 +2398,4 @@ public static class Channel
23982398
public Channel setValue(String value) { this.value = value; return this; }
23992399
}
24002400

2401-
}
2401+
}

0 commit comments

Comments
 (0)