Skip to content

Commit 05dcb02

Browse files
stuartmorgan-gstuartmorgan-g
authored
Merge branch 'main' into tool-update-pub-credential-location
2 parents 702523c + 12d6717 commit 05dcb02

File tree

40 files changed

+417
-50
lines changed

40 files changed

+417
-50
lines changed

‎.ci/flutter_stable.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f72efea43c3013323d1b95cff571f3c1caa37583
1+
84a1e904f44f9b0e9c4510138010edcc653163f8

‎packages/camera/camera_android_camerax/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.5.0+1
2+
3+
* Update `README.md` to include known duplicate Kotlin classes issue.
4+
15
## 0.5.0
26

37
* Initial release of this `camera` implementation that supports:

‎packages/camera/camera_android_camerax/README.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,15 @@ Any specified `ResolutionPreset` wll go unused in favor of CameraX defaults and
4949

5050
`setZoomLevel` is unimplemented.
5151

52+
## Known Issues
53+
54+
### Receiving `Duplicate class kotlin.*` error
55+
56+
If you receive a `Duplicate class kotlin.*` error when using this plugin
57+
implementation, you may need to update your app's Kotlin version. You can do
58+
this by finding your app's `android/build.gradle` file and updating the
59+
`org.jetbrains.kotlin:kotlin-stdlib-jdk7` dependency to at least version 1.18.10.
60+
5261
## Contributing
5362

5463
For more information on contributing to this plugin, see [`CONTRIBUTING.md`](CONTRIBUTING.md).

‎packages/camera/camera_android_camerax/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Android implementation of the camera plugin using the CameraX libra
33
repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android_camerax
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
55

6-
version: 0.5.0
6+
version: 0.5.0+1
77

88
environment:
99
sdk: ">=2.19.0 <4.0.0"

‎packages/dynamic_layouts/example/ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>9.0</string>
24+
<string>11.0</string>
2525
</dict>
2626
</plist>

‎packages/dynamic_layouts/example/ios/Runner.xcodeproj/project.pbxproj‎

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

99
/* Begin PBXBuildFile section */
@@ -171,6 +171,7 @@
171171
/* Begin PBXShellScriptBuildPhase section */
172172
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
173173
isa = PBXShellScriptBuildPhase;
174+
alwaysOutOfDate = 1;
174175
buildActionMask = 2147483647;
175176
files = (
176177
);
@@ -185,6 +186,7 @@
185186
};
186187
9740EEB61CF901F6004384FC /* Run Script */ = {
187188
isa = PBXShellScriptBuildPhase;
189+
alwaysOutOfDate = 1;
188190
buildActionMask = 2147483647;
189191
files = (
190192
);
@@ -272,7 +274,7 @@
272274
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
273275
GCC_WARN_UNUSED_FUNCTION = YES;
274276
GCC_WARN_UNUSED_VARIABLE = YES;
275-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
277+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
276278
MTL_ENABLE_DEBUG_INFO = NO;
277279
SDKROOT = iphoneos;
278280
SUPPORTED_PLATFORMS = iphoneos;
@@ -349,7 +351,7 @@
349351
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
350352
GCC_WARN_UNUSED_FUNCTION = YES;
351353
GCC_WARN_UNUSED_VARIABLE = YES;
352-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
354+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
353355
MTL_ENABLE_DEBUG_INFO = YES;
354356
ONLY_ACTIVE_ARCH = YES;
355357
SDKROOT = iphoneos;
@@ -398,7 +400,7 @@
398400
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
399401
GCC_WARN_UNUSED_FUNCTION = YES;
400402
GCC_WARN_UNUSED_VARIABLE = YES;
401-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
403+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
402404
MTL_ENABLE_DEBUG_INFO = NO;
403405
SDKROOT = iphoneos;
404406
SUPPORTED_PLATFORMS = iphoneos;

‎packages/dynamic_layouts/example/ios/Runner/Info.plist‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,7 @@
4545
<false/>
4646
<key>CADisableMinimumFrameDurationOnPhone</key>
4747
<true/>
48+
<key>UIApplicationSupportsIndirectInputEvents</key>
49+
<true/>
4850
</dict>
4951
</plist>

‎packages/extension_google_sign_in_as_googleapis_auth/example/ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>9.0</string>
24+
<string>11.0</string>
2525
</dict>
2626
</plist>

‎packages/extension_google_sign_in_as_googleapis_auth/example/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 74 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 50;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1111
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
12+
3FE07DF92700035B2B89559A /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 55916FA543087998FC65DEA4 /* libPods-Runner.a */; };
1213
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
1314
97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
1415
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -33,9 +34,12 @@
3334
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
3435
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
3536
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
37+
55916FA543087998FC65DEA4 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
38+
6F36D2D4BD58A793981ABE04 /* 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>"; };
3639
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
3740
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
3841
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
42+
807BF5889F65A1C1BEF7302C /* 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>"; };
3943
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
4044
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
4145
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -44,19 +48,40 @@
4448
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4549
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
4650
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
51+
E6399F4B789B6B3E1623D022 /* 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>"; };
4752
/* End PBXFileReference section */
4853

4954
/* Begin PBXFrameworksBuildPhase section */
5055
97C146EB1CF9000F007C117D /* Frameworks */ = {
5156
isa = PBXFrameworksBuildPhase;
5257
buildActionMask = 2147483647;
5358
files = (
59+
3FE07DF92700035B2B89559A /* libPods-Runner.a in Frameworks */,
5460
);
5561
runOnlyForDeploymentPostprocessing = 0;
5662
};
5763
/* End PBXFrameworksBuildPhase section */
5864

