Skip to content

Commit 23a0820

Browse files
committed
Upgrade to latest compat libs
1 parent 8136beb commit 23a0820

File tree

5 files changed

+15
-17
lines changed

5 files changed

+15
-17
lines changed

src/AndroidClient/android/android.iml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@
8282
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
8383
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8484
</content>
85-
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
85+
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
8686
<orderEntry type="sourceFolder" forTests="false" />
87-
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
8887
<orderEntry type="library" exported="" name="gson-2.4" level="project" />
89-
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
90-
<orderEntry type="library" exported="" name="support-annotations-21.0.3" 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" />
9191
</component>
9292
</module>

src/AndroidClient/android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ apply plugin: 'com.jfrog.bintray'
55
version = "1.0.20"
66

77
android {
8-
compileSdkVersion 21
8+
compileSdkVersion 23
99
buildToolsVersion "21.1.2"
1010

1111
defaultConfig {
1212
minSdkVersion 15
13-
targetSdkVersion 21
13+
targetSdkVersion 23
1414
versionCode 1
1515
versionName version
1616
}
@@ -92,7 +92,7 @@ install {
9292

9393
dependencies {
9494
compile 'com.google.code.gson:gson:2.4'
95-
compile 'com.android.support:appcompat-v7:21.0.3'
95+
compile 'com.android.support:appcompat-v7:23.1.1'
9696
compile fileTree(include: '*.jar', dir: 'libs')
9797
testCompile 'junit:junit:4.11'
9898
testCompile 'org.mockito:mockito-core:1.9.5'

src/AndroidClient/app/app.iml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
6969
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
7070
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
71-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/jars" />
72-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/jars" />
71+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
72+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
7373
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
7474
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
7575
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
@@ -80,10 +80,10 @@
8080
</content>
8181
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
8282
<orderEntry type="sourceFolder" forTests="false" />
83-
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
8483
<orderEntry type="library" exported="" name="gson-2.4" level="project" />
85-
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
86-
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
84+
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
85+
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
86+
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
8787
<orderEntry type="module" module-name="android" exported="" />
8888
</component>
8989
</module>

src/AndroidClient/kotlin/kotlin.iml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@
7474
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
7575
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
7676
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
7977
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
8078
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
8179
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />

src/AndroidClient/techstacks/techstacks.iml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@
7878
</content>
7979
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
8080
<orderEntry type="sourceFolder" forTests="false" />
81-
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
8281
<orderEntry type="library" exported="" name="gson-2.4" level="project" />
83-
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
84-
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
82+
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
83+
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
84+
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
8585
<orderEntry type="module" module-name="android" exported="" />
8686
</component>
8787
</module>

0 commit comments

Comments
 (0)