Skip to content

Commit e9ab6ce

Browse files
renefloorrenefloor
authored
Merge pull request #727 from johnpryan/flutter-beta
Updates for Flutter 3
2 parents 651d43f + 2770463 commit e9ab6ce

25 files changed

+123
-85
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,4 @@ flutter_export_environment.sh
9595
example/.flutter-plugins-dependencies
9696
cached_network_image/example/.flutter-plugins-dependencies
9797
cached_network_image/example/lib/generated_plugin_registrant.dart
98+
cached_network_image/.flutter-plugins-dependencies

‎cached_network_image/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## [3.2.1] - 2022-05-16
2+
* Update to Flutter 3
3+
14
## [3.2.0] - 2021-11-29
25
* Add option to set the log level of the cache manager, for example:
36
```dart

‎cached_network_image/example/android/app/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
2626
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2727

2828
android {
29-
compileSdkVersion 29
29+
compileSdkVersion 31
3030

3131
sourceSets {
3232
main.java.srcDirs += 'src/main/kotlin'
@@ -40,9 +40,10 @@ android {
4040
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
4141
applicationId "com.example.example"
4242
minSdkVersion 16
43-
targetSdkVersion 29
43+
targetSdkVersion 31
4444
versionCode flutterVersionCode.toInteger()
4545
versionName flutterVersionName
46+
ndkVersion = "21.1.6352462"
4647
}
4748

4849
buildTypes {

‎cached_network_image/example/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"

‎cached_network_image/example/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.3.50'
2+
ext.kotlin_version = '1.6.21'
33
repositories {
44
google()
55
jcenter()

‎cached_network_image/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, '9.0'
2+
platform :ios, '9.0'
33

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

‎cached_network_image/example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 57 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 50;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -13,7 +13,7 @@
1313
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1414
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1515
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
16-
98BB5339EB89108D29E1B2A4 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA2CA16DE98EB9E06B62814C /* Pods_Runner.framework */; };
16+
AB05EA0B71D1C5B3647D776A /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA68A63AFC9A967B09C01225 /* Pods_Runner.framework */; };
1717
/* End PBXBuildFile section */
1818

1919
/* Begin PBXCopyFilesBuildPhase section */
@@ -30,51 +30,43 @@
3030
/* End PBXCopyFilesBuildPhase section */
3131

3232
/* Begin PBXFileReference section */
33-
13C1222F286C60499221AF53 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
3433
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
3534
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
3635
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
36+
3EBA925879C24E8DEE4FF978 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
37+
49118D32A574E452ECE131DD /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
3738
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
3839
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
3940
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
41+
8040CB3372DE65824BC141A7 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
4042
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
4143
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
4244
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
4345
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
4446
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4547
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
4648
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
47-
BBE573BC13221AFEBE45314C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
48-
CE04F04819554270A642F7FE /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
49-
FA2CA16DE98EB9E06B62814C /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
49+
FA68A63AFC9A967B09C01225 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5050
/* End PBXFileReference section */
5151

5252
/* Begin PBXFrameworksBuildPhase section */
5353
97C146EB1CF9000F007C117D /* Frameworks */ = {
5454
isa = PBXFrameworksBuildPhase;
5555
buildActionMask = 2147483647;
5656
files = (
57-
98BB5339EB89108D29E1B2A4 /* Pods_Runner.framework in Frameworks */,
57+
AB05EA0B71D1C5B3647D776A /* Pods_Runner.framework in Frameworks */,
5858
);
5959
runOnlyForDeploymentPostprocessing = 0;
6060
};
6161
/* End PBXFrameworksBuildPhase section */
6262

6363
/* Begin PBXGroup section */
64-
034CF645A9B7D4EF58F802BF /* Frameworks */ = {
64+
1E66470B080CC2879BFC75B9 /* Pods */ = {
6565
isa = PBXGroup;
6666
children = (
67-
FA2CA16DE98EB9E06B62814C /* Pods_Runner.framework */,
68-
);
69-
name = Frameworks;
70-
sourceTree = "<group>";
71-
};
72-
53FB9B15F8BB705C7BACDF11 /* Pods */ = {
73-
isa = PBXGroup;
74-
children = (
75-
CE04F04819554270A642F7FE /* Pods-Runner.debug.xcconfig */,
76-
13C1222F286C60499221AF53 /* Pods-Runner.release.xcconfig */,
77-
BBE573BC13221AFEBE45314C /* Pods-Runner.profile.xcconfig */,
67+
8040CB3372DE65824BC141A7 /* Pods-Runner.debug.xcconfig */,
68+
3EBA925879C24E8DEE4FF978 /* Pods-Runner.release.xcconfig */,
69+
49118D32A574E452ECE131DD /* Pods-Runner.profile.xcconfig */,
7870
);
7971
name = Pods;
8072
path = Pods;
@@ -97,8 +89,8 @@
9789
9740EEB11CF90186004384FC /* Flutter */,
9890
97C146F01CF9000F007C117D /* Runner */,
9991
97C146EF1CF9000F007C117D /* Products */,
100-
53FB9B15F8BB705C7BACDF11 /* Pods */,
101-
034CF645A9B7D4EF58F802BF /* Frameworks */,
92+
1E66470B080CC2879BFC75B9 /* Pods */,
93+
C0963003A63539180B2EFC74 /* Frameworks */,
10294
);
10395
sourceTree = "<group>";
10496
};
@@ -125,21 +117,29 @@
125117
path = Runner;
126118
sourceTree = "<group>";
127119
};
120+
C0963003A63539180B2EFC74 /* Frameworks */ = {
121+
isa = PBXGroup;
122+
children = (
123+
FA68A63AFC9A967B09C01225 /* Pods_Runner.framework */,
124+
);
125+
name = Frameworks;
126+
sourceTree = "<group>";
127+
};
128128
/* End PBXGroup section */
129129

130130
/* Begin PBXNativeTarget section */
131131
97C146ED1CF9000F007C117D /* Runner */ = {
132132
isa = PBXNativeTarget;
133133
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
134134
buildPhases = (
135-
16F5CEA012EE11815AC139B1 /* [CP] Check Pods Manifest.lock */,
135+
3FEBC15AEBD348DE76247D59 /* [CP] Check Pods Manifest.lock */,
136136
9740EEB61CF901F6004384FC /* Run Script */,
137137
97C146EA1CF9000F007C117D /* Sources */,
138138
97C146EB1CF9000F007C117D /* Frameworks */,
139139
97C146EC1CF9000F007C117D /* Resources */,
140140
9705A1C41CF9048500538489 /* Embed Frameworks */,
141141
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
142-
A52F6885EBC951C705283767 /* [CP] Embed Pods Frameworks */,
142+
2A7BBDF24242D2CB21D0EF20 /* [CP] Embed Pods Frameworks */,
143143
);
144144
buildRules = (
145145
);
@@ -156,7 +156,7 @@
156156
97C146E61CF9000F007C117D /* Project object */ = {
157157
isa = PBXProject;
158158
attributes = {
159-
LastUpgradeCheck = 1020;
159+
LastUpgradeCheck = 1300;
160160
ORGANIZATIONNAME = "";
161161
TargetAttributes = {
162162
97C146ED1CF9000F007C117D = {
@@ -198,26 +198,21 @@
198198
/* End PBXResourcesBuildPhase section */
199199

200200
/* Begin PBXShellScriptBuildPhase section */
201-
16F5CEA012EE11815AC139B1 /* [CP] Check Pods Manifest.lock */ = {
201+
2A7BBDF24242D2CB21D0EF20 /* [CP] Embed Pods Frameworks */ = {
202202
isa = PBXShellScriptBuildPhase;
203203
buildActionMask = 2147483647;
204204
files = (
205205
);
206206
inputFileListPaths = (
207+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
207208
);
208-
inputPaths = (
209-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
210-
"${PODS_ROOT}/Manifest.lock",
211-
);
212-
name = "[CP] Check Pods Manifest.lock";
209+
name = "[CP] Embed Pods Frameworks";
213210
outputFileListPaths = (
214-
);
215-
outputPaths = (
216-
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
211+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
217212
);
218213
runOnlyForDeploymentPostprocessing = 0;
219214
shellPath = /bin/sh;
220-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
215+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
221216
showEnvVarsInLog = 0;
222217
};
223218
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
@@ -234,36 +229,41 @@
234229
shellPath = /bin/sh;
235230
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
236231
};
237-
9740EEB61CF901F6004384FC /* Run Script */ = {
232+
3FEBC15AEBD348DE76247D59 /* [CP] Check Pods Manifest.lock */ = {
238233
isa = PBXShellScriptBuildPhase;
239234
buildActionMask = 2147483647;
240235
files = (
241236
);
237+
inputFileListPaths = (
238+
);
242239
inputPaths = (
240+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
241+
"${PODS_ROOT}/Manifest.lock",
242+
);
243+
name = "[CP] Check Pods Manifest.lock";
244+
outputFileListPaths = (
243245
);
244-
name = "Run Script";
245246
outputPaths = (
247+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
246248
);
247249
runOnlyForDeploymentPostprocessing = 0;
248250
shellPath = /bin/sh;
249-
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
251+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
252+
showEnvVarsInLog = 0;
250253
};
251-
A52F6885EBC951C705283767 /* [CP] Embed Pods Frameworks */ = {
254+
9740EEB61CF901F6004384FC /* Run Script */ = {
252255
isa = PBXShellScriptBuildPhase;
253256
buildActionMask = 2147483647;
254257
files = (
255258
);
256-
inputFileListPaths = (
257-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
259+
inputPaths = (
258260
);
259-
name = "[CP] Embed Pods Frameworks";
260-
outputFileListPaths = (
261-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
261+
name = "Run Script";
262+
outputPaths = (
262263
);
263264
runOnlyForDeploymentPostprocessing = 0;
264265
shellPath = /bin/sh;
265-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
266-
showEnvVarsInLog = 0;
266+
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
267267
};
268268
/* End PBXShellScriptBuildPhase section */
269269

@@ -358,7 +358,10 @@
358358
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
359359
ENABLE_BITCODE = NO;
360360
INFOPLIST_FILE = Runner/Info.plist;
361-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
361+
LD_RUNPATH_SEARCH_PATHS = (
362+
"$(inherited)",
363+
"@executable_path/Frameworks",
364+
);
362365
PRODUCT_BUNDLE_IDENTIFIER = com.example.example;
363366
PRODUCT_NAME = "$(TARGET_NAME)";
364367
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -482,7 +485,10 @@
482485
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
483486
ENABLE_BITCODE = NO;
484487
INFOPLIST_FILE = Runner/Info.plist;
485-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
488+
LD_RUNPATH_SEARCH_PATHS = (
489+
"$(inherited)",
490+
"@executable_path/Frameworks",
491+
);
486492
PRODUCT_BUNDLE_IDENTIFIER = com.example.example;
487493
PRODUCT_NAME = "$(TARGET_NAME)";
488494
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -501,7 +507,10 @@
501507
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
502508
ENABLE_BITCODE = NO;
503509
INFOPLIST_FILE = Runner/Info.plist;
504-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
510+
LD_RUNPATH_SEARCH_PATHS = (
511+
"$(inherited)",
512+
"@executable_path/Frameworks",
513+
);
505514
PRODUCT_BUNDLE_IDENTIFIER = com.example.example;
506515
PRODUCT_NAME = "$(TARGET_NAME)";
507516
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

‎cached_network_image/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎cached_network_image/example/ios/Runner/Info.plist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,7 @@
4141
</array>
4242
<key>UIViewControllerBasedStatusBarAppearance</key>
4343
<false/>
44+
<key>CADisableMinimumFrameDurationOnPhone</key>
45+
<true/>
4446
</dict>
4547
</plist>

‎cached_network_image/example/lib/main.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:cached_network_image/cached_network_image.dart';
22
import 'package:flutter/material.dart';
3-
import 'package:flutter/widgets.dart';
43
import 'package:baseflow_plugin_template/baseflow_plugin_template.dart';
54
import 'package:flutter_blurhash/flutter_blurhash.dart';
65

0 commit comments

Comments
 (0)