5965
/* Begin PBXGroup section */
66+
3A6CF7EF6C0C80E66C0BA0F7 /* Frameworks */ = {
67+
isa = PBXGroup;
68+
children = (
69+
55916FA543087998FC65DEA4 /* libPods-Runner.a */,
70+
);
71+
name = Frameworks;
72+
sourceTree = "<group>";
73+
};
74+
6CA61DD4EAA7A6CE52EBE5F0 /* Pods */ = {
75+
isa = PBXGroup;
76+
children = (
77+
6F36D2D4BD58A793981ABE04 /* Pods-Runner.debug.xcconfig */,
78+
E6399F4B789B6B3E1623D022 /* Pods-Runner.release.xcconfig */,
79+
807BF5889F65A1C1BEF7302C /* Pods-Runner.profile.xcconfig */,
80+
);
81+
name = Pods;
82+
path = Pods;
83+
sourceTree = "<group>";
84+
};
6085
9740EEB11CF90186004384FC /* Flutter */ = {
6186
isa = PBXGroup;
6287
children = (
@@ -74,6 +99,8 @@
7499
9740EEB11CF90186004384FC /* Flutter */,
75100
97C146F01CF9000F007C117D /* Runner */,
76101
97C146EF1CF9000F007C117D /* Products */,
102+
6CA61DD4EAA7A6CE52EBE5F0 /* Pods */,
103+
3A6CF7EF6C0C80E66C0BA0F7 /* Frameworks */,
77104
);
78105
sourceTree = "<group>";
79106
};
@@ -116,12 +143,14 @@
116143
isa = PBXNativeTarget;
117144
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
118145
buildPhases = (
146+
26281EA1ADF7ECDE58A9CEB7 /* [CP] Check Pods Manifest.lock */,
119147
9740EEB61CF901F6004384FC /* Run Script */,
120148
97C146EA1CF9000F007C117D /* Sources */,
121149
97C146EB1CF9000F007C117D /* Frameworks */,
122150
97C146EC1CF9000F007C117D /* Resources */,
123151
9705A1C41CF9048500538489 /* Embed Frameworks */,
124152
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
153+
8EC4EC08F4C005765E6C7516 /* [CP] Copy Pods Resources */,
125154
);
126155
buildRules = (
127156
);
@@ -179,8 +208,31 @@
179208
/* End PBXResourcesBuildPhase section */
180209

181210
/* Begin PBXShellScriptBuildPhase section */
211+
26281EA1ADF7ECDE58A9CEB7 /* [CP] Check Pods Manifest.lock */ = {
212+
isa = PBXShellScriptBuildPhase;
213+
buildActionMask = 2147483647;
214+
files = (
215+
);
216+
inputFileListPaths = (
217+
);
218+
inputPaths = (
219+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
220+
"${PODS_ROOT}/Manifest.lock",
221+
);
222+
name = "[CP] Check Pods Manifest.lock";
223+
outputFileListPaths = (
224+
);
225+
outputPaths = (
226+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
227+
);
228+
runOnlyForDeploymentPostprocessing = 0;
229+
shellPath = /bin/sh;
230+
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";
231+
showEnvVarsInLog = 0;
232+
};
182233
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
183234
isa = PBXShellScriptBuildPhase;
235+
alwaysOutOfDate = 1;
184236
buildActionMask = 2147483647;
185237
files = (
186238
);
@@ -193,8 +245,26 @@
193245
shellPath = /bin/sh;
194246
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
195247
};
248+
8EC4EC08F4C005765E6C7516 /* [CP] Copy Pods Resources */ = {
249+
isa = PBXShellScriptBuildPhase;
250+
buildActionMask = 2147483647;
251+
files = (
252+
);
253+
inputFileListPaths = (
254+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
255+
);
256+
name = "[CP] Copy Pods Resources";
257+
outputFileListPaths = (
258+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
259+
);
260+
runOnlyForDeploymentPostprocessing = 0;
261+
shellPath = /bin/sh;
262+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
263+
showEnvVarsInLog = 0;
264+
};
196265
9740EEB61CF901F6004384FC /* Run Script */ = {
197266
isa = PBXShellScriptBuildPhase;
267+
alwaysOutOfDate = 1;
198268
buildActionMask = 2147483647;
199269
files = (
200270
);
@@ -283,7 +353,7 @@
283353
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
284354
GCC_WARN_UNUSED_FUNCTION = YES;
285355
GCC_WARN_UNUSED_VARIABLE = YES;
286-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
356+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
287357
MTL_ENABLE_DEBUG_INFO = NO;
288358
SDKROOT = iphoneos;
289359
SUPPORTED_PLATFORMS = iphoneos;
@@ -357,7 +427,7 @@
357427
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
358428
GCC_WARN_UNUSED_FUNCTION = YES;
359429
GCC_WARN_UNUSED_VARIABLE = YES;
360-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
430+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
361431
MTL_ENABLE_DEBUG_INFO = YES;
362432
ONLY_ACTIVE_ARCH = YES;
363433
SDKROOT = iphoneos;
@@ -406,7 +476,7 @@
406476
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
407477
GCC_WARN_UNUSED_FUNCTION = YES;
408478
GCC_WARN_UNUSED_VARIABLE = YES;
409-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
479+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
410480
MTL_ENABLE_DEBUG_INFO = NO;
411481
SDKROOT = iphoneos;
412482
SUPPORTED_PLATFORMS = iphoneos;

‎packages/extension_google_sign_in_as_googleapis_auth/example/ios/Runner.xcworkspace/contents.xcworkspacedata‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)