Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit 00e1936

Browse files
jmagmanMichael Klimushyn
jmagman
authored and
Michael Klimushyn
committed
[in_app_purchase] Update and migrate iOS example project (#2096)
1. Let flutter/flutter#26630 flutter_assets migrator run 2. Run `pod install` so flutter_assets is removed from the asset copy build phase 3. Migrate deprecated "English" to "en" language 4. Allow Xcode to remove extraneous xcconfigs, see flutter/flutter#38724 5. Let Xcode 11 update build settings 6. Remove extraneous framework outputs flutter/flutter#20685
1 parent 86d245f commit 00e1936

File tree

4 files changed

+24
-25
lines changed

4 files changed

+24
-25
lines changed

‎packages/in_app_purchase/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.2.1+4
2+
3+
* Update and migrate iOS example project.
4+
15
## 0.2.1+3
26

37
* Android : Improved testability.

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
11-
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
1211
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1312
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
1413
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -55,7 +54,6 @@
5554
/* Begin PBXFileReference section */
5655
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
5756
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
58-
2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
5957
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
6058
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
6159
688DE35021F2A5A100EA2684 /* TranslatorTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TranslatorTest.m; sourceTree = "<group>"; };
@@ -79,6 +77,8 @@
7977
A59001A621E69658004A3E5E /* InAppPurchasePluginTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InAppPurchasePluginTest.m; sourceTree = "<group>"; };
8078
A59001A821E69658004A3E5E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8179
B2AB6BE1D4E2232AB5D4A002 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
80+
BE95F46E12942F78BF67E55B /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
81+
DE7EEEE26E27ACC04BA9951D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
8282
/* End PBXFileReference section */
8383

8484
/* Begin PBXFrameworksBuildPhase section */
@@ -106,14 +106,15 @@
106106
2D4BBB2E0E7B18550E80D50C /* Pods */ = {
107107
isa = PBXGroup;
108108
children = (
109+
DE7EEEE26E27ACC04BA9951D /* Pods-Runner.debug.xcconfig */,
110+
BE95F46E12942F78BF67E55B /* Pods-Runner.release.xcconfig */,
109111
);
110112
name = Pods;
111113
sourceTree = "<group>";
112114
};
113115
9740EEB11CF90186004384FC /* Flutter */ = {
114116
isa = PBXGroup;
115117
children = (
116-
2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
117118
3B80C3931E831B6300D905FE /* App.framework */,
118119
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
119120
9740EEBA1CF902C7004384FC /* Flutter.framework */,
@@ -241,7 +242,7 @@
241242
isa = PBXProject;
242243
attributes = {
243244
DefaultBuildSystemTypeForWorkspace = Original;
244-
LastUpgradeCheck = 0940;
245+
LastUpgradeCheck = 1100;
245246
ORGANIZATIONNAME = "The Chromium Authors";
246247
TargetAttributes = {
247248
97C146ED1CF9000F007C117D = {
@@ -261,7 +262,7 @@
261262
};
262263
buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
263264
compatibilityVersion = "Xcode 3.2";
264-
developmentRegion = English;
265+
developmentRegion = en;
265266
hasScannedForEncodings = 0;
266267
knownRegions = (
267268
en,
@@ -286,7 +287,6 @@
286287
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
287288
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
288289
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
289-
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
290290
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
291291
);
292292
runOnlyForDeploymentPostprocessing = 0;
@@ -353,16 +353,13 @@
353353
files = (
354354
);
355355
inputPaths = (
356-
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
357-
"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
358356
);
359357
name = "[CP] Embed Pods Frameworks";
360358
outputPaths = (
361-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
362359
);
363360
runOnlyForDeploymentPostprocessing = 0;
364361
shellPath = /bin/sh;
365-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
362+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
366363
showEnvVarsInLog = 0;
367364
};
368365
/* End PBXShellScriptBuildPhase section */
@@ -424,6 +421,7 @@
424421
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
425422
buildSettings = {
426423
ALWAYS_SEARCH_USER_PATHS = NO;
424+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
427425
CLANG_ANALYZER_NONNULL = YES;
428426
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
429427
CLANG_CXX_LIBRARY = "libc++";
@@ -480,6 +478,7 @@
480478
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
481479
buildSettings = {
482480
ALWAYS_SEARCH_USER_PATHS = NO;
481+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
483482
CLANG_ANALYZER_NONNULL = YES;
484483
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
485484
CLANG_CXX_LIBRARY = "libc++";

‎packages/in_app_purchase/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0940"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
34+
BuildableName = "Runner.app"
35+
BlueprintName = "Runner"
36+
ReferencedContainer = "container:Runner.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
46-
BuildableName = "Runner.app"
47-
BlueprintName = "Runner"
48-
ReferencedContainer = "container:Runner.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -71,8 +69,6 @@
7169
ReferencedContainer = "container:Runner.xcodeproj">
7270
</BuildableReference>
7371
</BuildableProductRunnable>
74-
<AdditionalOptions>
75-
</AdditionalOptions>
7672
</LaunchAction>
7773
<ProfileAction
7874
buildConfiguration = "Release"

‎packages/in_app_purchase/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: in_app_purchase
22
description: A Flutter plugin for in-app purchases. Exposes APIs for making in-app purchases through the App Store and Google Play.
33
author: Flutter Team <[email protected]>
44
homepage: https://github.com/flutter/plugins/tree/master/packages/in_app_purchase
5-
version: 0.2.1+3
5+
version: 0.2.1+4
66

77

88
dependencies:

0 commit comments

Comments
 (0)