Merge branch 'ci-bumps' into 'master'
PMD and Checkstyle version bumps See merge request !316
This commit is contained in:
		
						commit
						4ef0642134
					
				| @ -36,7 +36,7 @@ android { | ||||
| } | ||||
| 
 | ||||
| checkstyle { | ||||
|     toolVersion = '6.18' | ||||
|     toolVersion = '6.19' | ||||
| } | ||||
| 
 | ||||
| task checkstyle(type: Checkstyle) { | ||||
|  | ||||
| @ -209,7 +209,7 @@ android { | ||||
| } | ||||
| 
 | ||||
| checkstyle { | ||||
|     toolVersion = '6.18' | ||||
|     toolVersion = '6.19' | ||||
| } | ||||
| 
 | ||||
| task checkstyle(type: Checkstyle) { | ||||
| @ -221,7 +221,7 @@ task checkstyle(type: Checkstyle) { | ||||
| } | ||||
| 
 | ||||
| pmd { | ||||
|     toolVersion = '5.4.1' | ||||
|     toolVersion = '5.4.2' | ||||
|     consoleOutput = true | ||||
| } | ||||
| 
 | ||||
|  | ||||
| @ -332,7 +332,7 @@ public class RepoUpdater { | ||||
|      * check that the signing certificate in the jar matches that fingerprint. | ||||
|      */ | ||||
|     private void verifyAndStoreTOFUCerts(String certFromIndexXml, X509Certificate rawCertFromJar) | ||||
|         throws SigningException { | ||||
|             throws SigningException { | ||||
|         if (repo.signingCertificate != null) { | ||||
|             return; // there is a repo.signingCertificate already, nothing to TOFU | ||||
|         } | ||||
|  | ||||
| @ -57,7 +57,7 @@ public abstract class FDroidProvider extends ContentProvider { | ||||
|     @NonNull | ||||
|     @Override | ||||
|     public ContentProviderResult[] applyBatch(@NonNull ArrayList<ContentProviderOperation> operations) | ||||
|         throws OperationApplicationException { | ||||
|             throws OperationApplicationException { | ||||
|         ContentProviderResult[] result = null; | ||||
|         isApplyingBatch = true; | ||||
|         final SQLiteDatabase db = db(); | ||||
| @ -141,7 +141,7 @@ public abstract class FDroidProvider extends ContentProvider { | ||||
|     } | ||||
| 
 | ||||
|     protected void validateFields(String[] validFields, ContentValues values) | ||||
|         throws IllegalArgumentException { | ||||
|             throws IllegalArgumentException { | ||||
|         for (final String key : getKeySet(values)) { | ||||
|             boolean isValid = false; | ||||
|             for (final String validKey : validFields) { | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Hans-Christoph Steiner
						Hans-Christoph Steiner