Merge pull request #334 from gini/PIA-2674-lower-compile-sdk-to-30

Pia 2674 lower compile sdk to 30
gini · Jun 7, 2022 · ad444e5 · ad444e5
2 parents 81edd04 + 110ce90
commit ad444e5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 24 deletions.
diff --git a/build.gradle b/build.gradle
@@ -63,7 +63,7 @@ task printLibraryVersion {
 }
 
 ext {
-    compileSdkVersion = 31
+    compileSdkVersion = 30
     minSdkVersion = 19
     targetSdkVersion = 30
     versionCode = libVersionCode
@@ -72,7 +72,7 @@ ext {
 
 ext.deps = [
         // Android
-        androidxCore               : '1.7.0',
+        androidxCore               : '1.6.0',
         androidxAppCompat          : '1.3.1',
         androidxFragment           : '1.3.6',
         androidxViewPager          : '1.0.0',

diff --git a/ginivision-accounting-network/build.gradle b/ginivision-accounting-network/build.gradle
@@ -38,7 +38,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "androidx.annotation:annotation:$deps.androidxAnnotations"
     implementation project(path: ':ginivision')
-    api('net.gini:gini-android-sdk:2.9.2@aar') {
+    api('net.gini:gini-android-sdk:2.9.0@aar') {
         transitive = true
     }
 

diff --git a/ginivision-network/build.gradle b/ginivision-network/build.gradle
@@ -38,7 +38,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "androidx.annotation:annotation:$deps.androidxAnnotations"
     implementation project(path: ':ginivision')
-    api('net.gini:gini-android-sdk:2.10.0@aar') {
+    api('net.gini:gini-android-sdk:2.9.0@aar') {
         transitive = true
     }
 

diff --git a/...etwork/src/main/java/net/gini/android/vision/network/GiniVisionDefaultNetworkService.java b/...etwork/src/main/java/net/gini/android/vision/network/GiniVisionDefaultNetworkService.java
@@ -35,8 +35,6 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.XmlRes;
 
-import javax.net.ssl.TrustManager;
-
 import bolts.Continuation;
 import bolts.Task;
 
@@ -349,7 +347,6 @@ public static class Builder {
         private int mMaxNumberOfRetries;
         private float mBackoffMultiplier;
         private DocumentMetadata mDocumentMetadata;
-        private TrustManager mTrustManager;
 
         Builder(@NonNull final Context context) {
             mContext = context;
@@ -394,9 +391,6 @@ public GiniVisionDefaultNetworkService build() {
             if (mBackoffMultiplier >= 0) {
                 sdkBuilder.setConnectionBackOffMultiplier(mBackoffMultiplier);
             }
-            if (mTrustManager != null) {
-                sdkBuilder.setTrustManager(mTrustManager);
-            }
             final Gini giniApi = sdkBuilder.build();
             return new GiniVisionDefaultNetworkService(giniApi, mDocumentMetadata);
         }
@@ -569,20 +563,6 @@ public Builder setDocumentMetadata(@NonNull final DocumentMetadata documentMetad
             return this;
         }
 
-        /**
-         * Set a custom {@link TrustManager} implementation to have full control over which certificates to trust.
-         * <p>
-         * Please be aware that if you set a custom TrustManager implementation here than it will override any
-         * <a href="https://developer.android.com/training/articles/security-config">network security configuration</a>
-         * you may have set.
-         *
-         * @param trustManager A {@link TrustManager} implementation.
-         * @return the {@link Builder} instance
-         */
-        public Builder setTrustManager(@NonNull final TrustManager trustManager) {
-            mTrustManager = trustManager;
-            return this;
-        }
     }
 
 }