Skip to content

Commit c4f72e1

Browse files
mythzmythz
committed
bump remaining projs to Android v24 and Kotlin v1.0.4
1 parent 829fba0 commit c4f72e1

File tree

6 files changed

+112
-55
lines changed

6 files changed

+112
-55
lines changed

‎src/AndroidClient/android/android.iml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,6 @@
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6969
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
7070
<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" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
8072
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
8173
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -84,6 +76,14 @@
8476
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8577
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8678
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />

‎src/AndroidClient/app/app.iml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,6 @@
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6969
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
8072
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -83,6 +75,14 @@
8375
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8476
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8577
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />

‎src/AndroidClient/techstacks/build.gradle‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
33

44
android {
5-
compileSdkVersion 23
6-
buildToolsVersion "21.1.2"
5+
compileSdkVersion 24
6+
buildToolsVersion "23.0.2"
77

88
defaultConfig {
99
applicationId "servicestack.net.techstacks"
1010
minSdkVersion 19
11-
targetSdkVersion 23
11+
targetSdkVersion 24
1212
versionCode 1
1313
versionName "1.0"
1414
}
@@ -28,10 +28,9 @@ android {
2828

2929
dependencies {
3030
compile fileTree(dir: 'libs', include: ['*.jar'])
31-
compile 'com.android.support:appcompat-v7:23.1.1'
31+
compile 'com.android.support:appcompat-v7:24.2.1'
3232
compile project(':android')
3333
compile 'com.squareup.picasso:picasso:2.5.2'
34-
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
3534
}
3635
repositories {
3736
mavenCentral()

‎src/AndroidClient/techstacks/techstacks.iml‎

Lines changed: 38 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,28 +85,57 @@
8585
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.2.1/jars" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.2.1/jars" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/24.2.1/jars" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/24.2.1/jars" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/24.2.1/jars" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/24.2.1/jars" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/24.2.1/jars" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.2.1/jars" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.2.1/jars" />
9099
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
106+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
91107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
108+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
92109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
110+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
93111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
112+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
94113
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
114+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
115+
<excludeFolder url="file://$MODULE_DIR$/build/kotlin" />
95116
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
117+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
96118
</content>
97-
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
119+
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
98120
<orderEntry type="sourceFolder" forTests="false" />
99-
<orderEntry type="library" exported="" name="kotlin-stdlib-1.0.4" level="project" />
100-
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
121+
<orderEntry type="library" exported="" name="support-annotations-24.2.1" level="project" />
122+
<orderEntry type="library" exported="" name="support-v4-24.2.1" level="project" />
123+
<orderEntry type="library" exported="" name="support-compat-24.2.1" level="project" />
124+
<orderEntry type="library" exported="" name="support-media-compat-24.2.1" level="project" />
125+
<orderEntry type="library" exported="" name="animated-vector-drawable-24.2.1" level="project" />
126+
<orderEntry type="library" exported="" name="support-fragment-24.2.1" level="project" />
127+
<orderEntry type="library" exported="" name="support-core-ui-24.2.1" level="project" />
101128
<orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
102-
<orderEntry type="library" exported="" name="kotlin-runtime-1.0.4" level="project" />
103-
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
104-
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
129+
<orderEntry type="library" exported="" name="appcompat-v7-24.2.1" level="project" />
130+
<orderEntry type="library" exported="" name="support-vector-drawable-24.2.1" level="project" />
131+
<orderEntry type="library" exported="" name="support-core-utils-24.2.1" level="project" />
105132
<orderEntry type="module" module-name="android" exported="" />
106-
<orderEntry type="library" exported="" name="android-android-23" level="project" />
133+
<orderEntry type="library" exported="" name="android-android-24" level="project" />
107134
<orderEntry type="library" exported="" scope="TEST" name="objenesis-1.0" level="project" />
135+
<orderEntry type="library" exported="" name="kotlin-stdlib-1.0.4" level="project" />
108136
<orderEntry type="library" exported="" name="gson-2.4" level="project" />
109137
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
138+
<orderEntry type="library" exported="" name="kotlin-runtime-1.0.4" level="project" />
110139
<orderEntry type="library" exported="" scope="TEST" name="junit-4.11" level="project" />
111140
<orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.9.5" level="project" />
112141
</component>

‎src/AndroidClient/techstackskotlin/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
33

44
android {
5-
compileSdkVersion 23
5+
compileSdkVersion 24
66
buildToolsVersion "23.0.2"
77

88
defaultConfig {
99
applicationId "test.servicestack.net.techstackskotlin"
1010
minSdkVersion 16
11-
targetSdkVersion 23
11+
targetSdkVersion 24
1212
versionCode 1
1313
versionName "1.0"
1414
}
@@ -26,14 +26,14 @@ android {
2626
dependencies {
2727
compile fileTree(dir: 'libs', include: ['*.jar'])
2828
testCompile 'junit:junit:4.12'
29-
compile 'com.android.support:appcompat-v7:23.1.1'
30-
compile 'com.android.support:design:23.1.1'
29+
compile 'com.android.support:appcompat-v7:24.2.1'
30+
compile 'com.android.support:design:24.2.1'
3131
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
3232
compile project(':android')
3333
compile 'com.squareup.picasso:picasso:2.5.2'
3434
}
3535
buildscript {
36-
ext.kotlin_version = '1.0.0-beta-3595'
36+
ext.kotlin_version = '1.0.4'
3737
repositories {
3838
mavenCentral()
3939
}

0 commit comments

Comments
 (0)