Turbo Checkout Fixes with Build flavour approach

android/build.gradle

@@ -2,13 +2,17 @@ group 'com.razorpay.razorpay_flutter'
 version '1.1.4'
 
 buildscript {
+    ext {
+        kotlin_version = '2.0.0'
+    }
     repositories {
         mavenCentral()
         google()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
@@ -20,20 +24,47 @@ rootProject.allprojects {
 }
 
 apply plugin: 'com.android.library'
+apply plugin: 'org.jetbrains.kotlin.android'
 
 android {
-    compileSdkVersion 31
+    compileSdk 34
+
 
     defaultConfig {
         minSdkVersion 21
+        targetSdkVersion 34
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+
+    flavorDimensions "sdk"
+
+    productFlavors {
+        standard {
+            dimension "sdk"
+            matchingFallbacks = ['debug', 'release']
+        }
+        standardWithTurbo {
+            dimension "sdk"
+            matchingFallbacks = ['debug', 'release']
+        }
+    }
+
     lintOptions {
         disable 'InvalidPackage'
     }
     dependencies {
         implementation fileTree(dir: 'libs', include: ['*.jar'])
-        api 'com.razorpay:checkout:1.6.+'
         implementation 'com.google.code.gson:gson:2.8.8'
+        //implementation fileTree(dir: 'upi-turbo/build/outputs/', include: ['*-debug.aar'])
+
+        // Dependencies for standard flavor
+        standardImplementation 'com.razorpay:checkout:1.6.+'
+
+        // Dependencies for standardWithTurbo flavor
+        //TODO: Add valid library path in dir in case of Turbo
+        standardWithTurboCompileOnly fileTree(dir: '..', include: ['*.aar'])
+    }
+    kotlinOptions {
+        jvmTarget = '17'
     }
 }

android/gradle.properties

@@ -1 +1,2 @@
 org.gradle.jvmargs=-Xmx1536M
+android.useAndroidX=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/settings.gradle

@@ -1 +1,4 @@
+package android
+
 rootProject.name = 'razorpay_flutter'
+include ':upi-turbo'

android/src/main/java/com/razorpay/razorpay_flutter/RazorpayDelegate.java

@@ -4,8 +4,6 @@
 import android.content.Intent;
 import android.util.Log;
 
-import androidx.annotation.NonNull;
-
 import com.google.gson.Gson;
 import com.razorpay.Checkout;
 import com.razorpay.CheckoutActivity;
@@ -50,6 +48,7 @@ public class RazorpayDelegate implements ActivityResultListener, ExternalWalletL
     public RazorpayDelegate(Activity activity) {
         this.activity = activity;
         upiTurbo = new UpiTurbo(activity);
+        Log.d("IsTurboPlugin", String.valueOf(upiTurbo.isTurboPluginAvailable(null)));
         this.gson = new Gson();
     }
 
@@ -155,7 +154,7 @@ public void onPaymentSuccess(String paymentId, PaymentData paymentData) {
         if (paymentData.getData().has("razorpay_subscription_id")) {
             try {
                 data.put("razorpay_subscription_id", paymentData.getData().optString("razorpay_subscription_id"));
-            } catch (Exception e) {}
+            } catch (Exception ignored) {}
         }
         reply.put("data", data);
         sendReply(reply);
@@ -197,8 +196,9 @@ public void manageUpiAccounts(String customerMobile, String color, Result result
         upiTurbo.manageUpiAccounts(customerMobile, color, result);
     }
 
-    public  boolean isTurboPluginAvailable(Result result) {
+    public boolean isTurboPluginAvailable(Result result) {
         return upiTurbo.isTurboPluginAvailable(result);
+
     }
 
 }

android/src/standard/java/com/razorpay/razorpay_flutter/UpiTurbo.java

@@ -0,0 +1,36 @@
+package com.razorpay.razorpay_flutter;
+
+import android.app.Activity;
+import java.util.Map;
+
+public class UpiTurbo {
+
+    UpiTurbo(Activity activity) {
+
+    }
+
+    public void setKeyID(String keyId,  Object result){
+
+    }
+
+    public void linkNewUpiAccount(String customerMobile, String color, Object result){
+    }
+
+
+    public void manageUpiAccounts(String customerMobile, String color, Object result){
+
+    }
+
+    public  boolean isTurboPluginAvailable(Object result) {
+        return false;
+    }
+
+    private String toJsonString(Object object){
+     return "" ;
+    }
+
+    private void sendReply(Map<String, Object> data) {
+
+    }
+
+}

android/src/main/java/com/razorpay/razorpay_flutter/UpiTurbo.java → android/src/standardWithTurbo/java/com/razorpay/razorpay_flutter/UpiTurbo.java

@@ -122,4 +122,4 @@ private void sendReply(Map<String, Object> data) {
         }
     }
 
-}
+}

