From 217bde1290d2a9b929f9048cb12c7067868e38f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sun, 31 Jul 2016 16:41:25 +0200
Subject: [PATCH 1/3] gradle: bump checkstyle, robolectric and PMD versions
All minor bugfix releases.
---
Privileged-Extension/build.gradle | 2 +-
app/build.gradle | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Privileged-Extension/build.gradle b/Privileged-Extension/build.gradle
index 407ad7998..eb43a9731 100644
--- a/Privileged-Extension/build.gradle
+++ b/Privileged-Extension/build.gradle
@@ -36,7 +36,7 @@ android {
}
checkstyle {
- toolVersion = '7.0'
+ toolVersion = '7.1'
}
task checkstyle(type: Checkstyle) {
diff --git a/app/build.gradle b/app/build.gradle
index 381e47366..40108ac53 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,7 +41,7 @@ dependencies {
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"
@@ -209,7 +209,7 @@ android {
}
checkstyle {
- toolVersion = '7.0'
+ toolVersion = '7.1'
}
task checkstyle(type: Checkstyle) {
@@ -221,7 +221,7 @@ task checkstyle(type: Checkstyle) {
}
pmd {
- toolVersion = '5.5.0'
+ toolVersion = '5.5.1'
consoleOutput = true
}
From d41cfe85d67b725a157194278b95fd2b6ed2bef9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sun, 31 Jul 2016 18:40:06 +0200
Subject: [PATCH 2/3] gradle: bump buildToolsVersion to 24.0.1
---
Privileged-Extension/build.gradle | 2 +-
app/build.gradle | 2 +-
extern/support-v4-preferencefragment/build.gradle | 2 +-
privileged-api-lib/build.gradle | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Privileged-Extension/build.gradle b/Privileged-Extension/build.gradle
index eb43a9731..89512b54a 100644
--- a/Privileged-Extension/build.gradle
+++ b/Privileged-Extension/build.gradle
@@ -11,7 +11,7 @@ dependencies {
android {
compileSdkVersion 24
- buildToolsVersion '24.0.0'
+ buildToolsVersion '24.0.1'
defaultConfig {
minSdkVersion 8
diff --git a/app/build.gradle b/app/build.gradle
index 40108ac53..5546936e1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -140,7 +140,7 @@ if (!hasProperty('sourceDeps')) {
android {
compileSdkVersion 24
- buildToolsVersion '24.0.0'
+ buildToolsVersion '24.0.1'
useLibrary 'org.apache.http.legacy'
buildTypes {
diff --git a/extern/support-v4-preferencefragment/build.gradle b/extern/support-v4-preferencefragment/build.gradle
index 14c92c636..8e8d1327d 100644
--- a/extern/support-v4-preferencefragment/build.gradle
+++ b/extern/support-v4-preferencefragment/build.gradle
@@ -19,7 +19,7 @@ dependencies {
android {
compileSdkVersion 19
- buildToolsVersion '24.0.0'
+ buildToolsVersion '24.0.1'
defaultConfig {
minSdkVersion 7
diff --git a/privileged-api-lib/build.gradle b/privileged-api-lib/build.gradle
index 5d267c599..b87e41d32 100644
--- a/privileged-api-lib/build.gradle
+++ b/privileged-api-lib/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion 24
- buildToolsVersion '24.0.0'
+ buildToolsVersion '24.0.1'
defaultConfig {
minSdkVersion 8
From 3726b2b7faece39d8a29522de4120c90f7c61090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sun, 31 Jul 2016 18:40:16 +0200
Subject: [PATCH 3/3] gradle: bump support libs to 24.1.1
Minor bugfix release.
Also bump the CI image with the new stuff.
---
.gitlab-ci.yml | 2 +-
app/build.gradle | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3aa566480..3eb22b6c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: mvdan/fdroid-ci:client-20160709
+image: mvdan/fdroid-ci:client-20160731
cache:
paths:
diff --git a/app/build.gradle b/app/build.gradle
index 5546936e1..ade10cc24 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,9 +20,9 @@ repositories {
dependencies {
compile project(':privileged-api-lib')
- compile 'com.android.support:support-v4:24.0.0'
- compile 'com.android.support:appcompat-v7:24.0.0'
- compile 'com.android.support:support-annotations:24.0.0'
+ compile 'com.android.support:support-v4:24.1.1'
+ compile 'com.android.support:appcompat-v7:24.1.1'
+ compile 'com.android.support:support-annotations:24.1.1'
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
compile 'com.google.zxing:core:3.2.1'
@@ -45,7 +45,7 @@ dependencies {
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:rules:0.5'
}
@@ -84,9 +84,9 @@ if (!hasProperty('sourceDeps')) {
// source code don't need to be here.
dependencyVerification {
verify = [
- 'com.android.support:support-v4:b6d3994d4bdea0ef2a221ecf9e0ddf150b99af189211c36418c81e248f3fed99',
- 'com.android.support:appcompat-v7:a30898bbec4d506f821055a362d62820b18f29e9cf0c077817e46cb5a03cde94',
- 'com.android.support:support-annotations:0790aced70e3ce82a6e466f0d4908cdd9e21bd925b4107437441d201f595a908',
+ 'com.android.support:support-v4:246c99385a84fe179d7b833c9ddaf2576f217b0abba5e74b5353cc78756f5880',
+ 'com.android.support:appcompat-v7:bf8db89d678286043778990fc967346e94321cc8d8bad99e9b0db20588509156',
+ 'com.android.support:support-annotations:bac4e534657165b0c4c362c97db389dcb152e43273435d2ccaa939a82e03f42c',
'com.nostra13.universalimageloader:universal-image-loader:dbd5197ffec3a8317533190870a7c00ff3750dd6a31241448c6a5522d51b65b4',
'com.google.zxing:core:b4d82452e7a6bf6ec2698904b332431717ed8f9a850224f295aec89de80f2259',
'eu.chainfire:libsuperuser:018344ff19ee94d252c14b4a503ee8b519184db473a5af83513f5837c413b128',