From 8f863a81423cedad25244e4729180b5889f69127 Mon Sep 17 00:00:00 2001 From: b00lit3 Date: Tue, 31 Oct 2023 13:04:11 +0100 Subject: [PATCH 1/3] upgrade flutter sdk to 3.13 --- ios/Podfile.lock | 6 +- ios/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- pubspec.lock | 228 +++++++++--------- pubspec.yaml | 2 +- 5 files changed, 120 insertions(+), 120 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index febcb70..d403d6c 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -6,17 +6,17 @@ PODS: DEPENDENCIES: - Flutter (from `Flutter`) - - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) EXTERNAL SOURCES: Flutter: :path: Flutter path_provider_foundation: - :path: ".symlinks/plugins/path_provider_foundation/ios" + :path: ".symlinks/plugins/path_provider_foundation/darwin" SPEC CHECKSUMS: Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 - path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8 + path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 48b42f7..333c714 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -156,7 +156,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c87d15a..a6b826d 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ =2.19.6 <3.0.0" - flutter: ">=3.7.0" + dart: ">=3.1.0 <4.0.0" + flutter: ">=3.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index ceaba4c..5828b73 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,7 +18,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: - sdk: ">=2.19.6 <3.0.0" + sdk: ">=3.1.0 <4.0.0" # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions From 50c3212e57e9026697a7b140ed7e38953f83954f Mon Sep 17 00:00:00 2001 From: b00lit3 Date: Tue, 31 Oct 2023 13:04:29 +0100 Subject: [PATCH 2/3] fix android build error --- android/build.gradle | 2 +- android/gradle.properties | 4 +++- android/gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 97e6f5e..0a9d5b3 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -24,6 +24,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/android/gradle.properties b/android/gradle.properties index 94adc3a..eaee2a0 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,3 +1,5 @@ -org.gradle.jvmargs=-Xmx1536M +# org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx1536M -ß-add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED android.useAndroidX=true android.enableJetifier=true + diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index bc6a58a..cfe88f6 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/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-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip From abf8d805389711f69f3f18ccc0dce0cc66b2626f Mon Sep 17 00:00:00 2001 From: b00lit3 Date: Tue, 31 Oct 2023 13:04:56 +0100 Subject: [PATCH 3/3] add missing route --- lib/src/mobile_ui/routes/routes.dart | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/src/mobile_ui/routes/routes.dart b/lib/src/mobile_ui/routes/routes.dart index 928fe07..60b3306 100644 --- a/lib/src/mobile_ui/routes/routes.dart +++ b/lib/src/mobile_ui/routes/routes.dart @@ -73,6 +73,7 @@ class MobileRoutes { static const pg62 = "pg62"; static const pg63 = "pg63"; static const pg64 = "pg64"; + static const pg65 = "pg65"; static const pg66 = "pg66"; static const pg67 = "pg67"; static const pg68 = "pg68"; @@ -95,7 +96,6 @@ class MobileRoutes { static const pg86 = 'pg86'; static const pg87 = 'pg87'; - /// 81 - 100 /// 111 - 120 @@ -107,6 +107,4 @@ class MobileRoutes { /// 161 - 180 static const pg175 = "pg175"; - - }