Skip to content

Commit a014333

Browse files
committed
Revert to API 22 until travis supports API 23
1 parent 288205a commit a014333

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ env:
55
# install timeout in minutes (2 minutes by default)
66
- ADB_INSTALL_TIMEOUT=24
77

8-
- ANDROID_API_LEVEL=23
9-
- ANDROID_BUILD_TOOLS_VERSION=23.0.0
8+
- ANDROID_API_LEVEL=22
9+
- ANDROID_BUILD_TOOLS_VERSION=22.0.1
1010
- ANDROID_ABI=armeabi-v7a
1111

1212
android:

app/app.iml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@
7171
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7272
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
7373
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.0/jars" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.0/jars" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/jars" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars" />
7676
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
7777
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
7878
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -88,12 +88,12 @@
8888
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9090
</content>
91-
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
91+
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
9292
<orderEntry type="sourceFolder" forTests="false" />
93-
<orderEntry type="library" exported="" name="appcompat-v7-23.0.0" level="project" />
93+
<orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
94+
<orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
9495
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
95-
<orderEntry type="library" exported="" name="support-v4-23.0.0" level="project" />
96-
<orderEntry type="library" exported="" name="support-annotations-23.0.0" level="project" />
96+
<orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
9797
<orderEntry type="module" module-name="decoviewlib" exported="" />
9898
</component>
9999
</module>

app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "23.0.0"
4+
compileSdkVersion 22
5+
buildToolsVersion "22.0.1"
66
defaultConfig {
77
applicationId 'com.hookedonplay.decoviewsample'
88
minSdkVersion 8
9-
targetSdkVersion 23
9+
targetSdkVersion 22
1010
versionCode 5
1111
versionName "0.9.4"
1212
}
@@ -20,6 +20,6 @@ android {
2020

2121
dependencies {
2222
compile fileTree(dir: 'libs', include: ['*.jar'])
23-
compile 'com.android.support:appcompat-v7:23.0.0'
23+
compile 'com.android.support:appcompat-v7:22.2.1'
2424
compile project(':decoviewlib')
2525
}

decoviewlib/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "23.0.0"
4+
compileSdkVersion 22
5+
buildToolsVersion "22.0.1"
66

77
defaultConfig {
88
minSdkVersion 8
9-
targetSdkVersion 23
9+
targetSdkVersion 22
1010
versionCode 5
1111
versionName "0.9.4"
1212
}
@@ -20,6 +20,6 @@ android {
2020

2121
dependencies {
2222
compile fileTree(dir: 'libs', include: ['*.jar'])
23-
compile 'com.android.support:appcompat-v7:23.0.0'
23+
compile 'com.android.support:appcompat-v7:22.2.1'
2424
compile 'com.nineoldandroids:library:2.4.0'
2525
}

decoviewlib/decoviewlib.iml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@
8787
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8989
</content>
90-
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
90+
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
9191
<orderEntry type="sourceFolder" forTests="false" />
92-
<orderEntry type="library" exported="" name="appcompat-v7-23.0.0" level="project" />
92+
<orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
93+
<orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
9394
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
94-
<orderEntry type="library" exported="" name="support-v4-23.0.0" level="project" />
95-
<orderEntry type="library" exported="" name="support-annotations-23.0.0" level="project" />
95+
<orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
9696
</component>
9797
</module>

0 commit comments

Comments
 (0)