Update gradle config

threefoldtech · Sep 24, 2024 · c4f4972 · c4f4972
1 parent bca12a6
commit c4f4972
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 31 deletions.
diff --git a/app/android/app/build_local b/app/android/app/build_local
@@ -78,10 +78,14 @@ android {
         }
     }
     buildscript {
-    ext {
-        stripeVersion = "20.19.1" // This is the version BEFORE the kotlin bump
+        ext {
+            stripeVersion = "20.19.1" // This is the version BEFORE the kotlin bump
+        }
+    }
+
+    dataBinding {
+        enabled = true
     }
-}
 }
 
 flutter {

diff --git a/app/android/app/build_production b/app/android/app/build_production
@@ -78,10 +78,14 @@ android {
         }
     }
     buildscript {
-    ext {
-        stripeVersion = "20.19.1" // This is the version BEFORE the kotlin bump
+        ext {
+            stripeVersion = "20.19.1" // This is the version BEFORE the kotlin bump
+        }
+    }
+
+    dataBinding {
+        enabled = true
     }
-}
 }
 
 flutter {

diff --git a/app/android/app/build_staging b/app/android/app/build_staging
@@ -78,10 +78,14 @@ android {
         }
     }
     buildscript {
-    ext {
-        stripeVersion = "20.19.1" // This is the version BEFORE the kotlin bump
+        ext {
+            stripeVersion = "20.19.1" // This is the version BEFORE the kotlin bump
+        }
+    }
+
+    dataBinding {
+        enabled = true
     }
-}
 }
 
 flutter {

diff --git a/app/android/app/build_testing b/app/android/app/build_testing
@@ -60,10 +60,10 @@ android {
 
 		signingConfigs {
         release {
-            // keyAlias localProperties.getProperty('keyAlias')
-            // keyPassword localProperties.getProperty('keyPassword')
-            // storeFile file(localProperties.getProperty('storeFile'))
-            // storePassword localProperties.getProperty('storePassword')
+            keyAlias localProperties.getProperty('keyAlias')
+            keyPassword localProperties.getProperty('keyPassword')
+            storeFile file(localProperties.getProperty('storeFile'))
+            storePassword localProperties.getProperty('storePassword')
         }
         debug {
 
@@ -78,10 +78,14 @@ android {
         }
     }
     buildscript {
-    ext {
-        stripeVersion = "20.19.1" // This is the version BEFORE the kotlin bump
+        ext {
+            stripeVersion = "20.19.1" // This is the version BEFORE the kotlin bump
+        }
+    }
+
+    dataBinding {
+        enabled = true
     }
-}
 }
 
 flutter {

diff --git a/app/android/build.gradle b/app/android/build.gradle
@@ -3,12 +3,15 @@ buildscript {
     repositories {
         google()
         jcenter()
-        maven { url 'https://maven.google.com' }
         mavenCentral()
+        maven { url 'https://jitpack.io' } // add this line
+        maven { url 'https://maven.google.com' }
+
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        // classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath 'com.google.gms:google-services:4.3.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
@@ -18,8 +21,9 @@ allprojects {
     repositories {
         google()
         jcenter()
+        mavenCentral()
+        maven { url 'https://jitpack.io' }
         maven { url 'https://maven.google.com' }
-				maven { url 'https://jitpack.io' }
     }
 }
 

diff --git a/app/android/gradle.properties b/app/android/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.daemon=true
 org.gradle.configureondemand=true
 # org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=2048m -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 android.useAndroidX=true
-android.jetifier.blacklist=bcprov-jdk15on
+android.jetifier.ignorelist=bcprov-jdk15on
 android.enableJetifier=true
 org.gradle.jvmargs=-Xmx1536M \
 --add-exports=java.base/sun.nio.ch=ALL-UNNAMED \

diff --git a/app/lib/screens/identity_verification_screen.dart b/app/lib/screens/identity_verification_screen.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter_pkid/flutter_pkid.dart';
 import 'package:http/http.dart';
-import 'package:shuftipro_sdk/shuftipro_sdk.dart';
+import 'package:shuftipro_onsite_sdk/shuftipro_onsite_sdk.dart';
 import 'package:threebotlogin/events/events.dart';
 import 'package:threebotlogin/events/identity_callback_event.dart';
 import 'package:threebotlogin/helpers/globals.dart';

diff --git a/app/pubspec.lock b/app/pubspec.lock
@@ -401,11 +401,9 @@ packages:
   flutter_pkid:
     dependency: "direct main"
     description:
-      path: "."
-      ref: master
-      resolved-ref: "57827618dd0dda003b86ecb1d6c4ddb015fdad5f"
-      url: "https://github.com/threefoldtech/threefold_connect_flutter_pkid_client"
-    source: git
+      path: "/sandbox/code/github/threefoldtech/threefold_connect_flutter_pkid_client"
+      relative: false
+    source: path
     version: "0.0.1"
   flutter_plugin_android_lifecycle:
     dependency: transitive
@@ -1048,14 +1046,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
-  shuftipro_sdk:
+  shuftipro_onsite_sdk:
     dependency: "direct main"
     description:
-      name: shuftipro_sdk
-      sha256: fd47550bbbfe50c99ef490fdb609b5a8d5e3e770d3fb8196c984a7f68d00772e
+      name: shuftipro_onsite_sdk
+      sha256: d1329e5fe5a15cbbe5d2e75af9ab0eab1dd00a41a017eaf74225cb37d39f9e52
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.9"
+    version: "1.0.5"
   signer:
     dependency: transitive
     description:

diff --git a/app/pubspec.yaml b/app/pubspec.yaml
@@ -31,7 +31,7 @@ dependencies:
       url: https://github.com/codescalers/tfgrid-sdk-dart
       ref: main
       path: packages/gridproxy_client
-  shuftipro_sdk: ^1.2.5
+  shuftipro_onsite_sdk: ^1.0.5
   flutter_svg: ^2.0.6
   bip39: ^1.0.6
   socket_io_client: ^1.0.2