Skip to content

Commit f7c47a2

Browse files
authored
[in_app_purchase] Convert example app to Swift (flutter#13556)
Replaces the Obj-C boilerplate example app's app delegate and main.m with a Swift app delegate using the `@main` annotation, following the standard Swift Flutter example app format, and migrates the test-specific handling into the new file. Part of flutter#119106 ## Pre-Review Checklist [^1]: Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling.
1 parent 75ce712 commit f7c47a2

5 files changed

Lines changed: 44 additions & 67 deletions

File tree

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

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

99
/* Begin PBXBuildFile section */
10+
00F6627A309B8B2500A7E716 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00F66279309B8B2500A7E716 /* AppDelegate.swift */; };
1011
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1112
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1213
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
13-
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
14-
97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
1514
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1615
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1716
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
@@ -53,18 +52,18 @@
5352
/* End PBXCopyFilesBuildPhase section */
5453

5554
/* Begin PBXFileReference section */
55+
00F66279309B8B2500A7E716 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
56+
00F6627B309B8B2B00A7E716 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
5657
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
5758
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
5859
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
59-
6458340B2CE3497379F6B389 /* 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>"; };
60+
784666492D4C4C64000A1A5F /* FlutterFramework */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterFramework; path = Flutter/ephemeral/Packages/.packages/FlutterFramework; sourceTree = "<group>"; };
61+
78DABEA22ED26510000E7860 /* in_app_purchase_storekit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = in_app_purchase_storekit; path = ../../darwin/in_app_purchase_storekit; sourceTree = "<group>"; };
6062
78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
6163
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
62-
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
63-
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
6464
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
6565
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
6666
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
67-
97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
6867
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
6968
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
7069
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -84,8 +83,6 @@
8483
F2D527192C50627500C137C7 /* PaymentQueueTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PaymentQueueTests.swift; path = ../../shared/RunnerTests/PaymentQueueTests.swift; sourceTree = "<group>"; };
8584
F2D527292C583C4A00C137C7 /* TranslatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = TranslatorTests.swift; path = ../../shared/RunnerTests/TranslatorTests.swift; sourceTree = "<group>"; };
8685
F6E5D5F926131C4800C68BED /* Configuration.storekit */ = {isa = PBXFileReference; lastKnownFileType = text; path = Configuration.storekit; sourceTree = "<group>"; };
87-
784666492D4C4C64000A1A5F /* FlutterFramework */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterFramework; path = Flutter/ephemeral/Packages/.packages/FlutterFramework; sourceTree = "<group>"; };
88-
78DABEA22ED26510000E7860 /* in_app_purchase_storekit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = in_app_purchase_storekit; path = ../../darwin/in_app_purchase_storekit; sourceTree = "<group>"; };
8986
/* End PBXFileReference section */
9087