example/.flutter-plugins-dependencies

@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"fluttertoast","path":"/Users/shibu.prasad/.pub-cache/hosted/pub.dev/fluttertoast-8.2.2/","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"/Users/shibu.prasad/.pub-cache/hosted/pub.dev/package_info_plus-4.0.1/","native_build":true,"dependencies":[]},{"name":"razorpay_flutter","path":"/Users/shibu.prasad/AndroidStudioProjects/razorpay-flutter/","native_build":true,"dependencies":["fluttertoast","package_info_plus"]}],"android":[{"name":"fluttertoast","path":"/Users/shibu.prasad/.pub-cache/hosted/pub.dev/fluttertoast-8.2.2/","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"/Users/shibu.prasad/.pub-cache/hosted/pub.dev/package_info_plus-4.0.1/","native_build":true,"dependencies":[]},{"name":"razorpay_flutter","path":"/Users/shibu.prasad/AndroidStudioProjects/razorpay-flutter/","native_build":true,"dependencies":["fluttertoast","package_info_plus"]}],"macos":[{"name":"package_info_plus","path":"/Users/shibu.prasad/.pub-cache/hosted/pub.dev/package_info_plus-4.0.1/","native_build":true,"dependencies":[]}],"linux":[{"name":"package_info_plus","path":"/Users/shibu.prasad/.pub-cache/hosted/pub.dev/package_info_plus-4.0.1/","native_build":false,"dependencies":[]}],"windows":[{"name":"package_info_plus","path":"/Users/shibu.prasad/.pub-cache/hosted/pub.dev/package_info_plus-4.0.1/","native_build":false,"dependencies":[]}],"web":[{"name":"fluttertoast","path":"/Users/shibu.prasad/.pub-cache/hosted/pub.dev/fluttertoast-8.2.2/","dependencies":[]},{"name":"package_info_plus","path":"/Users/shibu.prasad/.pub-cache/hosted/pub.dev/package_info_plus-4.0.1/","dependencies":[]}]},"dependencyGraph":[{"name":"fluttertoast","dependencies":[]},{"name":"package_info_plus","dependencies":[]},{"name":"razorpay_flutter","dependencies":["fluttertoast","package_info_plus"]}],"date_created":"2023-12-06 13:19:25.257691","version":"3.13.9"}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"fluttertoast","path":"/Users/shibu.prasad/.pub-cache/hosted/pub.dev/fluttertoast-8.2.2/","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"/Users/shibu.prasad/.pub-cache/hosted/pub.dev/package_info_plus-4.0.1/","native_build":true,"dependencies":[]},{"name":"razorpay_flutter","path":"/Users/shibu.prasad/AndroidStudioProjects/razorpay-flutter/","native_build":true,"dependencies":["fluttertoast","package_info_plus"]}],"android":[{"name":"fluttertoast","path":"/Users/shibu.prasad/.pub-cache/hosted/pub.dev/fluttertoast-8.2.2/","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"/Users/shibu.prasad/.pub-cache/hosted/pub.dev/package_info_plus-4.0.1/","native_build":true,"dependencies":[]},{"name":"razorpay_flutter","path":"/Users/shibu.prasad/AndroidStudioProjects/razorpay-flutter/","native_build":true,"dependencies":["fluttertoast","package_info_plus"]}],"macos":[{"name":"package_info_plus","path":"/Users/shibu.prasad/.pub-cache/hosted/pub.dev/package_info_plus-4.0.1/","native_build":true,"dependencies":[]}],"linux":[{"name":"package_info_plus","path":"/Users/shibu.prasad/.pub-cache/hosted/pub.dev/package_info_plus-4.0.1/","native_build":false,"dependencies":[]}],"windows":[{"name":"package_info_plus","path":"/Users/shibu.prasad/.pub-cache/hosted/pub.dev/package_info_plus-4.0.1/","native_build":false,"dependencies":[]}],"web":[{"name":"fluttertoast","path":"/Users/shibu.prasad/.pub-cache/hosted/pub.dev/fluttertoast-8.2.2/","dependencies":[]},{"name":"package_info_plus","path":"/Users/shibu.prasad/.pub-cache/hosted/pub.dev/package_info_plus-4.0.1/","dependencies":[]}]},"dependencyGraph":[{"name":"fluttertoast","dependencies":[]},{"name":"package_info_plus","dependencies":[]},{"name":"razorpay_flutter","dependencies":["fluttertoast","package_info_plus"]}],"date_created":"2024-06-18 15:08:43.197563","version":"3.16.4"}

