Skip to content

Commit f6bbc80

Browse files
KapdroidKapdroid
authored andcommitted
chore: flutter upgrade to 3.35.7
Signed-off-by: Kapdroid <kapdroid@Kapdroids-MacBook-Pro.local>
1 parent 1eb36cf commit f6bbc80

File tree

11 files changed

+394
-284
lines changed

11 files changed

+394
-284
lines changed

example2/android/app/build.gradle

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
plugins {
2+
id "com.android.application"
3+
id "org.jetbrains.kotlin.android"
4+
id "dev.flutter.flutter-gradle-plugin"
5+
}
6+
17
def localProperties = new Properties()
28
def localPropertiesFile = rootProject.file('local.properties')
39
if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
612
}
713
}
814

9-
def flutterRoot = localProperties.getProperty('flutter.sdk')
10-
if (flutterRoot == null) {
11-
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12-
}
13-
1415
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1516
if (flutterVersionCode == null) {
1617
flutterVersionCode = '1'
@@ -21,12 +22,9 @@ if (flutterVersionName == null) {
2122
flutterVersionName = '1.0'
2223
}
2324

24-
apply plugin: 'com.android.application'
25-
apply plugin: 'kotlin-android'
26-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
27-
2825
android {
29-
compileSdkVersion 33
26+
namespace "com.example.example2"
27+
compileSdk 36
3028

3129
sourceSets {
3230
main.java.srcDirs += 'src/main/kotlin'
@@ -35,12 +33,21 @@ android {
3533
defaultConfig {
3634
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
3735
applicationId "com.example.example2"
38-
minSdkVersion 21
39-
targetSdkVersion 30
36+
minSdkVersion flutter.minSdkVersion
37+
targetSdk 35
4038
versionCode flutterVersionCode.toInteger()
4139
versionName flutterVersionName
4240
}
4341

42+
compileOptions {
43+
sourceCompatibility JavaVersion.VERSION_21
44+
targetCompatibility JavaVersion.VERSION_21
45+
}
46+
47+
kotlinOptions {
48+
jvmTarget = "21"
49+
}
50+
4451
buildTypes {
4552
release {
4653
// TODO: Add your own signing config for the release build.
@@ -55,5 +62,5 @@ flutter {
5562
}
5663

5764
dependencies {
58-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
65+
// No additional dependencies needed
5966
}

example2/android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
android:icon="@mipmap/ic_launcher">
66
<activity
77
android:name=".MainActivity"
8+
android:exported="true"
89
android:launchMode="singleTop"
910
android:theme="@style/LaunchTheme"
1011
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"

example2/android/build.gradle

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,7 @@
1-
buildscript {
2-
ext.kotlin_version = '1.7.20'
3-
repositories {
4-
google()
5-
jcenter()
6-
}
7-
8-
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.2.0'
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
}
12-
}
13-
141
allprojects {
152
repositories {
163
google()
17-
jcenter()
4+
mavenCentral()
185
}
196
}
207

example2/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip

example2/android/settings.gradle

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,25 @@
1-
include ':app'
1+
pluginManagement {
2+
def flutterSdkPath = {
3+
def properties = new Properties()
4+
file("local.properties").withInputStream { properties.load(it) }
5+
def flutterSdkPath = properties.getProperty("flutter.sdk")
6+
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
7+
return flutterSdkPath
8+
}()
29

3-
def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
4-
def properties = new Properties()
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
511

6-
assert localPropertiesFile.exists()
7-
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
12+
repositories {
13+
google()
14+
mavenCentral()
15+
gradlePluginPortal()
16+
}
17+
}
818

9-
def flutterSdkPath = properties.getProperty("flutter.sdk")
10-
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
11-
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
19+
plugins {
20+
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21+
id "com.android.application" version "8.6.0" apply false
22+
id "org.jetbrains.kotlin.android" version "2.1.0" apply false
23+
}
24+
25+
include ":app"

example2/pubspec.lock

Lines changed: 73 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,10 @@ packages:
237237
dependency: transitive
238238
description:
239239
name: dio
240-
sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9"
240+
sha256: d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9
241241
url: "https://pub.dev"
242242
source: hosted
243-
version: "5.8.0+1"
243+
version: "5.9.0"
244244
dio_web_adapter:
245245
dependency: transitive
246246
description:
@@ -294,19 +294,19 @@ packages:
294294
dependency: "direct main"
295295
description:
296296
path: "."
297-
ref: main
298-
resolved-ref: c3e11c9a8526c3f3dfad4f85cc2f6f60c407b319
297+
ref: "flutter_3.35.7"
298+
resolved-ref: "02c1a708b5678cd9a2c325b954cb6a6904d0eacf"
299299
url: "https://github.com/FieldAssist/fa_flutter_core.git"
300300
source: git
301301
version: "2.0.2"
302302
fake_async:
303303
dependency: transitive
304304
description:
305305
name: fake_async
306-
sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
306+
sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
307307
url: "https://pub.dev"
308308
source: hosted
309-
version: "1.3.2"
309+
version: "1.3.3"
310310
ffi:
311311
dependency: transitive
312312
description:
@@ -598,18 +598,10 @@ packages:
598598
dependency: transitive
599599
description:
600600
name: freezed_annotation
601-
sha256: "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8"
602-
url: "https://pub.dev"
603-
source: hosted
604-
version: "3.1.0"
605-
geoclue:
606-
dependency: transitive
607-
description:
608-
name: geoclue
609-
sha256: c2a998c77474fc57aa00c6baa2928e58f4b267649057a1c76738656e9dbd2a7f
601+
sha256: c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2
610602
url: "https://pub.dev"
611603
source: hosted
612-
version: "0.1.1"
604+
version: "2.4.4"
613605
geocoding:
614606
dependency: transitive
615607
description:
@@ -646,18 +638,18 @@ packages:
646638
dependency: transitive
647639
description:
648640
name: geolocator
649-
sha256: "79939537046c9025be47ec645f35c8090ecadb6fe98eba146a0d25e8c1357516"
641+
sha256: f62bcd90459e63210bbf9c35deb6a51c521f992a78de19a1fe5c11704f9530e2
650642
url: "https://pub.dev"
651643
source: hosted
652-
version: "14.0.2"
644+
version: "13.0.4"
653645
geolocator_android:
654646
dependency: transitive
655647
description:
656648
name: geolocator_android
657-
sha256: "179c3cb66dfa674fc9ccbf2be872a02658724d1c067634e2c427cf6df7df901a"
649+
sha256: fcb1760a50d7500deca37c9a666785c047139b5f9ee15aa5469fae7dbbe3170d
658650
url: "https://pub.dev"
659651
source: hosted
660-
version: "5.0.2"
652+
version: "4.6.2"
661653
geolocator_apple:
662654
dependency: transitive
663655
description:
@@ -666,14 +658,6 @@ packages:
666658
url: "https://pub.dev"
667659
source: hosted
668660
version: "2.3.13"
669-
geolocator_linux:
670-
dependency: transitive
671-
description:
672-
name: geolocator_linux
673-
sha256: c4e966f0a7a87e70049eac7a2617f9e16fd4c585a26e4330bdfc3a71e6a721f3
674-
url: "https://pub.dev"
675-
source: hosted
676-
version: "0.2.3"
677661
geolocator_platform_interface:
678662
dependency: transitive
679663
description:
@@ -754,14 +738,6 @@ packages:
754738
url: "https://pub.dev"
755739
source: hosted
756740
version: "0.5.12+2"
757-
gsettings:
758-
dependency: transitive
759-
description:
760-
name: gsettings
761-
sha256: "1b0ce661f5436d2db1e51f3c4295a49849f03d304003a7ba177d01e3a858249c"
762-
url: "https://pub.dev"
763-
source: hosted
764-
version: "0.2.8"
765741
html:
766742
dependency: transitive
767743
description:
@@ -862,10 +838,10 @@ packages:
862838
dependency: transitive
863839
description:
864840
name: in_app_update
865-
sha256: "489572accaa55b51518b2d64676ca8c3c6d4c989fa53cf718001882237691a3c"
841+
sha256: "9924a3efe592e1c0ec89dda3683b3cfec3d4cd02d908e6de00c24b759038ddb1"
866842
url: "https://pub.dev"
867843
source: hosted
868-
version: "4.2.3"
844+
version: "4.2.5"
869845
internet_connection_checker:
870846
dependency: transitive
871847
description:
@@ -894,26 +870,26 @@ packages:
894870
dependency: transitive
895871
description:
896872
name: leak_tracker
897-
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
873+
sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
898874
url: "https://pub.dev"
899875
source: hosted
900-
version: "10.0.8"
876+
version: "11.0.2"
901877
leak_tracker_flutter_testing:
902878
dependency: transitive
903879
description:
904880
name: leak_tracker_flutter_testing
905-
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
881+
sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
906882
url: "https://pub.dev"
907883
source: hosted
908-
version: "3.0.9"
884+
version: "3.0.10"
909885
leak_tracker_testing:
910886
dependency: transitive
911887
description:
912888
name: leak_tracker_testing
913-
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
889+
sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
914890
url: "https://pub.dev"
915891
source: hosted
916-
version: "3.0.1"
892+
version: "3.0.2"
917893
lints:
918894
dependency: transitive
919895
description:
@@ -1074,6 +1050,54 @@ packages:
10741050
url: "https://pub.dev"
10751051
source: hosted
10761052
version: "2.3.0"
1053+
permission_handler:
1054+
dependency: transitive
1055+
description:
1056+
name: permission_handler
1057+
sha256: "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849"
1058+
url: "https://pub.dev"
1059+
source: hosted
1060+
version: "11.4.0"
1061+
permission_handler_android:
1062+
dependency: transitive
1063+
description:
1064+
name: permission_handler_android
1065+
sha256: d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc
1066+
url: "https://pub.dev"
1067+
source: hosted
1068+
version: "12.1.0"
1069+
permission_handler_apple:
1070+
dependency: transitive
1071+
description:
1072+
name: permission_handler_apple
1073+
sha256: f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023
1074+
url: "https://pub.dev"
1075+
source: hosted
1076+
version: "9.4.7"
1077+
permission_handler_html:
1078+
dependency: transitive
1079+
description:
1080+
name: permission_handler_html
1081+
sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24"
1082+
url: "https://pub.dev"
1083+
source: hosted
1084+
version: "0.1.3+5"
1085+
permission_handler_platform_interface:
1086+
dependency: transitive
1087+
description:
1088+
name: permission_handler_platform_interface
1089+
sha256: eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878
1090+
url: "https://pub.dev"
1091+
source: hosted
1092+
version: "4.3.0"
1093+
permission_handler_windows:
1094+
dependency: transitive
1095+
description:
1096+
name: permission_handler_windows
1097+
sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e"
1098+
url: "https://pub.dev"
1099+
source: hosted
1100+
version: "0.2.1"
10771101
petitparser:
10781102
dependency: transitive
10791103
description:
@@ -1371,10 +1395,10 @@ packages:
13711395
dependency: transitive
13721396
description:
13731397
name: test_api
1374-
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
1398+
sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
13751399
url: "https://pub.dev"
13761400
source: hosted
1377-
version: "0.7.4"
1401+
version: "0.7.6"
13781402
time:
13791403
dependency: transitive
13801404
description:
@@ -1491,10 +1515,10 @@ packages:
14911515
dependency: transitive
14921516
description:
14931517
name: vector_math
1494-
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
1518+
sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
14951519
url: "https://pub.dev"
14961520
source: hosted
1497-
version: "2.1.4"
1521+
version: "2.2.0"
14981522
vm_service:
14991523
dependency: transitive
15001524
description:
@@ -1576,5 +1600,5 @@ packages:
15761600
source: hosted
15771601
version: "6.5.0"
15781602
sdks:
1579-
dart: ">=3.7.0 <4.0.0"
1603+
dart: ">=3.9.0 <4.0.0"
15801604
flutter: ">=3.29.0"

0 commit comments

Comments
 (0)