GoHighLevel · dinesh-highlevel · Apr 10, 2024 · Apr 10, 2024 · Apr 10, 2024 · Apr 10, 2024
diff --git a/packages/flutter_libphonenumber/example/android/app/build.gradle b/packages/flutter_libphonenumber/example/android/app/build.gradle
@@ -47,7 +47,7 @@ android {
         applicationId "com.example.flutter_libphonenumber_example"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion 18
+        minSdkVersion flutter.minSdkVersion
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -60,6 +60,7 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    namespace 'com.example.flutter_libphonenumber_example'
 }
 
 flutter {

diff --git a/packages/flutter_libphonenumber/example/android/app/src/debug/AndroidManifest.xml b/packages/flutter_libphonenumber/example/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.flutter_libphonenumber_example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.

diff --git a/packages/flutter_libphonenumber/example/android/app/src/main/AndroidManifest.xml b/packages/flutter_libphonenumber/example/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.flutter_libphonenumber_example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
    <application
         android:label="flutter_libphonenumber_example"
         android:name="${applicationName}"

diff --git a/packages/flutter_libphonenumber/example/android/app/src/profile/AndroidManifest.xml b/packages/flutter_libphonenumber/example/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.flutter_libphonenumber_example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.

diff --git a/packages/flutter_libphonenumber/example/android/build.gradle b/packages/flutter_libphonenumber/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath 'com.android.tools.build:gradle:8.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/packages/flutter_libphonenumber/example/android/gradle.properties b/packages/flutter_libphonenumber/example/android/gradle.properties
@@ -1,3 +1,6 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/packages/flutter_libphonenumber/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/flutter_libphonenumber/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
diff --git a/packages/flutter_libphonenumber/example/ios/Flutter/AppFrameworkInfo.plist b/packages/flutter_libphonenumber/example/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>12.0</string>
 </dict>
 </plist>
diff --git a/packages/flutter_libphonenumber/example/ios/Podfile b/packages/flutter_libphonenumber/example/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '11.0'
+# platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

diff --git a/packages/flutter_libphonenumber/example/ios/Runner.xcodeproj/project.pbxproj b/packages/flutter_libphonenumber/example/ios/Runner.xcodeproj/project.pbxproj
@@ -145,7 +145,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -332,7 +332,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -411,7 +411,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -460,7 +460,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;

diff --git a/...lutter_libphonenumber/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/...lutter_libphonenumber/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/packages/flutter_libphonenumber/pubspec.yaml b/packages/flutter_libphonenumber/pubspec.yaml
@@ -2,7 +2,7 @@ name: flutter_libphonenumber
 description: Leverages libphonenumber to allow for asynchronous and synchronous formatting of phone numbers in Flutter apps.
 repository: https://github.com/bottlepay/flutter_libphonenumber/tree/main/packages/flutter_libphonenumber
 issue_tracker: https://github.com/bottlepay/flutter_libphonenumber/issues
-version: 2.2.1
+version: 2.2.2
 
 environment:
   sdk: ">=2.19.0 <4.0.0"
@@ -27,7 +27,11 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_libphonenumber_android: ^1.0.1
+  flutter_libphonenumber_android:
+    git:
+      url: [email protected]:GoHighLevel/flutter_libphonenumber.git
+      path: packages/flutter_libphonenumber_android
+      ref: 1.0.2_android
   flutter_libphonenumber_ios: ^1.2.0
   flutter_libphonenumber_platform_interface: ^1.0.0
   flutter_libphonenumber_web: ^1.0.0

diff --git a/packages/flutter_libphonenumber_android/android/build.gradle b/packages/flutter_libphonenumber_android/android/build.gradle
@@ -2,14 +2,14 @@ group 'com.bottlepay.flutter_libphonenumber'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:8.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -29,7 +29,7 @@ android {
         namespace("com.bottlepay.flutter_libphonenumber")
     }
 
-    compileSdkVersion 29
+    compileSdk 34
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -40,6 +40,13 @@ android {
     lintOptions {
         disable 'InvalidPackage'
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 }
 
 dependencies {

diff --git a/packages/flutter_libphonenumber_android/android/gradle/wrapper/gradle-wrapper.properties b/packages/flutter_libphonenumber_android/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Wed Apr 10 18:55:40 IST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/packages/flutter_libphonenumber_android/android/src/main/AndroidManifest.xml b/packages/flutter_libphonenumber_android/android/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.bottlepay.flutter_libphonenumber">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>
diff --git a/packages/flutter_libphonenumber_android/example/android/app/build.gradle b/packages/flutter_libphonenumber_android/example/android/app/build.gradle
@@ -60,6 +60,7 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    namespace 'com.bottlepay.flutter_libphonenumber_android_example'
 }
 
 flutter {

diff --git a/packages/flutter_libphonenumber_android/example/android/app/src/debug/AndroidManifest.xml b/packages/flutter_libphonenumber_android/example/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.bottlepay.flutter_libphonenumber_android_example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.

diff --git a/packages/flutter_libphonenumber_android/example/android/app/src/main/AndroidManifest.xml b/packages/flutter_libphonenumber_android/example/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.bottlepay.flutter_libphonenumber_android_example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
    <application
         android:label="flutter_libphonenumber_android_example"
         android:name="${applicationName}"

diff --git a/packages/flutter_libphonenumber_android/example/android/app/src/profile/AndroidManifest.xml b/packages/flutter_libphonenumber_android/example/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.bottlepay.flutter_libphonenumber_android_example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.

diff --git a/packages/flutter_libphonenumber_android/example/android/build.gradle b/packages/flutter_libphonenumber_android/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath 'com.android.tools.build:gradle:8.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -28,4 +28,4 @@ subprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}
diff --git a/packages/flutter_libphonenumber_android/example/android/gradle.properties b/packages/flutter_libphonenumber_android/example/android/gradle.properties
@@ -1,3 +1,6 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/...s/flutter_libphonenumber_android/example/android/gradle/wrapper/gradle-wrapper.properties b/...s/flutter_libphonenumber_android/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
diff --git a/packages/flutter_libphonenumber_web/lib/flutter_libphonenumber_web.dart b/packages/flutter_libphonenumber_web/lib/flutter_libphonenumber_web.dart
@@ -29,7 +29,7 @@ class FlutterLibphonenumberPlugin extends FlutterLibphonenumberPlatform {
         contextName: 'libphonenumber',
         url: libPhoneNumberUrl,
         usesRequireJs: true,
-      )
+      ),
     ];
     final helperScriptTag = html.ScriptElement()
       ..type = 'application/javascript'
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,6 +60,7 @@ android { @@
                 signingConfig signingConfigs.debug
             }
         }
+        namespace 'com.bottlepay.flutter_libphonenumber_android_example'
     }
     flutter {
@@ Expand Down @@