example/android/.gradle/config.properties

@@ -0,0 +1,2 @@
+#Wed Jun 12 00:04:06 IST 2024
+java.home=/Applications/Android Studio.app/Contents/jbr/Contents/Home

example/android/app/build.gradle

@@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion flutter.compileSdkVersion
+    compileSdkVersion 34
     ndkVersion flutter.ndkVersion
 
     compileOptions {
@@ -79,17 +79,20 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.5.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    // Turbo sdk
+    implementation fileTree(dir: 'libs', include: ['*.aar'])
+
+    //Turbo
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
-    implementation 'com.google.code.gson:gson:+'
+    implementation 'com.google.code.gson:gson:2.11.0'
     implementation 'com.github.bumptech.glide:glide:4.15.1'
     implementation  'io.sentry:sentry:6.21.0'
     implementation 'com.segment.analytics.kotlin:android:1.10.2'
 
     kapt 'com.android.databinding:compiler:3.1.4'
 
-    implementation 'com.google.android.gms:play-services-auth:20.2.0'
-    implementation 'com.google.android.gms:play-services-auth-api-phone:18.0.1'
+    implementation 'com.google.android.gms:play-services-auth:21.2.0'
+    implementation 'com.google.android.gms:play-services-auth-api-phone:18.1.0'
+
 }

example/android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

example/android/local.properties

@@ -1,5 +1,5 @@
-sdk.dir=/Users/shibu.prasad/Library/Android/sdk
-flutter.sdk=/Users/shibu.prasad/Developer/flutter
 flutter.buildMode=debug
+flutter.sdk=/Users/shibu.prasad/Developer/flutter
+flutter.versionCode=1
 flutter.versionName=1.0.0
-flutter.versionCode=1
+sdk.dir=/Users/shibu.prasad/Library/Android/sdk

example/lib/main.dart

@@ -215,7 +215,7 @@ class _MyHomePageState extends State<MyHomePage> {
 
   @override
   void initState() {
-    razorpay = Razorpay("rzp_test_qRGYYA5wZrpFvJ").initUpiTurbo();
+    razorpay = Razorpay("rzp_test_5sHeuuremkiApj").initUpiTurbo();
     super.initState();
   }
 

example/pubspec.lock

@@ -37,10 +37,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.2"
+    version: "1.18.0"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -132,10 +132,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   package_info_plus:
     dependency: transitive
     description:
@@ -192,18 +192,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
@@ -224,10 +224,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "0.6.1"
   typed_data:
     dependency: transitive
     description:
@@ -248,10 +248,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.4-beta"
+    version: "0.3.0"
   win32:
     dependency: transitive
     description:
@@ -261,5 +261,5 @@ packages:
     source: hosted
     version: "5.0.2"
 sdks:
-  dart: ">=3.1.0-185.0.dev <4.0.0"
+  dart: ">=3.2.0-194.0.dev <4.0.0"
   flutter: ">=3.3.0"