threefoldtech · AhmedHanafy725 · Oct 2, 2024 · Sep 10, 2024 · Sep 11, 2024 · Sep 12, 2024
diff --git a/app/android/app/build_local b/app/android/app/build_local
@@ -26,16 +26,20 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion flutter.compileSdkVersion
+    // compileSdkVersion flutter.compileSdkVersion
+    compileSdkVersion 34
     ndkVersion flutter.ndkVersion
 
 		sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
 		lintOptions {
-        disable 'InvalidPackage'
-    }
+            disable 'InvalidPackage'
+            disable "Instantiatable"
+            checkReleaseBuilds false
+            abortOnError false
+        }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -47,7 +51,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "org.jimber.threebotlogin.local"
+        applicationId "org.jimber.threebotlogin"
         minSdkVersion 23
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
@@ -66,7 +70,6 @@ android {
 
         }
     }
-
     buildTypes {
         release {
             signingConfig signingConfigs.release
@@ -75,6 +78,15 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    buildscript {
+        ext {
+            stripeVersion = "20.19.1" // This is the version BEFORE the kotlin bump
+        }
+    }
+
+    dataBinding {
+        enabled = true
+    }
 }
 
 flutter {
@@ -89,6 +101,7 @@ dependencies {
     implementation 'com.hbb20:ccp:2.4.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation "androidx.preference:preference-ktx:1.1.1"
-		implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
-		implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+	implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
+	implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+
 }
diff --git a/app/android/app/build_production b/app/android/app/build_production
@@ -26,16 +26,20 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion flutter.compileSdkVersion
+    // compileSdkVersion flutter.compileSdkVersion
+    compileSdkVersion 34
     ndkVersion flutter.ndkVersion
 
 		sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
 		lintOptions {
-        disable 'InvalidPackage'
-    }
+            disable 'InvalidPackage'
+            disable "Instantiatable"
+            checkReleaseBuilds false
+            abortOnError false
+        }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -74,6 +78,15 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    buildscript {
+        ext {
+            stripeVersion = "20.19.1" // This is the version BEFORE the kotlin bump
+        }
+    }
+
+    dataBinding {
+        enabled = true
+    }
 }
 
 flutter {
@@ -88,6 +101,7 @@ dependencies {
     implementation 'com.hbb20:ccp:2.4.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation "androidx.preference:preference-ktx:1.1.1"
-		implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
-		implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+	implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
+	implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+
 }
diff --git a/app/android/app/build_staging b/app/android/app/build_staging
@@ -26,16 +26,20 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion flutter.compileSdkVersion
+    // compileSdkVersion flutter.compileSdkVersion
+    compileSdkVersion 34
     ndkVersion flutter.ndkVersion
 
 		sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
 		lintOptions {
-        disable 'InvalidPackage'
-    }
+            disable 'InvalidPackage'
+            disable "Instantiatable"
+            checkReleaseBuilds false
+            abortOnError false
+        }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -47,7 +51,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "org.jimber.threebotlogin.staging"
+        applicationId "org.jimber.threebotlogin"
         minSdkVersion 23
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
@@ -74,6 +78,15 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    buildscript {
+        ext {
+            stripeVersion = "20.19.1" // This is the version BEFORE the kotlin bump
+        }
+    }
+
+    dataBinding {
+        enabled = true
+    }
 }
 
 flutter {
@@ -88,6 +101,7 @@ dependencies {
     implementation 'com.hbb20:ccp:2.4.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation "androidx.preference:preference-ktx:1.1.1"
-		implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
-		implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+	implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
+	implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+
 }
diff --git a/app/android/app/build_testing b/app/android/app/build_testing
@@ -26,16 +26,20 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion flutter.compileSdkVersion
+    // compileSdkVersion flutter.compileSdkVersion
+    compileSdkVersion 34
     ndkVersion flutter.ndkVersion
 
 		sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
 		lintOptions {
-        disable 'InvalidPackage'
-    }
+            disable 'InvalidPackage'
+            disable "Instantiatable"
+            checkReleaseBuilds false
+            abortOnError false
+        }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -47,7 +51,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "org.jimber.threebotlogin.testing"
+        applicationId "org.jimber.threebotlogin"
         minSdkVersion 23
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
@@ -57,10 +61,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 {
 
@@ -74,6 +78,15 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    buildscript {
+        ext {
+            stripeVersion = "20.19.1" // This is the version BEFORE the kotlin bump
+        }
+    }
+
+    dataBinding {
+        enabled = true
+    }
 }
 
 flutter {
@@ -88,6 +101,7 @@ dependencies {
     implementation 'com.hbb20:ccp:2.4.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation "androidx.preference:preference-ktx:1.1.1"
-		implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
-		implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+	implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
+	implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+
 }
diff --git a/app/android/app/src/main/AndroidManifest_local b/app/android/app/src/main/AndroidManifest_local
@@ -1,7 +1,7 @@
 <manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="org.jimber.threebotlogin.local">
     <application tools:replace="android:label" android:label="3Bot Local" android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true">
         <activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
+            android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize" android:enableOnBackInvokedCallback="false">
             <meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />
             <meta-data android:name="io.flutter.embedding.android.SplashScreenDrawable" android:resource="@drawable/launch_background" />
             <intent-filter>

diff --git a/app/android/app/src/main/AndroidManifest_production b/app/android/app/src/main/AndroidManifest_production
@@ -1,7 +1,7 @@
 <manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="org.jimber.threebotlogin">
     <application tools:replace="android:label" android:label="Threefold Connect" android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true">
         <activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
+            android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize" android:enableOnBackInvokedCallback="false">
             <meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />
             <meta-data android:name="io.flutter.embedding.android.SplashScreenDrawable" android:resource="@drawable/launch_background" />
             <intent-filter>

diff --git a/app/android/app/src/main/AndroidManifest_staging b/app/android/app/src/main/AndroidManifest_staging
@@ -1,7 +1,7 @@
 <manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="org.jimber.threebotlogin.staging">
     <application tools:replace="android:label" android:label="3Bot Staging" android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true">
         <activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
+            android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize" android:enableOnBackInvokedCallback="false">
             <meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />
             <meta-data android:name="io.flutter.embedding.android.SplashScreenDrawable" android:resource="@drawable/launch_background" />
             <intent-filter>

diff --git a/app/android/app/src/main/AndroidManifest_testing b/app/android/app/src/main/AndroidManifest_testing
@@ -1,7 +1,7 @@
 <manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="org.jimber.threebotlogin.testing">
     <application tools:replace="android:label" android:label="3Bot Testing" android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true">
         <activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
+            android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize" android:enableOnBackInvokedCallback="false">
             <meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />
             <meta-data android:name="io.flutter.embedding.android.SplashScreenDrawable" android:resource="@drawable/launch_background" />
             <intent-filter>

diff --git a/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity.kt b/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity.kt
@@ -8,4 +8,4 @@ class MainActivity: FlutterFragmentActivity() {
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         GeneratedPluginRegistrant.registerWith(flutterEngine)
     }
-}
+}
diff --git a/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_local b/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_local
@@ -8,4 +8,4 @@ class MainActivity: FlutterFragmentActivity() {
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         GeneratedPluginRegistrant.registerWith(flutterEngine)
     }
-}
+}
diff --git a/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_production b/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_production
@@ -8,4 +8,4 @@ class MainActivity: FlutterFragmentActivity() {
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         GeneratedPluginRegistrant.registerWith(flutterEngine)
     }
-}
+}
diff --git a/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_staging b/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_staging
@@ -8,4 +8,4 @@ class MainActivity: FlutterFragmentActivity() {
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         GeneratedPluginRegistrant.registerWith(flutterEngine)
     }
-}
+}
diff --git a/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_testing b/app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_testing
@@ -8,4 +8,4 @@ class MainActivity: FlutterFragmentActivity() {
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         GeneratedPluginRegistrant.registerWith(flutterEngine)
     }
-}
+}
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,6 +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.ignorelist=bcprov-jdk15on
 android.enableJetifier=true
 org.gradle.jvmargs=-Xmx1536M \
 --add-exports=java.base/sun.nio.ch=ALL-UNNAMED \

diff --git a/app/android/gradle/wrapper/gradle-wrapper.properties b/app/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,4 @@ class MainActivity: FlutterFragmentActivity() { @@
         override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
             GeneratedPluginRegistrant.registerWith(flutterEngine)
         }
-    }
+    }