namespace updated, package_info_plus removed

bug-fix: added namespace to build.gradle
chore: update AGP and gradle to 7.1.3 and 7.5 respectively to support 'namespace' declaration
chore: removed package_info_plus dependency due to clashing versions. PackageName is now set when the Delegate is initialized.

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:7.1.3'
     }
 }
 
@@ -22,10 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 31
-
+    compileSdkVersion 34
+   namespace 'com.razorpay.razorpay_flutter'
     defaultConfig {
         minSdkVersion 19
+        targetSdkVersion 34
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     lintOptions {

android/gradle.properties

@@ -1 +1,16 @@
+## For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+#
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. For more details, visit
+# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
+# org.gradle.parallel=true
+#Mon May 27 12:12:58 IST 2024
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536M

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/src/main/java/com/razorpay/razorpay_flutter/RazorpayDelegate.java

@@ -52,13 +52,11 @@ void setPackageName(String packageName){
     void openCheckout(Map<String, Object> arguments, Result result) {
 
         this.pendingResult = result;
-
         JSONObject options = new JSONObject(arguments);
         if (activity.getPackageName().equalsIgnoreCase(packageName)){
             Intent intent = new Intent(activity, CheckoutActivity.class);
             intent.putExtra("OPTIONS", options.toString());
             intent.putExtra("FRAMEWORK", "flutter");
-
             activity.startActivityForResult(intent, Checkout.RZP_REQUEST_CODE);
         }
 

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

@@ -1,5 +1,7 @@
 package com.razorpay.razorpay_flutter;
 
+import android.util.Log;
+
 import androidx.annotation.NonNull;
 
 import org.json.JSONException;
@@ -53,6 +55,7 @@ public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
      */
     private RazorpayFlutterPlugin(Registrar registrar) {
         this.razorpayDelegate = new RazorpayDelegate(registrar.activity());
+        this.razorpayDelegate.setPackageName(registrar.activity().getPackageName());
         registrar.addActivityResultListener(razorpayDelegate);
     }
 
@@ -67,10 +70,6 @@ public void onMethodCall(MethodCall call, Result result) {
                 razorpayDelegate.openCheckout((Map<String, Object>) call.arguments, result);
                 break;
 
-            case "setPackageName":
-                razorpayDelegate.setPackageName((String)call.arguments);
-                break;
-
             case "resync":
                 razorpayDelegate.resync(result);
                 break;
@@ -86,6 +85,7 @@ public void onMethodCall(MethodCall call, Result result) {
     public void onAttachedToActivity(@NonNull ActivityPluginBinding binding) {
         this.razorpayDelegate = new RazorpayDelegate(binding.getActivity());
         this.pluginBinding = binding;
+        razorpayDelegate.setPackageName(binding.getActivity().getPackageName());
         binding.addActivityResultListener(razorpayDelegate);
     }
 

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/vivek.shindhe/.pub-cache/hosted/pub.dev/fluttertoast-8.2.2/","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"/Users/vivek.shindhe/.pub-cache/hosted/pub.dev/package_info_plus-4.0.1/","native_build":true,"dependencies":[]},{"name":"razorpay_flutter","path":"/Users/vivek.shindhe/Razorpay/Flutter/razorpay-flutter/","native_build":true,"dependencies":["fluttertoast","package_info_plus"]}],"android":[{"name":"fluttertoast","path":"/Users/vivek.shindhe/.pub-cache/hosted/pub.dev/fluttertoast-8.2.2/","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"/Users/vivek.shindhe/.pub-cache/hosted/pub.dev/package_info_plus-4.0.1/","native_build":true,"dependencies":[]},{"name":"razorpay_flutter","path":"/Users/vivek.shindhe/Razorpay/Flutter/razorpay-flutter/","native_build":true,"dependencies":["fluttertoast","package_info_plus"]}],"macos":[{"name":"package_info_plus","path":"/Users/vivek.shindhe/.pub-cache/hosted/pub.dev/package_info_plus-4.0.1/","native_build":true,"dependencies":[]}],"linux":[{"name":"package_info_plus","path":"/Users/vivek.shindhe/.pub-cache/hosted/pub.dev/package_info_plus-4.0.1/","native_build":false,"dependencies":[]}],"windows":[{"name":"package_info_plus","path":"/Users/vivek.shindhe/.pub-cache/hosted/pub.dev/package_info_plus-4.0.1/","native_build":false,"dependencies":[]}],"web":[{"name":"fluttertoast","path":"/Users/vivek.shindhe/.pub-cache/hosted/pub.dev/fluttertoast-8.2.2/","dependencies":[]},{"name":"package_info_plus","path":"/Users/vivek.shindhe/.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-01-10 16:42:19.459133","version":"3.13.6"}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"fluttertoast","path":"/Users/vivek.shindhe/.pub-cache/hosted/pub.dev/fluttertoast-8.2.5/","native_build":true,"dependencies":[]},{"name":"razorpay_flutter","path":"/Users/vivek.shindhe/Razorpay/Flutter/razorpay-flutter/","native_build":true,"dependencies":["fluttertoast"]}],"android":[{"name":"fluttertoast","path":"/Users/vivek.shindhe/.pub-cache/hosted/pub.dev/fluttertoast-8.2.5/","native_build":true,"dependencies":[]},{"name":"razorpay_flutter","path":"/Users/vivek.shindhe/Razorpay/Flutter/razorpay-flutter/","native_build":true,"dependencies":["fluttertoast"]}],"macos":[],"linux":[],"windows":[],"web":[{"name":"fluttertoast","path":"/Users/vivek.shindhe/.pub-cache/hosted/pub.dev/fluttertoast-8.2.5/","dependencies":[]}]},"dependencyGraph":[{"name":"fluttertoast","dependencies":[]},{"name":"razorpay_flutter","dependencies":["fluttertoast"]}],"date_created":"2024-05-27 12:19:23.874930","version":"3.22.0"}

example/.fvm/flutter_sdk

@@ -0,0 +1 @@
+/Users/vivek.shindhe/fvm/versions/3.22.0

example/.fvm/fvm_config.json

@@ -0,0 +1,4 @@
+{
+  "flutterSdkVersion": "3.22.0",
+  "flavors": {}
+}

example/android/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Sun May 26 15:05:25 IST 2024
+gradle.version=7.4

example/android/.gradle/config.properties

@@ -0,0 +1,2 @@
+#Sun May 26 14:54:26 IST 2024
+java.home=/Applications/Android Studio.app/Contents/jbr/Contents/Home

example/android/app/build.gradle

@@ -47,7 +47,7 @@ android {
         applicationId "com.razorpay.razorpay_flutter.example"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
-        minSdkVersion 19
+        minSdkVersion flutter.minSdkVersion
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -70,5 +70,6 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.android.support:multidex:1.0.3'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 }

example/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java

@@ -0,0 +1,25 @@
+// Generated file.
+//
+// If you wish to remove Flutter's multidex support, delete this entire file.
+//
+// Modifications to this file should be done in a copy under a different name
+// as this file may be regenerated.
+
+package io.flutter.app;
+
+import android.app.Application;
+import android.content.Context;
+import androidx.annotation.CallSuper;
+import androidx.multidex.MultiDex;
+
+/**
+ * Extension of {@link android.app.Application}, adding multidex support.
+ */
+public class FlutterMultiDexApplication extends Application {
+  @Override
+  @CallSuper
+  protected void attachBaseContext(Context base) {
+    super.attachBaseContext(base);
+    MultiDex.install(this);
+  }
+}

example/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java

@@ -20,11 +20,6 @@ public static void registerWith(@NonNull FlutterEngine flutterEngine) {
     } catch (Exception e) {
       Log.e(TAG, "Error registering plugin fluttertoast, io.github.ponnamkarthik.toast.fluttertoast.FlutterToastPlugin", e);
     }
-    try {
-      flutterEngine.getPlugins().add(new dev.fluttercommunity.plus.packageinfo.PackageInfoPlugin());
-    } catch (Exception e) {
-      Log.e(TAG, "Error registering plugin package_info_plus, dev.fluttercommunity.plus.packageinfo.PackageInfoPlugin", e);
-    }
     try {
       flutterEngine.getPlugins().add(new com.razorpay.razorpay_flutter.RazorpayFlutterPlugin());
     } catch (Exception e) {

example/android/gradlew

@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"