Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'version-bumps' into 'master'

Browse Source 
Target/Support version bumps

This is part of the (unmergeable as of now) !96. These changes are simple yet important enough for me to think that they deserve their own merge request.

I didn't push the changes directly because I haven't worked with the material stuff enough to notice whether anything is breaking or not. For all I can see, the app looks the same and the bumps just added lots more deprecation warnings (which is fine, they can be dealt with over time).

See merge request !109
This commit is contained in:
Daniel Martí 2015-08-09 18:36:27 +00:00
commit 51a0bb26fa
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
F-Droid/build.gradle
View File

@ -16,9 +16,9 @@ if ( !hasProperty( 'sourceDeps' ) ) {
dependencies {
compile 'com.android.support:support-v4:22.1.0',
'com.android.support:appcompat-v7:22.1.0',
'com.android.support:support-annotations:22.1.0',
compile 'com.android.support:support-v4:22.2.1',
'com.android.support:appcompat-v7:22.2.1',
'com.android.support:support-annotations:22.2.1',
'org.thoughtcrime.ssl.pinning:AndroidPinning:1.0.0',
'com.nostra13.universalimageloader:universal-image-loader:1.9.4',
@ -80,9 +80,9 @@ if ( !hasProperty( 'sourceDeps' ) ) {
// then you can find the relevant portions of the ../build.gradle file that
// include magic required to make it work at around about the v0.78 git tag.
// They have since been removed to clean up the build file.
compile 'com.android.support:support-v4:22.1.0',
'com.android.support:appcompat-v7:22.1.0',
'com.android.support:support-annotations:22.1.0'
compile 'com.android.support:support-v4:22.2.1',
'com.android.support:appcompat-v7:22.2.1',
'com.android.support:support-annotations:22.2.1'
androidTestCompile 'commons-io:commons-io:2.2'
}
@ -125,7 +125,7 @@ task binaryDeps(type: Copy, dependsOn: ':F-Droid:prepareReleaseDependencies') {
}
android {
compileSdkVersion 21
compileSdkVersion 22
buildToolsVersion '22.0.1'
sourceSets {