This repository was archived by the owner on Feb 22, 2023. It is now read-only.
[shared_preferences_foundation] Add Swift runtime search paths for Objective-C apps #6952
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,14 +8,15 @@ | |
|
|
||
| /* Begin PBXBuildFile section */ | ||
| 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; | ||
| 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; | ||
| 7AFB0B132B8D038CBAF02B4E /* libPods-RunnerTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 32D97E85AE85363F61672773 /* libPods-RunnerTests.a */; }; | ||
| 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; | ||
| 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; | ||
| 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; | ||
| AB2C8CA8CB0B570FDC41DF49 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 656AE6DD8C165214F407D2AE /* libPods-Runner.a */; }; | ||
| F7E47F772970EBA900FA52F3 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; | ||
|
There was a problem hiding this comment. Instead of reverting the project file back to before #6940 I instead surgically modified the project file to do the minimum to convert it back to an Objective-C app using static library versions of the plugin. |
||
| F7E47F792970ECCA00FA52F3 /* RunnerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F7E47F782970ECCA00FA52F3 /* RunnerTests.m */; }; | ||
| F7E47F7B2970EDFB00FA52F3 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F7E47F7A2970EDFB00FA52F3 /* main.m */; }; | ||
| /* End PBXBuildFile section */ | ||
|
|
||
| /* Begin PBXContainerItemProxy section */ | ||
|
|
@@ -44,14 +45,15 @@ | |
| /* Begin PBXFileReference section */ | ||
| 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; }; | ||
| 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; }; | ||
| 32D97E85AE85363F61672773 /* libPods-RunnerTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RunnerTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; | ||
| 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; | ||
| 3A8F2565F3AF472E2E0A219E /* 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>"; }; | ||
| 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; }; | ||
| 656AE6DD8C165214F407D2AE /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; }; | ||
| 6F1615DD96BB2B955423149B /* 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>"; }; | ||
| 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; }; | ||
| 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; }; | ||
| 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; }; | ||
| 87C77C652D5BC0B23F81E01F /* 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>"; }; | ||
| 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; }; | ||
| 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; }; | ||
|
|
@@ -61,26 +63,26 @@ | |
| 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; }; | ||
| 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; | ||
| B5E9D2BAFD0E9BF6494E5389 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; }; | ||
| D9DC9227831D288079E5C887 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; }; | ||
| F1B6CB00204D3430428972D5 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; }; | ||
| F7E47F782970ECCA00FA52F3 /* RunnerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RunnerTests.m; sourceTree = "<group>"; }; | ||
| F7E47F7A2970EDFB00FA52F3 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; | ||
| /* End PBXFileReference section */ | ||
|
|
||
| /* Begin PBXFrameworksBuildPhase section */ | ||
| 3F94D8484CE6A0609BCE7680 /* Frameworks */ = { | ||
| isa = PBXFrameworksBuildPhase; | ||
| buildActionMask = 2147483647; | ||
| files = ( | ||
| 7AFB0B132B8D038CBAF02B4E /* libPods-RunnerTests.a in Frameworks */, | ||
| ); | ||
| runOnlyForDeploymentPostprocessing = 0; | ||
| }; | ||
| 97C146EB1CF9000F007C117D /* Frameworks */ = { | ||
| isa = PBXFrameworksBuildPhase; | ||
| buildActionMask = 2147483647; | ||
| files = ( | ||
| AB2C8CA8CB0B570FDC41DF49 /* libPods-Runner.a in Frameworks */, | ||
| ); | ||
| runOnlyForDeploymentPostprocessing = 0; | ||
| }; | ||
|
|
@@ -90,16 +92,16 @@ | |
| 331C8082294A63A400263BE5 /* RunnerTests */ = { | ||
| isa = PBXGroup; | ||
| children = ( | ||
| F7E47F782970ECCA00FA52F3 /* RunnerTests.m */, | ||
| ); | ||
| path = RunnerTests; | ||
| sourceTree = "<group>"; | ||
| }; | ||
| 4E1DD4374F34EBDF7F4214F0 /* Frameworks */ = { | ||
| isa = PBXGroup; | ||
| children = ( | ||
| 656AE6DD8C165214F407D2AE /* libPods-Runner.a */, | ||
| 32D97E85AE85363F61672773 /* libPods-RunnerTests.a */, | ||
| ); | ||
| name = Frameworks; | ||
| sourceTree = "<group>"; | ||
|
|
@@ -139,14 +141,15 @@ | |
| 97C146F01CF9000F007C117D /* Runner */ = { | ||
| isa = PBXGroup; | ||
| children = ( | ||
| 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */, | ||
| 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */, | ||
| 97C146FA1CF9000F007C117D /* Main.storyboard */, | ||
| 97C146FD1CF9000F007C117D /* Assets.xcassets */, | ||
| 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, | ||
| 97C147021CF9000F007C117D /* Info.plist */, | ||
| 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, | ||
| 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, | ||
| F7E47F7A2970EDFB00FA52F3 /* main.m */, | ||
| ); | ||
| path = Runner; | ||
| sourceTree = "<group>"; | ||
|
|
@@ -161,7 +164,6 @@ | |
| D9DC9227831D288079E5C887 /* Pods-RunnerTests.release.xcconfig */, | ||
| B5E9D2BAFD0E9BF6494E5389 /* Pods-RunnerTests.profile.xcconfig */, | ||
| ); | ||
| path = Pods; | ||
| sourceTree = "<group>"; | ||
| }; | ||
|
|
@@ -198,7 +200,6 @@ | |
| 97C146EC1CF9000F007C117D /* Resources */, | ||
| 9705A1C41CF9048500538489 /* Embed Frameworks */, | ||
| 3B06AD1E1E4923F5004D2608 /* Thin Binary */, | ||
| ); | ||
| buildRules = ( | ||
| ); | ||
|
|
@@ -224,7 +225,6 @@ | |
| }; | ||
| 97C146ED1CF9000F007C117D = { | ||
| CreatedOnToolsVersion = 7.3.1; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
@@ -269,23 +269,6 @@ | |
| /* End PBXResourcesBuildPhase section */ | ||
|
|
||
| /* Begin PBXShellScriptBuildPhase section */ | ||
| 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { | ||
| isa = PBXShellScriptBuildPhase; | ||
| alwaysOutOfDate = 1; | ||
|
|
@@ -367,15 +350,16 @@ | |
| isa = PBXSourcesBuildPhase; | ||
| buildActionMask = 2147483647; | ||
| files = ( | ||
| F7E47F792970ECCA00FA52F3 /* RunnerTests.m in Sources */, | ||
| ); | ||
| runOnlyForDeploymentPostprocessing = 0; | ||
| }; | ||
| 97C146EA1CF9000F007C117D /* Sources */ = { | ||
| isa = PBXSourcesBuildPhase; | ||
| buildActionMask = 2147483647; | ||
| files = ( | ||
| F7E47F772970EBA900FA52F3 /* AppDelegate.m in Sources */, | ||
| F7E47F7B2970EDFB00FA52F3 /* main.m in Sources */, | ||
| 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, | ||
| ); | ||
| runOnlyForDeploymentPostprocessing = 0; | ||
|
|
@@ -475,8 +459,6 @@ | |
| ); | ||
| PRODUCT_BUNDLE_IDENTIFIER = com.example.sharedPreferencesFoundationExample; | ||
| PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| VERSIONING_SYSTEM = "apple-generic"; | ||
| }; | ||
| name = Profile; | ||
|
|
@@ -492,9 +474,6 @@ | |
| MARKETING_VERSION = 1.0; | ||
| PRODUCT_BUNDLE_IDENTIFIER = com.example.sharedPreferencesFoundationExample.RunnerTests; | ||
| PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; | ||
| }; | ||
| name = Debug; | ||
|
|
@@ -510,7 +489,6 @@ | |
| MARKETING_VERSION = 1.0; | ||
| PRODUCT_BUNDLE_IDENTIFIER = com.example.sharedPreferencesFoundationExample.RunnerTests; | ||
| PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; | ||
| }; | ||
| name = Release; | ||
|
|
@@ -526,7 +504,6 @@ | |
| MARKETING_VERSION = 1.0; | ||
| PRODUCT_BUNDLE_IDENTIFIER = com.example.sharedPreferencesFoundationExample.RunnerTests; | ||
| PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; | ||
| }; | ||
| name = Profile; | ||
|
|
@@ -630,9 +607,6 @@ | |
| IPHONEOS_DEPLOYMENT_TARGET = 11.0; | ||
| MTL_ENABLE_DEBUG_INFO = NO; | ||
| SDKROOT = iphoneos; | ||
| TARGETED_DEVICE_FAMILY = "1,2"; | ||
| VALIDATE_PRODUCT = YES; | ||
| }; | ||
|
|
@@ -653,9 +627,6 @@ | |
| ); | ||
| PRODUCT_BUNDLE_IDENTIFIER = com.example.sharedPreferencesFoundationExample; | ||
| PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| VERSIONING_SYSTEM = "apple-generic"; | ||
| }; | ||
| name = Debug; | ||
|
|
@@ -675,8 +646,6 @@ | |
| ); | ||
| PRODUCT_BUNDLE_IDENTIFIER = com.example.sharedPreferencesFoundationExample; | ||
| PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| VERSIONING_SYSTEM = "apple-generic"; | ||
| }; | ||
| name = Release; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| // Copyright 2013 The Flutter Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #include "AppDelegate.h" | ||
| #include "GeneratedPluginRegistrant.h" | ||
|
|
||
| @implementation AppDelegate | ||
|
|
||
| - (BOOL)application:(UIApplication *)application | ||
| didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { | ||
| [GeneratedPluginRegistrant registerWithRegistry:self]; | ||
| return [super application:application didFinishLaunchingWithOptions:launchOptions]; | ||
| } | ||
|
|
||
| @end |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| // Copyright 2013 The Flutter Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #import <Flutter/Flutter.h> | ||
| #import <UIKit/UIKit.h> | ||
| #import "AppDelegate.h" | ||
|
|
||
| int main(int argc, char *argv[]) { | ||
| @autoreleasepool { | ||
| return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| // Copyright 2013 The Flutter Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| @import shared_preferences_foundation; | ||
| @import XCTest; | ||
|
|
||
| @interface SharedPreferencesTests : XCTestCase | ||
| @end | ||
|
|
||
| @implementation SharedPreferencesTests | ||
|
|
||
| - (void)testPlugin { | ||
| SharedPreferencesPlugin *plugin = [[SharedPreferencesPlugin alloc] init]; | ||
|
There was a problem hiding this comment. This test is pretty lame, I didn't re-write the better Swift tests back to Objective-C. Will do that after this lands, to unblock the tree ASAP. There was a problem hiding this comment. Do we have to abandon the Swift tests? I would have thought we could have Swift tests even though the app is Objective-C. There was a problem hiding this comment. I think that does the automagical thing with the Swift runtimes when running an XCTest since Xcode does all kinds of voodoo to get the tests to see non-public APIs? Relying on this from the example app seems fragile though, it's just luck that we caught it in the storekit example app. I'll try to think about a better way to holistically test this problem... |
||
| XCTAssertNotNil(plugin); | ||
| } | ||
|
|
||
| @end | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the fix.