Skip to content

Commit

Permalink
Use latest support lib which requires bump to min sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
Jawnnypoo committed Oct 26, 2016
1 parent 93500d7 commit 1167f79
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 218 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ android:
- tools

# The BuildTools version used by your project
- build-tools-24.0.1
- build-tools-25.0.0

# The SDK version used to compile your project
- android-24
- android-25

# Additional components
- extra-android-m2repository
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
classpath 'com.android.tools.build:gradle:2.2.2'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
10 changes: 5 additions & 5 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 24
buildToolsVersion '24.0.1'
compileSdkVersion 25
buildToolsVersion '25.0.0'

defaultConfig {
minSdkVersion 4
targetSdkVersion 24
minSdkVersion 9
targetSdkVersion 25
versionCode 1
versionName "1.0"
}
}

dependencies {
compile "com.android.support:support-v4:24.1.1"
compile "com.android.support:support-core-utils:25.0.0"
}

apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle'
202 changes: 0 additions & 202 deletions sample/LICENSE

This file was deleted.

12 changes: 6 additions & 6 deletions sample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 24
buildToolsVersion '24.0.1'
compileSdkVersion 25
buildToolsVersion '25.0.0'

defaultConfig {
applicationId "uk.co.senab.photoview.sample"
minSdkVersion 8
targetSdkVersion 24
minSdkVersion 9
targetSdkVersion 25
versionCode 100
versionName "1.0"
}
Expand All @@ -18,7 +18,7 @@ android {

dependencies {
compile project(':library')
compile 'com.android.support:appcompat-v7:24.1.1'
compile 'com.android.support:recyclerview-v7:24.1.1'
compile 'com.android.support:appcompat-v7:25.0.0'
compile 'com.android.support:recyclerview-v7:25.0.0'
compile 'com.squareup.picasso:picasso:2.5.2'
}

0 comments on commit 1167f79

Please sign in to comment.