Upgrade for new flutter version & new mobile impl

tmthecoder · tmthecoder · commit da7c48c071ad · 2023-06-17T16:40:18.000-07:00
diff --git a/dargon2_flutter/dargon2_flutter/CHANGELOG.md b/dargon2_flutter/dargon2_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.3.0
+- **Breaking** AGP version for your project must be > 4.2
+- Supports higher AGP versions
+
 ## 3.2.0
 - Fixed broken web features in debug mode
 
diff --git a/dargon2_flutter/dargon2_flutter/example/android/app/build.gradle b/dargon2_flutter/dargon2_flutter/example/android/app/build.gradle
@@ -25,17 +25,15 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
-    lintOptions {
-        disable 'InvalidPackage'
-    }
+    namespace 'com.tejasmehta.dargon2_flutter_example'
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.tejasmehta.dargon2_flutter_example"
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
@@ -47,6 +45,10 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    namespace 'com.tejasmehta.dargon2_flutter_example'
+    lint {
+        disable 'InvalidPackage'
+    }
 }
 
 flutter {
diff --git a/dargon2_flutter/dargon2_flutter/example/android/app/src/debug/AndroidManifest.xml b/dargon2_flutter/dargon2_flutter/example/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.tejasmehta.dargon2_flutter_example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
diff --git a/dargon2_flutter/dargon2_flutter/example/android/app/src/main/AndroidManifest.xml b/dargon2_flutter/dargon2_flutter/example/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.tejasmehta.dargon2_flutter_example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
    <application
         android:label="dargon2_flutter_example"
         android:icon="@mipmap/ic_launcher">
@@ -9,7 +8,8 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
diff --git a/dargon2_flutter/dargon2_flutter/example/android/app/src/profile/AndroidManifest.xml b/dargon2_flutter/dargon2_flutter/example/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.tejasmehta.dargon2_flutter_example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
diff --git a/dargon2_flutter/dargon2_flutter/example/android/build.gradle b/dargon2_flutter/dargon2_flutter/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:8.0.2'
     }
 }
 
@@ -24,6 +24,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/dargon2_flutter/dargon2_flutter/example/android/gradle.properties b/dargon2_flutter/dargon2_flutter/example/android/gradle.properties
@@ -2,3 +2,6 @@ org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
 android.enableR8=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/dargon2_flutter/dargon2_flutter/example/android/gradle/wrapper/gradle-wrapper.properties b/dargon2_flutter/dargon2_flutter/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/dargon2_flutter/dargon2_flutter/example/ios/Podfile.lock b/dargon2_flutter/dargon2_flutter/example/ios/Podfile.lock
@@ -22,8 +22,8 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Argon2Swift: 99482c1b8122a03524b61e41c4903a9548e7c33b
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5
+  integration_test: 13825b8a9334a850581300559b8839134b124670
 
 PODFILE CHECKSUM: d136788676b2ff35bfb9e7c7b33e834ee14e6940
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.0
diff --git a/dargon2_flutter/dargon2_flutter/example/ios/Runner.xcodeproj/project.pbxproj b/dargon2_flutter/dargon2_flutter/example/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -214,10 +214,12 @@
 /* Begin PBXShellScriptBuildPhase section */
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (
@@ -228,6 +230,7 @@
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
diff --git a/dargon2_flutter/dargon2_flutter/example/ios/Runner/Info.plist b/dargon2_flutter/dargon2_flutter/example/ios/Runner/Info.plist
@@ -43,5 +43,7 @@
 	<false/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>
diff --git a/dargon2_flutter/dargon2_flutter/example/pubspec.yaml b/dargon2_flutter/dargon2_flutter/example/pubspec.yaml
@@ -6,7 +6,7 @@ description: Demonstrates how to use the dargon2_flutter plugin.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
 environment:
-  sdk: ">=2.15.0 <3.0.0"
+  sdk: ">=2.15.0 <4.0.0"
 
 dependencies:
   flutter:
@@ -19,7 +19,6 @@ dependencies:
     # The example app is bundled with the plugin so we use a path dependency on
     # the parent directory to use the current plugin's version.
     path: ../
-
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.1
diff --git a/dargon2_flutter/dargon2_flutter/pubspec.yaml b/dargon2_flutter/dargon2_flutter/pubspec.yaml
@@ -2,10 +2,10 @@ name: dargon2_flutter
 description: A Flutter implementation of dargon2, providing Argon2 Password Hashing functionality for mobile & web apps
 repository: https://github.com/tmthecoder/dargon2
 homepage: https://github.com/tmthecoder/dargon2/blob/main/dargon2_flutter
-version: 3.2.0
+version: 3.3.0
 
 environment:
-  sdk: ">=2.14.0 <3.0.0"
+  sdk: ">=2.14.0 <4.0.0"
   flutter: ">=2.5.0"
 
 flutter:
@@ -30,12 +30,10 @@ dependencies:
     sdk: flutter
   meta: ^1.3.0
   dargon2_flutter_platform_interface: '^3.2.0'
-  dargon2_flutter_mobile: '^3.2.0'
+  dargon2_flutter_mobile: '^3.3.0'
   dargon2_flutter_desktop: '^3.2.0'
   dargon2_flutter_web: '^3.2.0'
-  dargon2_interface: '^1.1.0'
-
-
+  dargon2_interface: '^1.1.1'
 
 dev_dependencies:
   flutter_test:

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:4.0.2'`
	`8`	`+ classpath 'com.android.tools.build:gradle:8.0.2'`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`
`@@ -24,6 +24,6 @@ subprojects {`
`24`	`24`	`project.evaluationDependsOn(':app')`
`25`	`25`	`}`
`26`	`26`
`27`		`-task clean(type: Delete) {`
	`27`	`+tasks.register("clean", Delete) {`
`28`	`28`	`delete rootProject.buildDir`
`29`	`29`	`}`