9188
/* Begin PBXFrameworksBuildPhase section */
@@ -161,28 +158,19 @@
161158
97C146F01CF9000F007C117D /* Runner */ = {
162159
isa = PBXGroup;
163160
children = (
164-
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */,
165-
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */,
161+
00F66279309B8B2500A7E716 /* AppDelegate.swift */,
162+
00F6627B309B8B2B00A7E716 /* Runner-Bridging-Header.h */,
166163
97C146FA1CF9000F007C117D /* Main.storyboard */,
167164
97C146FD1CF9000F007C117D /* Assets.xcassets */,
168165
97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
169166
97C147021CF9000F007C117D /* Info.plist */,
170-
97C146F11CF9000F007C117D /* Supporting Files */,
171167
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
172168
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
173169
F6E5D5F926131C4800C68BED /* Configuration.storekit */,
174170
);
175171
path = Runner;
176172
sourceTree = "<group>";
177173
};
178-
97C146F11CF9000F007C117D /* Supporting Files */ = {
179-
isa = PBXGroup;
180-
children = (
181-
97C146F21CF9000F007C117D /* main.m */,
182-
);
183-
name = "Supporting Files";
184-
sourceTree = "<group>";
185-
};
186174
A59001A521E69658004A3E5E /* RunnerTests */ = {
187175
isa = PBXGroup;
188176
children = (
@@ -266,6 +254,7 @@
266254
TargetAttributes = {
267255
97C146ED1CF9000F007C117D = {
268256
CreatedOnToolsVersion = 7.3.1;
257+
LastSwiftMigration = 2610;
269258
SystemCapabilities = {
270259
com.apple.InAppPurchase = {
271260
enabled = 1;
@@ -363,8 +352,7 @@
363352
isa = PBXSourcesBuildPhase;
364353
buildActionMask = 2147483647;
365354
files = (
366-
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */,
367-
97C146F31CF9000F007C117D /* main.m in Sources */,
355+
00F6627A309B8B2500A7E716 /* AppDelegate.swift in Sources */,
368356
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
369357
);
370358
runOnlyForDeploymentPostprocessing = 0;
@@ -527,6 +515,7 @@
527515
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
528516
buildSettings = {
529517
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
518+
CLANG_ENABLE_MODULES = YES;
530519
CODE_SIGN_IDENTITY = "Apple Development";
531520
CODE_SIGN_STYLE = Automatic;
532521
CURRENT_PROJECT_VERSION = 1;
@@ -548,6 +537,9 @@
548537
PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.plugins.inAppPurchaseExample;
549538
PRODUCT_NAME = "$(TARGET_NAME)";
550539
PROVISIONING_PROFILE_SPECIFIER = "";
540+
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
541+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
542+
SWIFT_VERSION = 5.0;
551543
VERSIONING_SYSTEM = "apple-generic";
552544
};
553545
name = Debug;
@@ -557,6 +549,7 @@
557549
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
558550
buildSettings = {
559551
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
552+
CLANG_ENABLE_MODULES = YES;
560553
CODE_SIGN_IDENTITY = "Apple Development";
561554
CODE_SIGN_STYLE = Automatic;
562555
CURRENT_PROJECT_VERSION = 1;
@@ -578,6 +571,8 @@
578571
PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.plugins.inAppPurchaseExample;
579572
PRODUCT_NAME = "$(TARGET_NAME)";
580573
PROVISIONING_PROFILE_SPECIFIER = "";
574+
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
575+
SWIFT_VERSION = 5.0;
581576
VERSIONING_SYSTEM = "apple-generic";
582577
};
583578
name = Release;

‎packages/in_app_purchase/in_app_purchase_storekit/example/ios/Runner/AppDelegate.m‎

Lines changed: 0 additions & 26 deletions
This file was deleted.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Copyright 2013 The Flutter Authors
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
import Flutter
6+
import UIKit
7+
8+
@main
9+
@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
10+
override func application(
11+
_ application: UIApplication,
12+
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
13+
) -> Bool {
14+
return super.application(application, didFinishLaunchingWithOptions: launchOptions)
15+
}
16+
17+
func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {
18+
// Plugin registration eventually starts listening to StoreKit transactions in the background,
19+
// which would run concurrently with the test cases during unit tests and auto-finish
20+
// transactions under test. Skip it when running unit tests.
21+
if NSClassFromString("XCTestCase") != nil {
22+
return
23+
}
24+
GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
25+
}
26+
}

packages/in_app_purchase/in_app_purchase_storekit/example/ios/Runner/AppDelegate.h renamed to packages/in_app_purchase/in_app_purchase_storekit/example/ios/Runner/Runner-Bridging-Header.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,4 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#import <Flutter/Flutter.h>
6-
#import <UIKit/UIKit.h>
7-
8-
@interface AppDelegate : FlutterAppDelegate <FlutterImplicitEngineDelegate>
9-
10-
@end
5+
#import "GeneratedPluginRegistrant.h"

‎packages/in_app_purchase/in_app_purchase_storekit/example/ios/Runner/main.m‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)