Skip to content

Commit b3657c6

Browse files
committed
Merge pull request ToxicBakery#44 from ToxicBakery/issue-37
Issue 37
2 parents 49a6d0e + 9f06672 commit b3657c6

File tree

5 files changed

+13
-14
lines changed

5 files changed

+13
-14
lines changed

.travis.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@ jdk:
1111

1212
android:
1313
components:
14-
- build-tools-22.0.1
15-
- android-22
16-
17-
# Additional Components
18-
- extra
14+
- tools
15+
- build-tools-23.0.2
16+
- android-23
17+
- extra-android-m2repository
1918

2019
script:
2120
- echo "Travis branch is $TRAVIS_BRANCH"

app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ repositories {
2929
}
3030

3131
android {
32-
compileSdkVersion 22
33-
buildToolsVersion "22.0.1"
32+
compileSdkVersion 23
33+
buildToolsVersion "23.0.2"
3434

3535
defaultConfig {
3636
applicationId "com.ToxicBakery.viewpager.transforms"
3737
minSdkVersion 13
38-
targetSdkVersion 22
38+
targetSdkVersion 23
3939
versionCode 1
4040
versionName "1.0"
4141
}
@@ -48,6 +48,6 @@ android {
4848
}
4949

5050
dependencies {
51-
compile 'com.android.support:support-v13:22.1.1'
51+
compile 'com.android.support:support-v13:23.2.0'
5252
compile project(':library')
5353
}

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ buildscript {
2121
jcenter()
2222
}
2323
dependencies {
24-
classpath 'com.android.tools.build:gradle:1.2.0'
24+
classpath 'com.android.tools.build:gradle:1.5.0'
2525

2626
// NOTE: Do not place your application dependencies here; they belong
2727
// in the individual module build.gradle files

gradlew

100644100755
File mode changed.

library/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ if (isReleaseBuild()) {
3434
}
3535

3636
android {
37-
compileSdkVersion 22
38-
buildToolsVersion "22.0.1"
37+
compileSdkVersion 23
38+
buildToolsVersion "23.0.2"
3939

4040
defaultConfig {
4141
minSdkVersion 13
42-
targetSdkVersion 22
42+
targetSdkVersion 23
4343
versionCode 1
4444
versionName "1.0"
4545
}
@@ -57,7 +57,7 @@ android {
5757
}
5858

5959
dependencies {
60-
compile 'com.android.support:support-v13:22.1.1'
60+
compile 'com.android.support:support-v13:23.2.0'
6161
}
6262

6363
apply from: '../maven_push.gradle'

0 commit comments

Comments
 (0)