Skip to content

Commit 19f4369

Browse files
bugnanobugnano
authored
Merge pull request #575 from talkjs/chore/update-flutter-version
Updated Flutter SDK
2 parents 2c938eb + e65bd4e commit 19f4369

File tree

9 files changed

+436
-237
lines changed

9 files changed

+436
-237
lines changed

‎flutter_sdk/basic-example/android/app/build.gradle

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
plugins {
2+
id "com.android.application"
3+
id "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,21 +22,19 @@ 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+
compileSdkVersion 36
3027
namespace "com.example.flutter_sdk"
3128

3229
compileOptions {
33-
sourceCompatibility JavaVersion.VERSION_1_8
34-
targetCompatibility JavaVersion.VERSION_1_8
30+
coreLibraryDesugaringEnabled = true
31+
32+
sourceCompatibility JavaVersion.VERSION_17
33+
targetCompatibility JavaVersion.VERSION_17
3534
}
3635

3736
kotlinOptions {
38-
jvmTarget = '1.8'
37+
jvmTarget = '17'
3938
}
4039

4140
sourceSets {
@@ -45,8 +44,8 @@ android {
4544
defaultConfig {
4645
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
4746
applicationId "com.example.flutter_sdk"
48-
minSdkVersion 21
49-
targetSdkVersion 33
47+
minSdkVersion 23
48+
targetSdkVersion 36
5049
versionCode flutterVersionCode.toInteger()
5150
versionName flutterVersionName
5251
}
@@ -66,5 +65,5 @@ flutter {
6665
}
6766

6867
dependencies {
69-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
68+
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
7069
}

‎flutter_sdk/basic-example/android/build.gradle

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
buildscript {
2-
ext.kotlin_version = '1.9.22'
3-
repositories {
4-
google()
5-
mavenCentral()
6-
}
7-
8-
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.4.2'
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
}
12-
}
13-
141
allprojects {
152
repositories {
163
google()

‎flutter_sdk/basic-example/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

‎flutter_sdk/basic-example/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" // apply true
21+
id "com.android.application" version "8.12.0" apply false
22+
id "org.jetbrains.kotlin.android" version "2.2.0" apply false
23+
}
24+
25+
include ":app"

‎flutter_sdk/basic-example/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
platform :ios, '12.0'
2+
platform :ios, '15.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

‎flutter_sdk/basic-example/ios/Podfile.lock

Lines changed: 88 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,87 @@
11
PODS:
2-
- Firebase/CoreOnly (10.18.0):
3-
- FirebaseCore (= 10.18.0)
4-
- Firebase/Messaging (10.18.0):
2+
- Firebase/CoreOnly (12.0.0):
3+
- FirebaseCore (~> 12.0.0)
4+
- Firebase/Messaging (12.0.0):
55
- Firebase/CoreOnly
6-
- FirebaseMessaging (~> 10.18.0)
7-
- firebase_core (2.24.2):
8-
- Firebase/CoreOnly (= 10.18.0)
6+
- FirebaseMessaging (~> 12.0.0)
7+
- firebase_core (4.0.0):
8+
- Firebase/CoreOnly (= 12.0.0)
99
- Flutter
10-
- firebase_messaging (14.7.10):
11-
- Firebase/Messaging (= 10.18.0)
10+
- firebase_messaging (16.0.0):
11+
- Firebase/Messaging (= 12.0.0)
1212
- firebase_core
1313
- Flutter
14-
- FirebaseCore (10.18.0):
15-
- FirebaseCoreInternal (~> 10.0)
16-
- GoogleUtilities/Environment (~> 7.12)
17-
- GoogleUtilities/Logger (~> 7.12)
18-
- FirebaseCoreInternal (10.19.0):
19-
- "GoogleUtilities/NSData+zlib (~> 7.8)"
20-
- FirebaseInstallations (10.19.0):
21-
- FirebaseCore (~> 10.0)
22-
- GoogleUtilities/Environment (~> 7.8)
23-
- GoogleUtilities/UserDefaults (~> 7.8)
24-
- PromisesObjC (~> 2.1)
25-
- FirebaseMessaging (10.18.0):
26-
- FirebaseCore (~> 10.0)
27-
- FirebaseInstallations (~> 10.0)
28-
- GoogleDataTransport (~> 9.2)
29-
- GoogleUtilities/AppDelegateSwizzler (~> 7.8)
30-
- GoogleUtilities/Environment (~> 7.8)
31-
- GoogleUtilities/Reachability (~> 7.8)
32-
- GoogleUtilities/UserDefaults (~> 7.8)
33-
- nanopb (< 2.30910.0, >= 2.30908.0)
14+
- FirebaseCore (12.0.0):
15+
- FirebaseCoreInternal (~> 12.0.0)
16+
- GoogleUtilities/Environment (~> 8.1)
17+
- GoogleUtilities/Logger (~> 8.1)
18+
- FirebaseCoreInternal (12.0.0):
19+
- "GoogleUtilities/NSData+zlib (~> 8.1)"
20+
- FirebaseInstallations (12.0.0):
21+
- FirebaseCore (~> 12.0.0)
22+
- GoogleUtilities/Environment (~> 8.1)
23+
- GoogleUtilities/UserDefaults (~> 8.1)
24+
- PromisesObjC (~> 2.4)
25+
- FirebaseMessaging (12.0.0):
26+
- FirebaseCore (~> 12.0.0)
27+
- FirebaseInstallations (~> 12.0.0)
28+
- GoogleDataTransport (~> 10.1)
29+
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
30+
- GoogleUtilities/Environment (~> 8.1)
31+
- GoogleUtilities/Reachability (~> 8.1)
32+
- GoogleUtilities/UserDefaults (~> 8.1)
33+
- nanopb (~> 3.30910.0)
3434
- Flutter (1.0.0)
3535
- flutter_apns_only (0.0.1):
3636
- Flutter
3737
- flutter_local_notifications (0.0.1):
3838
- Flutter
39-
- GoogleDataTransport (9.3.0):
40-
- GoogleUtilities/Environment (~> 7.7)
41-
- nanopb (< 2.30910.0, >= 2.30908.0)
42-
- PromisesObjC (< 3.0, >= 1.2)
43-
- GoogleUtilities/AppDelegateSwizzler (7.12.0):
39+
- GoogleDataTransport (10.1.0):
40+
- nanopb (~> 3.30910.0)
41+
- PromisesObjC (~> 2.4)
42+
- GoogleUtilities/AppDelegateSwizzler (8.1.0):
4443
- GoogleUtilities/Environment
4544
- GoogleUtilities/Logger
4645
- GoogleUtilities/Network
47-
- GoogleUtilities/Environment (7.12.0):
48-
- PromisesObjC (< 3.0, >= 1.2)
49-
- GoogleUtilities/Logger (7.12.0):
46+
- GoogleUtilities/Privacy
47+
- GoogleUtilities/Environment (8.1.0):
48+
- GoogleUtilities/Privacy
49+
- GoogleUtilities/Logger (8.1.0):
5050
- GoogleUtilities/Environment
51-
- GoogleUtilities/Network (7.12.0):
51+
- GoogleUtilities/Privacy
52+
- GoogleUtilities/Network (8.1.0):
5253
- GoogleUtilities/Logger
5354
- "GoogleUtilities/NSData+zlib"
55+
- GoogleUtilities/Privacy
5456
- GoogleUtilities/Reachability
55-
- "GoogleUtilities/NSData+zlib (7.12.0)"
56-
- GoogleUtilities/Reachability (7.12.0):
57+
- "GoogleUtilities/NSData+zlib (8.1.0)":
58+
- GoogleUtilities/Privacy
59+
- GoogleUtilities/Privacy (8.1.0)
60+
- GoogleUtilities/Reachability (8.1.0):
5761
- GoogleUtilities/Logger
58-
- GoogleUtilities/UserDefaults (7.12.0):
62+
- GoogleUtilities/Privacy
63+
- GoogleUtilities/UserDefaults (8.1.0):
5964
- GoogleUtilities/Logger
60-
- nanopb (2.30909.1):
61-
- nanopb/decode (= 2.30909.1)
62-
- nanopb/encode (= 2.30909.1)
63-
- nanopb/decode (2.30909.1)
64-
- nanopb/encode (2.30909.1)
65-
- OrderedSet (5.0.0)
66-
- permission_handler_apple (9.1.1):
65+
- GoogleUtilities/Privacy
66+
- nanopb (3.30910.0):
67+
- nanopb/decode (= 3.30910.0)
68+
- nanopb/encode (= 3.30910.0)
69+
- nanopb/decode (3.30910.0)
70+
- nanopb/encode (3.30910.0)
71+
- OrderedSet (6.0.3)
72+
- permission_handler_apple (9.3.0):
6773
- Flutter
68-
- PromisesObjC (2.3.1)
69-
- talkjs_flutter_inappwebview (0.0.1):
74+
- PromisesObjC (2.4.0)
75+
- shared_preferences_foundation (0.0.1):
7076
- Flutter
71-
- OrderedSet (~> 5.0)
72-
- talkjs_flutter_inappwebview/Core (= 0.0.1)
73-
- talkjs_flutter_inappwebview/Core (0.0.1):
77+
- FlutterMacOS
78+
- talkjs_flutter_inappwebview_ios (0.0.1):
7479
- Flutter
75-
- OrderedSet (~> 5.0)
80+
- OrderedSet (~> 6.0.3)
81+
- talkjs_flutter_inappwebview_ios/Core (= 0.0.1)
82+
- talkjs_flutter_inappwebview_ios/Core (0.0.1):
83+
- Flutter
84+
- OrderedSet (~> 6.0.3)
7685
- url_launcher_ios (0.0.1):
7786
- Flutter
7887

@@ -83,7 +92,8 @@ DEPENDENCIES:
8392
- flutter_apns_only (from `.symlinks/plugins/flutter_apns_only/ios`)
8493
- flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
8594
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
86-
- talkjs_flutter_inappwebview (from `.symlinks/plugins/talkjs_flutter_inappwebview/ios`)
95+
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
96+
- talkjs_flutter_inappwebview_ios (from `.symlinks/plugins/talkjs_flutter_inappwebview_ios/ios`)
8797
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
8898

8999
SPEC REPOS:
@@ -112,31 +122,34 @@ EXTERNAL SOURCES:
112122
:path: ".symlinks/plugins/flutter_local_notifications/ios"
113123
permission_handler_apple:
114124
:path: ".symlinks/plugins/permission_handler_apple/ios"
115-
talkjs_flutter_inappwebview:
116-
:path: ".symlinks/plugins/talkjs_flutter_inappwebview/ios"
125+
shared_preferences_foundation:
126+
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
127+
talkjs_flutter_inappwebview_ios:
128+
:path: ".symlinks/plugins/talkjs_flutter_inappwebview_ios/ios"
117129
url_launcher_ios:
118130
:path: ".symlinks/plugins/url_launcher_ios/ios"
119131

120132
SPEC CHECKSUMS:
121-
Firebase: 414ad272f8d02dfbf12662a9d43f4bba9bec2a06
122-
firebase_core: 0af4a2b24f62071f9bf283691c0ee41556dcb3f5
123-
firebase_messaging: 90e8a6db84b6e1e876cebce4f30f01dc495e7014
124-
FirebaseCore: 2322423314d92f946219c8791674d2f3345b598f
125-
FirebaseCoreInternal: b444828ea7cfd594fca83046b95db98a2be4f290
126-
FirebaseInstallations: 033d199474164db20c8350736842a94fe717b960
127-
FirebaseMessaging: 9bc34a98d2e0237e1b121915120d4d48ddcf301e
133+
Firebase: 800d487043c0557d9faed71477a38d9aafb08a41
134+
firebase_core: 633e1851ffe1b9ab875f6467a4f574c79cef02e4
135+
firebase_messaging: d17feef781edc84ebefe62624fb384358ad96361
136+
FirebaseCore: 055f4ab117d5964158c833f3d5e7ec6d91648d4a
137+
FirebaseCoreInternal: dedc28e569a4be85f38f3d6af1070a2e12018d55
138+
FirebaseInstallations: d4c7c958f99c8860d7fcece786314ae790e2f988
139+
FirebaseMessaging: af49f8d7c0a3d2a017d9302c80946f45a7777dde
128140
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
129-
flutter_apns_only: 3d91c0ca9dbef4439874858590909a19f8ed06a4
130-
flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
131-
GoogleDataTransport: 57c22343ab29bc686febbf7cbb13bad167c2d8fe
132-
GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34
133-
nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5
134-
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
135-
permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
136-
PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
137-
talkjs_flutter_inappwebview: e2694be5b6e68fa6adb4e86802c4eb51deb066af
138-
url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
141+
flutter_apns_only: bd278c53433cb01cd66152843f7247fe10b9a9ea
142+
flutter_local_notifications: 395056b3175ba4f08480a7c5de30cd36d69827e4
143+
GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
144+
GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
145+
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
146+
OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
147+
permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
148+
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
149+
shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
150+
talkjs_flutter_inappwebview_ios: 7377d9e8e968c501ec76341c88092fd8ea389f6c
151+
url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
139152

140-
PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048
153+
PODFILE CHECKSUM: 57c8aed26fba39d3ec9424816221f294a07c58eb
141154

142-
COCOAPODS: 1.13.0
155+
COCOAPODS: 1.16.2

‎flutter_sdk/basic-example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@
139139
9705A1C41CF9048500538489 /* Embed Frameworks */,
140140
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
141141
8F79D9EF695B6105947C5EA7 /* [CP] Embed Pods Frameworks */,
142+
10E31F043DE8043004DF97A2 /* [CP] Copy Pods Resources */,
142143
);
143144
buildRules = (
144145
);
@@ -197,6 +198,23 @@
197198
/* End PBXResourcesBuildPhase section */
198199

199200
/* Begin PBXShellScriptBuildPhase section */
201+
10E31F043DE8043004DF97A2 /* [CP] Copy Pods Resources */ = {
202+
isa = PBXShellScriptBuildPhase;
203+
buildActionMask = 2147483647;
204+
files = (
205+
);
206+
inputFileListPaths = (
207+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
208+
);
209+
name = "[CP] Copy Pods Resources";
210+
outputFileListPaths = (
211+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
212+
);
213+
runOnlyForDeploymentPostprocessing = 0;
214+
shellPath = /bin/sh;
215+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
216+
showEnvVarsInLog = 0;
217+
};
200218
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
201219
isa = PBXShellScriptBuildPhase;
202220
buildActionMask = 2147483647;

0 commit comments

Comments
 (0)