From fe5bf44e9f7825b742694e3be730e3b1c596a8a1 Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Fri, 15 Sep 2023 08:12:03 +1000 Subject: [PATCH] Update `platform_channels` (#2013) ## Pre-launch Checklist - [x] I read the [Flutter Style Guide] _recently_, and have followed its advice. - [x] I signed the [CLA]. - [x] I read the [Contributors Guide]. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-devrel channel on [Discord]. [Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo [CLA]: https://cla.developers.google.com/ [Discord]: https://github.com/flutter/flutter/wiki/Chat [Contributors Guide]: https://github.com/flutter/samples/blob/main/CONTRIBUTING.md --- platform_channels/.metadata | 16 ++++++++-------- platform_channels/codelab_rebuild.yaml | 6 +++--- .../ios/Runner.xcodeproj/project.pbxproj | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/platform_channels/.metadata b/platform_channels/.metadata index 146b8b6c8..b7aa9344c 100644 --- a/platform_channels/.metadata +++ b/platform_channels/.metadata @@ -4,8 +4,8 @@ # This file should be version controlled and should not be manually edited. version: - revision: "ac71592bc605996f9376ec5b7607db52b64cabd0" - channel: "beta" + revision: "2524052335ec76bb03e04ede244b071f1b86d190" + channel: "stable" project_type: app @@ -13,14 +13,14 @@ project_type: app migration: platforms: - platform: root - create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + create_revision: 2524052335ec76bb03e04ede244b071f1b86d190 + base_revision: 2524052335ec76bb03e04ede244b071f1b86d190 - platform: android - create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + create_revision: 2524052335ec76bb03e04ede244b071f1b86d190 + base_revision: 2524052335ec76bb03e04ede244b071f1b86d190 - platform: ios - create_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 - base_revision: ac71592bc605996f9376ec5b7607db52b64cabd0 + create_revision: 2524052335ec76bb03e04ede244b071f1b86d190 + base_revision: 2524052335ec76bb03e04ede244b071f1b86d190 # User provided section diff --git a/platform_channels/codelab_rebuild.yaml b/platform_channels/codelab_rebuild.yaml index dc37ed249..7b227fad3 100644 --- a/platform_channels/codelab_rebuild.yaml +++ b/platform_channels/codelab_rebuild.yaml @@ -7,9 +7,6 @@ steps: - ios - name: Flutter recreate flutter: create --platform android,ios --org dev.flutter . - - name: Strip DEVELOPMENT_TEAM - strip-lines-containing: DEVELOPMENT_TEAM = - path: ios/Runner.xcodeproj/project.pbxproj - name: Patch android/app/build.gradle path: android/app/build.gradle patch-u: | @@ -2617,6 +2614,9 @@ steps: return nil } } + - name: Add AccelerometerStreamHandler.swift to Xcode project + xcode-project-path: ios/Runner.xcodeproj + xcode-add-file: AccelerometerStreamHandler.swift - name: Replace ios/Runner/AppDelegate.swift path: ios/Runner/AppDelegate.swift replace-contents: | diff --git a/platform_channels/ios/Runner.xcodeproj/project.pbxproj b/platform_channels/ios/Runner.xcodeproj/project.pbxproj index fc595869e..e79fc190a 100644 --- a/platform_channels/ios/Runner.xcodeproj/project.pbxproj +++ b/platform_channels/ios/Runner.xcodeproj/project.pbxproj @@ -8,7 +8,7 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 1C5D8C2F2A8127190006C60D /* AccelerometerStreamHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C5D8C2E2A8127190006C60D /* AccelerometerStreamHandler.swift */; }; + 316C7BC74F432A4549066185 /* AccelerometerStreamHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 854EA80D339DD1D038E5CB29 /* AccelerometerStreamHandler.swift */; }; 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; @@ -43,13 +43,13 @@ /* Begin PBXFileReference section */ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 1C5D8C2E2A8127190006C60D /* AccelerometerStreamHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccelerometerStreamHandler.swift; sourceTree = ""; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 854EA80D339DD1D038E5CB29 /* AccelerometerStreamHandler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AccelerometerStreamHandler.swift; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -111,7 +111,6 @@ 97C146F01CF9000F007C117D /* Runner */ = { isa = PBXGroup; children = ( - 1C5D8C2E2A8127190006C60D /* AccelerometerStreamHandler.swift */, 97C146FA1CF9000F007C117D /* Main.storyboard */, 97C146FD1CF9000F007C117D /* Assets.xcassets */, 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, @@ -120,6 +119,7 @@ 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, + 854EA80D339DD1D038E5CB29 /* AccelerometerStreamHandler.swift */, ); path = Runner; sourceTree = ""; @@ -273,7 +273,7 @@ files = ( 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, - 1C5D8C2F2A8127190006C60D /* AccelerometerStreamHandler.swift in Sources */, + 316C7BC74F432A4549066185 /* AccelerometerStreamHandler.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };