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

Merge branch 'ci-bumps' into 'master'

Browse Source 
PMD and Checkstyle version bumps



See merge request !316
This commit is contained in:
Hans-Christoph Steiner 2016-05-31 14:39:04 +00:00
commit 4ef0642134
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Privileged-Extension/build.gradle
View File

@ -36,7 +36,7 @@ android {
} }
checkstyle { checkstyle {
toolVersion = '6.18' toolVersion = '6.19'
} }
task checkstyle(type: Checkstyle) { task checkstyle(type: Checkstyle) {

4
app/build.gradle
View File

@ -209,7 +209,7 @@ android {
} }
checkstyle { checkstyle {
toolVersion = '6.18' toolVersion = '6.19'
} }
task checkstyle(type: Checkstyle) { task checkstyle(type: Checkstyle) {
@ -221,7 +221,7 @@ task checkstyle(type: Checkstyle) {
} }
pmd { pmd {
toolVersion = '5.4.1' toolVersion = '5.4.2'
consoleOutput = true consoleOutput = true
} }

2
app/src/main/java/org/fdroid/fdroid/RepoUpdater.java
View File

@ -332,7 +332,7 @@ public class RepoUpdater {
* check that the signing certificate in the jar matches that fingerprint. * check that the signing certificate in the jar matches that fingerprint.
*/ */
private void verifyAndStoreTOFUCerts(String certFromIndexXml, X509Certificate rawCertFromJar) private void verifyAndStoreTOFUCerts(String certFromIndexXml, X509Certificate rawCertFromJar)
throws SigningException { throws SigningException {
if (repo.signingCertificate != null) { if (repo.signingCertificate != null) {
return; // there is a repo.signingCertificate already, nothing to TOFU return; // there is a repo.signingCertificate already, nothing to TOFU
} }

4
app/src/main/java/org/fdroid/fdroid/data/FDroidProvider.java
View File

@ -57,7 +57,7 @@ public abstract class FDroidProvider extends ContentProvider {
@NonNull @NonNull
@Override @Override
public ContentProviderResult[] applyBatch(@NonNull ArrayList<ContentProviderOperation> operations) public ContentProviderResult[] applyBatch(@NonNull ArrayList<ContentProviderOperation> operations)
throws OperationApplicationException { throws OperationApplicationException {
ContentProviderResult[] result = null; ContentProviderResult[] result = null;
isApplyingBatch = true; isApplyingBatch = true;
final SQLiteDatabase db = db(); final SQLiteDatabase db = db();
@ -141,7 +141,7 @@ public abstract class FDroidProvider extends ContentProvider {
} }
protected void validateFields(String[] validFields, ContentValues values) protected void validateFields(String[] validFields, ContentValues values)
throws IllegalArgumentException { throws IllegalArgumentException {
for (final String key : getKeySet(values)) { for (final String key : getKeySet(values)) {
boolean isValid = false; boolean isValid = false;
for (final String validKey : validFields) { for (final String validKey : validFields) {