diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index f945f155..c3727bb2 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -8,9 +8,10 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 17E3C866CA3FCD6568C3185B /* Pods_AirshipExampleNotificationServiceExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 060DD0FFEC6F473C0C1B1B41 /* Pods_AirshipExampleNotificationServiceExtension.framework */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 6EB4969BDEA6B8A5E816BF96 /* Pods_AirshipExampleNotificationServiceExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84F86063F424B9815FB49CFD /* Pods_AirshipExampleNotificationServiceExtension.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; 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 */; }; @@ -25,7 +26,7 @@ 99041C232CC29E0300031558 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99041C222CC29E0300031558 /* NotificationService.swift */; }; 99041C272CC29E0300031558 /* AirshipExampleNotificationServiceExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 99041C202CC29E0300031558 /* AirshipExampleNotificationServiceExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 991A20A62CC5807D0025F15C /* ExampleWidgetsAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99041C192CC1DB1D00031558 /* ExampleWidgetsAttributes.swift */; }; - F2752F00AE0F784D37990F4D /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB5811C302D62694114284C7 /* Pods_Runner.framework */; }; + F3C481AEA201CB2C5E93DCB5 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D76F4F77C7F01DB3D4FFCCE3 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -71,18 +72,18 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 060DD0FFEC6F473C0C1B1B41 /* Pods_AirshipExampleNotificationServiceExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AirshipExampleNotificationServiceExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 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 = ""; }; - 22ED3F085B82D96DD685CBE2 /* 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 = ""; }; + 217358BE100E480C0204D735 /* Pods-AirshipExampleNotificationServiceExtension.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AirshipExampleNotificationServiceExtension.profile.xcconfig"; path = "Target Support Files/Pods-AirshipExampleNotificationServiceExtension/Pods-AirshipExampleNotificationServiceExtension.profile.xcconfig"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 3B85D0105FEBFC0EFEBB60A8 /* 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 = ""; }; 45277AEA23C53FC5002AEA21 /* Airship.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Airship.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 55C9286D2A474BF41F18325D /* 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 = ""; }; + 6819DDDDE7051AE591B26BDD /* Pods-AirshipExampleNotificationServiceExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AirshipExampleNotificationServiceExtension.release.xcconfig"; path = "Target Support Files/Pods-AirshipExampleNotificationServiceExtension/Pods-AirshipExampleNotificationServiceExtension.release.xcconfig"; 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 = ""; }; - 7B0A7B4D0A9B4489842A61EB /* Pods-AirshipExampleNotificationServiceExtension.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AirshipExampleNotificationServiceExtension.profile.xcconfig"; path = "Target Support Files/Pods-AirshipExampleNotificationServiceExtension/Pods-AirshipExampleNotificationServiceExtension.profile.xcconfig"; sourceTree = ""; }; - 96EFF562C1F44C0363D9859D /* Pods-AirshipExampleNotificationServiceExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AirshipExampleNotificationServiceExtension.debug.xcconfig"; path = "Target Support Files/Pods-AirshipExampleNotificationServiceExtension/Pods-AirshipExampleNotificationServiceExtension.debug.xcconfig"; sourceTree = ""; }; + 84F86063F424B9815FB49CFD /* Pods_AirshipExampleNotificationServiceExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AirshipExampleNotificationServiceExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 874411C8B1C473243C3D032C /* Pods-AirshipExampleNotificationServiceExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AirshipExampleNotificationServiceExtension.debug.xcconfig"; path = "Target Support Files/Pods-AirshipExampleNotificationServiceExtension/Pods-AirshipExampleNotificationServiceExtension.debug.xcconfig"; 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; }; @@ -102,10 +103,10 @@ 99041C202CC29E0300031558 /* AirshipExampleNotificationServiceExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = AirshipExampleNotificationServiceExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; 99041C222CC29E0300031558 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = ""; }; 99041C242CC29E0300031558 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - AB5811C302D62694114284C7 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + BC9C10352F476390AB99FCC6 /* 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 = ""; }; + D76F4F77C7F01DB3D4FFCCE3 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; DF39D0BC24EC8388007487C4 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = ""; }; - F5C980E6DA765A595DF7C726 /* Pods-AirshipExampleNotificationServiceExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AirshipExampleNotificationServiceExtension.release.xcconfig"; path = "Target Support Files/Pods-AirshipExampleNotificationServiceExtension/Pods-AirshipExampleNotificationServiceExtension.release.xcconfig"; sourceTree = ""; }; - F80EA22C38488422A05FF96F /* 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 = ""; }; + F0E21D76458F2007DBE576D7 /* 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 = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -113,7 +114,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F2752F00AE0F784D37990F4D /* Pods_Runner.framework in Frameworks */, + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, + F3C481AEA201CB2C5E93DCB5 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -130,7 +132,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 17E3C866CA3FCD6568C3185B /* Pods_AirshipExampleNotificationServiceExtension.framework in Frameworks */, + 6EB4969BDEA6B8A5E816BF96 /* Pods_AirshipExampleNotificationServiceExtension.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -141,10 +143,10 @@ isa = PBXGroup; children = ( 45277AEA23C53FC5002AEA21 /* Airship.framework */, - AB5811C302D62694114284C7 /* Pods_Runner.framework */, 99041C012CC1DAE500031558 /* WidgetKit.framework */, 99041C032CC1DAE500031558 /* SwiftUI.framework */, - 060DD0FFEC6F473C0C1B1B41 /* Pods_AirshipExampleNotificationServiceExtension.framework */, + 84F86063F424B9815FB49CFD /* Pods_AirshipExampleNotificationServiceExtension.framework */, + D76F4F77C7F01DB3D4FFCCE3 /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -152,12 +154,12 @@ 4A5F3BC20F2F71680F0EA95B /* Pods */ = { isa = PBXGroup; children = ( - 55C9286D2A474BF41F18325D /* Pods-Runner.debug.xcconfig */, - F80EA22C38488422A05FF96F /* Pods-Runner.release.xcconfig */, - 22ED3F085B82D96DD685CBE2 /* Pods-Runner.profile.xcconfig */, - 96EFF562C1F44C0363D9859D /* Pods-AirshipExampleNotificationServiceExtension.debug.xcconfig */, - F5C980E6DA765A595DF7C726 /* Pods-AirshipExampleNotificationServiceExtension.release.xcconfig */, - 7B0A7B4D0A9B4489842A61EB /* Pods-AirshipExampleNotificationServiceExtension.profile.xcconfig */, + 874411C8B1C473243C3D032C /* Pods-AirshipExampleNotificationServiceExtension.debug.xcconfig */, + 6819DDDDE7051AE591B26BDD /* Pods-AirshipExampleNotificationServiceExtension.release.xcconfig */, + 217358BE100E480C0204D735 /* Pods-AirshipExampleNotificationServiceExtension.profile.xcconfig */, + F0E21D76458F2007DBE576D7 /* Pods-Runner.debug.xcconfig */, + 3B85D0105FEBFC0EFEBB60A8 /* Pods-Runner.release.xcconfig */, + BC9C10352F476390AB99FCC6 /* Pods-Runner.profile.xcconfig */, ); path = Pods; sourceTree = ""; @@ -249,7 +251,7 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 1E091F8DEFEE6AA058F231B9 /* [CP] Check Pods Manifest.lock */, + 18B0588108B21FF2F8FCB693 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, @@ -257,7 +259,7 @@ 99041C182CC1DAE600031558 /* Embed Foundation Extensions */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 762FAAF0484562820949CC92 /* [CP] Embed Pods Frameworks */, + 2AB21EA1F1BD2718C2E23D54 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -266,6 +268,9 @@ 99041C262CC29E0300031558 /* PBXTargetDependency */, ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 97C146EE1CF9000F007C117D /* Runner.app */; productType = "com.apple.product-type.application"; @@ -291,7 +296,7 @@ isa = PBXNativeTarget; buildConfigurationList = 99041C282CC29E0300031558 /* Build configuration list for PBXNativeTarget "AirshipExampleNotificationServiceExtension" */; buildPhases = ( - FEFEACE62CF044E69FD585AA /* [CP] Check Pods Manifest.lock */, + 13F76BF01596F205B80C5AAD /* [CP] Check Pods Manifest.lock */, 99041C1C2CC29E0300031558 /* Sources */, 99041C1D2CC29E0300031558 /* Frameworks */, 99041C1E2CC29E0300031558 /* Resources */, @@ -338,6 +343,9 @@ Base, ); mainGroup = 97C146E51CF9000F007C117D; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; projectRoot = ""; @@ -379,7 +387,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1E091F8DEFEE6AA058F231B9 /* [CP] Check Pods Manifest.lock */ = { + 13F76BF01596F205B80C5AAD /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -394,46 +402,46 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-AirshipExampleNotificationServiceExtension-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; 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"; showEnvVarsInLog = 0; }; - 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + 18B0588108B21FF2F8FCB693 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( - "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( ); - name = "Thin Binary"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n"; + 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"; + showEnvVarsInLog = 0; }; - 762FAAF0484562820949CC92 /* [CP] Embed Pods Frameworks */ = { + 2AB21EA1F1BD2718C2E23D54 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/Airship/AirshipKit.framework", - "${BUILT_PRODUCTS_DIR}/AirshipFrameworkProxy/AirshipFrameworkProxy.framework", - "${BUILT_PRODUCTS_DIR}/airship_flutter/airship_flutter.framework", "${BUILT_PRODUCTS_DIR}/AirshipServiceExtension/AirshipServiceExtension.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AirshipKit.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AirshipFrameworkProxy.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/airship_flutter.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AirshipServiceExtension.framework", ); runOnlyForDeploymentPostprocessing = 0; @@ -441,42 +449,36 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 9740EEB61CF901F6004384FC /* Run Script */ = { + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); - name = "Run Script"; + name = "Thin Binary"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n"; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n"; }; - FEFEACE62CF044E69FD585AA /* [CP] Check Pods Manifest.lock */ = { + 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( - ); inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( ); + name = "Run Script"; outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-AirshipExampleNotificationServiceExtension-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - 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"; - showEnvVarsInLog = 0; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -928,7 +930,7 @@ }; 99041C292CC29E0300031558 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 96EFF562C1F44C0363D9859D /* Pods-AirshipExampleNotificationServiceExtension.debug.xcconfig */; + baseConfigurationReference = 874411C8B1C473243C3D032C /* Pods-AirshipExampleNotificationServiceExtension.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -969,7 +971,7 @@ }; 99041C2A2CC29E0300031558 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F5C980E6DA765A595DF7C726 /* Pods-AirshipExampleNotificationServiceExtension.release.xcconfig */; + baseConfigurationReference = 6819DDDDE7051AE591B26BDD /* Pods-AirshipExampleNotificationServiceExtension.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -1008,7 +1010,7 @@ }; 99041C2B2CC29E0300031558 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7B0A7B4D0A9B4489842A61EB /* Pods-AirshipExampleNotificationServiceExtension.profile.xcconfig */; + baseConfigurationReference = 217358BE100E480C0204D735 /* Pods-AirshipExampleNotificationServiceExtension.profile.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -1089,6 +1091,20 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { + isa = XCSwiftPackageProductDependency; + productName = FlutterGeneratedPluginSwiftPackage; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 97C146E61CF9000F007C117D /* Project object */; } diff --git a/ios/airship_flutter.podspec b/ios/airship_flutter.podspec index c6c6c2f2..ae2df754 100644 --- a/ios/airship_flutter.podspec +++ b/ios/airship_flutter.podspec @@ -17,11 +17,10 @@ Airship flutter plugin. s.author = { 'Airship' => 'support@airship.com' } s.source = { :path => '.' } s.source_files = 'airship_flutter/Sources/airship_flutter/**/*' - s.public_header_files = 'airship_flutter/Sources/airship_flutter/obj-c/**/*.h' s.dependency 'Flutter' s.ios.deployment_target = "14.0" s.dependency "AirshipFrameworkProxy", "11.1.0" s.swift_version = "5.0.0" - s.resource_bundles = {'airship_flutter_privacy' => ['airship_flutter/Sources/airship_flutter/swift/PrivacyInfo.xcprivacy']} + s.resource_bundles = {'airship_flutter_privacy' => ['airship_flutter/Sources/airship_flutter/PrivacyInfo.xcprivacy']} end diff --git a/ios/airship_flutter/Package.swift b/ios/airship_flutter/Package.swift index 9813e5db..5743b17b 100644 --- a/ios/airship_flutter/Package.swift +++ b/ios/airship_flutter/Package.swift @@ -13,18 +13,11 @@ let package = Package( .package(url: "https://github.com/urbanairship/airship-mobile-framework-proxy.git", from: "11.2.1") ], targets: [ - .target( - name: "airship_flutter_objc", - path: "Sources/airship_flutter/obj-c", - publicHeadersPath: "include" - ), .target( name: "airship_flutter", dependencies: [ - "airship_flutter_objc", .product(name: "AirshipFrameworkProxy", package: "airship-mobile-framework-proxy") ], - path: "Sources/airship_flutter/swift", resources: [ .process("PrivacyInfo.xcprivacy") ] diff --git a/ios/airship_flutter/Sources/airship_flutter/swift/AirshipAutopilot.swift b/ios/airship_flutter/Sources/airship_flutter/AirshipAutopilot.swift similarity index 96% rename from ios/airship_flutter/Sources/airship_flutter/swift/AirshipAutopilot.swift rename to ios/airship_flutter/Sources/airship_flutter/AirshipAutopilot.swift index 64284fd8..c4b6b1ac 100644 --- a/ios/airship_flutter/Sources/airship_flutter/swift/AirshipAutopilot.swift +++ b/ios/airship_flutter/Sources/airship_flutter/AirshipAutopilot.swift @@ -1,7 +1,12 @@ import Flutter -import AirshipKit import AirshipFrameworkProxy +#if canImport(AirshipCore) +import AirshipCore +#else +import AirshipKit +#endif + public class AirshipAutopilot: NSObject { @objc diff --git a/ios/airship_flutter/Sources/airship_flutter/swift/AirshipEmbeddedView.swift b/ios/airship_flutter/Sources/airship_flutter/AirshipEmbeddedView.swift similarity index 98% rename from ios/airship_flutter/Sources/airship_flutter/swift/AirshipEmbeddedView.swift rename to ios/airship_flutter/Sources/airship_flutter/AirshipEmbeddedView.swift index 97e13b56..a693cae8 100644 --- a/ios/airship_flutter/Sources/airship_flutter/swift/AirshipEmbeddedView.swift +++ b/ios/airship_flutter/Sources/airship_flutter/AirshipEmbeddedView.swift @@ -1,6 +1,12 @@ import Foundation -import AirshipKit import SwiftUI +import Flutter + +#if canImport(AirshipCore) +import AirshipCore +#else +import AirshipKit +#endif class AirshipEmbeddedViewFactory: NSObject, FlutterPlatformViewFactory { let registrar: FlutterPluginRegistrar diff --git a/ios/airship_flutter/Sources/airship_flutter/swift/AirshipInboxMessageView.swift b/ios/airship_flutter/Sources/airship_flutter/AirshipInboxMessageView.swift similarity index 98% rename from ios/airship_flutter/Sources/airship_flutter/swift/AirshipInboxMessageView.swift rename to ios/airship_flutter/Sources/airship_flutter/AirshipInboxMessageView.swift index 04cecfde..fec783d8 100644 --- a/ios/airship_flutter/Sources/airship_flutter/swift/AirshipInboxMessageView.swift +++ b/ios/airship_flutter/Sources/airship_flutter/AirshipInboxMessageView.swift @@ -1,6 +1,12 @@ import Foundation -import AirshipKit import WebKit +import Flutter + +#if canImport(AirshipCore) +import AirshipCore +#else +import AirshipKit +#endif class AirshipInboxMessageViewFactory : NSObject, FlutterPlatformViewFactory { diff --git a/ios/airship_flutter/Sources/airship_flutter/swift/SwiftAirshipPlugin.swift b/ios/airship_flutter/Sources/airship_flutter/AirshipPlugin.swift similarity index 98% rename from ios/airship_flutter/Sources/airship_flutter/swift/SwiftAirshipPlugin.swift rename to ios/airship_flutter/Sources/airship_flutter/AirshipPlugin.swift index 51e59caf..29817092 100644 --- a/ios/airship_flutter/Sources/airship_flutter/swift/SwiftAirshipPlugin.swift +++ b/ios/airship_flutter/Sources/airship_flutter/AirshipPlugin.swift @@ -1,10 +1,15 @@ import Flutter import UIKit -import AirshipKit import AirshipFrameworkProxy import Combine -public class SwiftAirshipPlugin: NSObject, FlutterPlugin { +#if canImport(AirshipCore) +import AirshipCore +#else +import AirshipKit +#endif + +public class AirshipPlugin: NSObject, FlutterPlugin { private static let eventNames: [AirshipProxyEventType: String] = [ .authorizedNotificationSettingsChanged: "com.airship.flutter/event/ios_authorized_notification_settings_changed", .pushTokenReceived: "com.airship.flutter/event/push_token_received", @@ -21,7 +26,7 @@ public class SwiftAirshipPlugin: NSObject, FlutterPlugin { private let streams: [AirshipProxyEventType: AirshipEventStream] = { var streams: [AirshipProxyEventType: AirshipEventStream] = [:] - SwiftAirshipPlugin.eventNames.forEach { (key: AirshipProxyEventType, value: String) in + AirshipPlugin.eventNames.forEach { (key: AirshipProxyEventType, value: String) in streams[key] = AirshipEventStream(key, name: value) } return streams @@ -29,10 +34,10 @@ public class SwiftAirshipPlugin: NSObject, FlutterPlugin { private var subscriptions = Set() - static let shared = SwiftAirshipPlugin() + static let shared = AirshipPlugin() public static func register(with registrar: FlutterPluginRegistrar) { - SwiftAirshipPlugin.shared.setup(registrar: registrar) + AirshipPlugin.shared.setup(registrar: registrar) } private func setup(registrar: FlutterPluginRegistrar) { diff --git a/ios/airship_flutter/Sources/airship_flutter/swift/AirshipPluginLoader.swift b/ios/airship_flutter/Sources/airship_flutter/AirshipPluginLoader.swift similarity index 96% rename from ios/airship_flutter/Sources/airship_flutter/swift/AirshipPluginLoader.swift rename to ios/airship_flutter/Sources/airship_flutter/AirshipPluginLoader.swift index d0b48993..cbba353a 100644 --- a/ios/airship_flutter/Sources/airship_flutter/swift/AirshipPluginLoader.swift +++ b/ios/airship_flutter/Sources/airship_flutter/AirshipPluginLoader.swift @@ -1,4 +1,5 @@ import AirshipFrameworkProxy +import UIKit @objc(AirshipPluginLoader) public class AirshipPluginLoader: NSObject, AirshipPluginLoaderProtocol { diff --git a/ios/airship_flutter/Sources/airship_flutter/swift/AirshipPluginVersion.swift b/ios/airship_flutter/Sources/airship_flutter/AirshipPluginVersion.swift similarity index 100% rename from ios/airship_flutter/Sources/airship_flutter/swift/AirshipPluginVersion.swift rename to ios/airship_flutter/Sources/airship_flutter/AirshipPluginVersion.swift diff --git a/ios/airship_flutter/Sources/airship_flutter/swift/PrivacyInfo.xcprivacy b/ios/airship_flutter/Sources/airship_flutter/PrivacyInfo.xcprivacy similarity index 100% rename from ios/airship_flutter/Sources/airship_flutter/swift/PrivacyInfo.xcprivacy rename to ios/airship_flutter/Sources/airship_flutter/PrivacyInfo.xcprivacy diff --git a/ios/airship_flutter/Sources/airship_flutter/obj-c/AirshipPlugin.m b/ios/airship_flutter/Sources/airship_flutter/obj-c/AirshipPlugin.m deleted file mode 100644 index f0e7bdf7..00000000 --- a/ios/airship_flutter/Sources/airship_flutter/obj-c/AirshipPlugin.m +++ /dev/null @@ -1,8 +0,0 @@ -#import "AirshipPlugin.h" -#import - -@implementation AirshipPlugin -+ (void)registerWithRegistrar:(NSObject*)registrar { - [SwiftAirshipPlugin registerWithRegistrar:registrar]; -} -@end diff --git a/ios/airship_flutter/Sources/airship_flutter/obj-c/include/AirshipPlugin.h b/ios/airship_flutter/Sources/airship_flutter/obj-c/include/AirshipPlugin.h deleted file mode 100644 index 038b6dc4..00000000 --- a/ios/airship_flutter/Sources/airship_flutter/obj-c/include/AirshipPlugin.h +++ /dev/null @@ -1,4 +0,0 @@ -#import - -@interface AirshipPlugin : NSObject -@end