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

Merge branch 'bumps' into 'master'

Browse Source 
Various minor version bumps



See merge request !370
This commit is contained in:
Daniel Martí 2016-08-01 06:07:38 +00:00
commit d24f1034f4
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -1,4 +1,4 @@
image: mvdan/fdroid-ci:client-20160709 image: mvdan/fdroid-ci:client-20160731
cache: cache:
paths: paths:

4
Privileged-Extension/build.gradle
View File

@ -11,7 +11,7 @@ dependencies {
android { android {
compileSdkVersion 24 compileSdkVersion 24
buildToolsVersion '24.0.0' buildToolsVersion '24.0.1'
defaultConfig { defaultConfig {
minSdkVersion 8 minSdkVersion 8
@ -36,7 +36,7 @@ android {
} }
checkstyle { checkstyle {
toolVersion = '7.0' toolVersion = '7.1'
} }
task checkstyle(type: Checkstyle) { task checkstyle(type: Checkstyle) {

22
app/build.gradle
View File

@ -20,9 +20,9 @@ repositories {
dependencies { dependencies {
compile project(':privileged-api-lib') compile project(':privileged-api-lib')
compile 'com.android.support:support-v4:24.0.0' compile 'com.android.support:support-v4:24.1.1'
compile 'com.android.support:appcompat-v7:24.0.0' compile 'com.android.support:appcompat-v7:24.1.1'
compile 'com.android.support:support-annotations:24.0.0' compile 'com.android.support:support-annotations:24.1.1'
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
compile 'com.google.zxing:core:3.2.1' compile 'com.google.zxing:core:3.2.1'
@ -41,11 +41,11 @@ dependencies {
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
testCompile "org.robolectric:robolectric:3.1" testCompile "org.robolectric:robolectric:3.1.1"
testCompile "org.mockito:mockito-core:1.10.19" testCompile "org.mockito:mockito-core:1.10.19"
androidTestCompile 'com.android.support:support-annotations:24.0.0' androidTestCompile 'com.android.support:support-annotations:24.1.1'
androidTestCompile 'com.android.support.test:runner:0.5' androidTestCompile 'com.android.support.test:runner:0.5'
androidTestCompile 'com.android.support.test:rules:0.5' androidTestCompile 'com.android.support.test:rules:0.5'
} }
@ -84,9 +84,9 @@ if (!hasProperty('sourceDeps')) {
// source code don't need to be here. // source code don't need to be here.
dependencyVerification { dependencyVerification {
verify = [ verify = [
'com.android.support:support-v4:b6d3994d4bdea0ef2a221ecf9e0ddf150b99af189211c36418c81e248f3fed99', 'com.android.support:support-v4:246c99385a84fe179d7b833c9ddaf2576f217b0abba5e74b5353cc78756f5880',
'com.android.support:appcompat-v7:a30898bbec4d506f821055a362d62820b18f29e9cf0c077817e46cb5a03cde94', 'com.android.support:appcompat-v7:bf8db89d678286043778990fc967346e94321cc8d8bad99e9b0db20588509156',
'com.android.support:support-annotations:0790aced70e3ce82a6e466f0d4908cdd9e21bd925b4107437441d201f595a908', 'com.android.support:support-annotations:bac4e534657165b0c4c362c97db389dcb152e43273435d2ccaa939a82e03f42c',
'com.nostra13.universalimageloader:universal-image-loader:dbd5197ffec3a8317533190870a7c00ff3750dd6a31241448c6a5522d51b65b4', 'com.nostra13.universalimageloader:universal-image-loader:dbd5197ffec3a8317533190870a7c00ff3750dd6a31241448c6a5522d51b65b4',
'com.google.zxing:core:b4d82452e7a6bf6ec2698904b332431717ed8f9a850224f295aec89de80f2259', 'com.google.zxing:core:b4d82452e7a6bf6ec2698904b332431717ed8f9a850224f295aec89de80f2259',
'eu.chainfire:libsuperuser:018344ff19ee94d252c14b4a503ee8b519184db473a5af83513f5837c413b128', 'eu.chainfire:libsuperuser:018344ff19ee94d252c14b4a503ee8b519184db473a5af83513f5837c413b128',
@ -140,7 +140,7 @@ if (!hasProperty('sourceDeps')) {
android { android {
compileSdkVersion 24 compileSdkVersion 24
buildToolsVersion '24.0.0' buildToolsVersion '24.0.1'
useLibrary 'org.apache.http.legacy' useLibrary 'org.apache.http.legacy'
buildTypes { buildTypes {
@ -209,7 +209,7 @@ android {
} }
checkstyle { checkstyle {
toolVersion = '7.0' toolVersion = '7.1'
} }
task checkstyle(type: Checkstyle) { task checkstyle(type: Checkstyle) {
@ -221,7 +221,7 @@ task checkstyle(type: Checkstyle) {
} }
pmd { pmd {
toolVersion = '5.5.0' toolVersion = '5.5.1'
consoleOutput = true consoleOutput = true
} }

2
extern/support-v4-preferencefragment/build.gradle vendored
View File

@ -19,7 +19,7 @@ dependencies {
android { android {
compileSdkVersion 19 compileSdkVersion 19
buildToolsVersion '24.0.0' buildToolsVersion '24.0.1'
defaultConfig { defaultConfig {
minSdkVersion 7 minSdkVersion 7

2
privileged-api-lib/build.gradle
View File

@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion 24 compileSdkVersion 24
buildToolsVersion '24.0.0' buildToolsVersion '24.0.1'
defaultConfig { defaultConfig {
minSdkVersion 8 minSdkVersion 8