Browse Source

Build(deps): Bump gradle from 7.3.1 to 7.4.0

Bumps gradle from 7.3.1 to 7.4.0.

---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
dependabot[bot] 2 years ago
parent
commit
8b0deac0b4

+ 1 - 1
app/build.gradle

@@ -3,7 +3,7 @@ import org.gradle.internal.jvm.Jvm
 
 buildscript {
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:7.4.0'
         classpath 'com.hiya:jacoco-android:0.2'
         classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.13'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

+ 1 - 0
app/lint.xml

@@ -47,6 +47,7 @@
 
     <issue id="TrustAllX509TrustManager">
         <ignore path="**/bouncycastle/est/jcajce/*.class" />
+        <ignore path="**/bcpkix-jdk15to18-1.72.jar" />
     </issue>
 
     <issue id="RestrictedApi" severity="error">

+ 4 - 7
app/src/main/java/com/owncloud/android/utils/svg/SvgSoftwareLayerSetter.java

@@ -11,7 +11,6 @@
 package com.owncloud.android.utils.svg;
 
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.widget.ImageView;
 
 import com.bumptech.glide.request.RequestListener;
@@ -23,9 +22,8 @@ public class SvgSoftwareLayerSetter<T> implements RequestListener<T, Drawable> {
     @Override
     public boolean onException(Exception e, T model, Target<Drawable> target, boolean isFirstResource) {
         ImageView view = ((ImageViewTarget<?>) target).getView();
-        if (Build.VERSION_CODES.HONEYCOMB <= Build.VERSION.SDK_INT) {
-            view.setLayerType(ImageView.LAYER_TYPE_NONE, null);
-        }
+        view.setLayerType(ImageView.LAYER_TYPE_NONE, null);
+
         return false;
     }
 
@@ -33,9 +31,8 @@ public class SvgSoftwareLayerSetter<T> implements RequestListener<T, Drawable> {
     public boolean onResourceReady(Drawable resource, T model, Target<Drawable> target,
                                    boolean isFromMemoryCache, boolean isFirstResource) {
         ImageView view = ((ImageViewTarget<?>) target).getView();
-        if (Build.VERSION_CODES.HONEYCOMB <= Build.VERSION.SDK_INT) {
-            view.setLayerType(ImageView.LAYER_TYPE_SOFTWARE, null);
-        }
+        view.setLayerType(ImageView.LAYER_TYPE_SOFTWARE, null);
+
         return false;
     }
 }

+ 3 - 2
gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Fri Jan 13 08:21:45 CET 2023
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME