diff --git a/example/ios/Runner/AppDelegate.m b/example/ios/Runner/AppDelegate.m index d76db9f9..f9b28f8a 100644 --- a/example/ios/Runner/AppDelegate.m +++ b/example/ios/Runner/AppDelegate.m @@ -2,9 +2,18 @@ #import "GeneratedPluginRegistrant.h" #import +#if __has_include() +#import +#else #import "CleverTap.h" +#endif +#if __has_include() +#import +#import +#else #import "CleverTapPlugin.h" #import "CleverTapPluginCustomTemplates.h" +#endif @implementation AppDelegate diff --git a/example/lib/main.dart b/example/lib/main.dart index 59daeece..cd138f12 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -563,7 +563,6 @@ class _MyAppState extends State { @override Widget build(BuildContext context) { return StyledToast( - locale: const Locale('en', 'US'), child: MaterialApp( home: Scaffold( appBar: AppBar( diff --git a/ios/Classes/CleverTapPlugin.m b/ios/Classes/CleverTapPlugin.m index 27bb3908..7931576d 100644 --- a/ios/Classes/CleverTapPlugin.m +++ b/ios/Classes/CleverTapPlugin.m @@ -1,21 +1,101 @@ +#if __has_include() +#import +#else #import "CleverTap.h" +#endif + #import "CleverTapPlugin.h" + +#if __has_include() +#import +#else #import "CleverTap+Inbox.h" +#endif + +#if __has_include() +#import +#else #import "CleverTapUTMDetail.h" +#endif + +#if __has_include() +#import +#else #import "CleverTapEventDetail.h" +#endif + +#if __has_include() +#import +#else #import "CleverTapSyncDelegate.h" +#endif + +#if __has_include() +#import +#else #import "CleverTap+DisplayUnit.h" +#endif + +#if __has_include() +#import +#else #import "CleverTap+FeatureFlags.h" +#endif + +#if __has_include() +#import +#else #import "CleverTap+ProductConfig.h" +#endif + +#if __has_include() +#import +#else #import "CleverTapPushNotificationDelegate.h" +#endif + +#if __has_include() +#import +#else #import "CleverTapInAppNotificationDelegate.h" +#endif + +#if __has_include() +#import +#else #import "CleverTap+InAppNotifications.h" +#endif + +#if __has_include() +#import +#else #import "CleverTap+PushPermission.h" +#endif + +#if __has_include() +#import +#else #import "CTLocalInApp.h" +#endif + +#if __has_include() +#import +#else #import "CleverTap+CTVar.h" +#endif + +#if __has_include() +#import +#else #import "CTVar.h" +#endif + +#if __has_include() +#import +#else #import "CTTemplateContext.h" +#endif @interface CleverTapPlugin () diff --git a/ios/Classes/CleverTapPluginCustomTemplates.m b/ios/Classes/CleverTapPluginCustomTemplates.m index d5eaae46..da35cdde 100644 --- a/ios/Classes/CleverTapPluginCustomTemplates.m +++ b/ios/Classes/CleverTapPluginCustomTemplates.m @@ -9,8 +9,18 @@ #import "CleverTapPluginCustomTemplates.h" #import "CleverTapPluginTemplatePresenter.h" #import "CleverTapPluginAppFunctionPresenter.h" + +#if __has_include() +#import +#else #import "CTJsonTemplateProducer.h" +#endif + +#if __has_include() +#import +#else #import "CTCustomTemplatesManager.h" +#endif @implementation CleverTapPluginCustomTemplates diff --git a/ios/Classes/include/CleverTapPlugin.h b/ios/Classes/include/CleverTapPlugin.h new file mode 120000 index 00000000..66b90f04 --- /dev/null +++ b/ios/Classes/include/CleverTapPlugin.h @@ -0,0 +1 @@ +../CleverTapPlugin.h \ No newline at end of file diff --git a/ios/Classes/include/CleverTapPluginAppFunctionPresenter.h b/ios/Classes/include/CleverTapPluginAppFunctionPresenter.h new file mode 120000 index 00000000..9b84638d --- /dev/null +++ b/ios/Classes/include/CleverTapPluginAppFunctionPresenter.h @@ -0,0 +1 @@ +../CleverTapPluginAppFunctionPresenter.h \ No newline at end of file diff --git a/ios/Classes/include/CleverTapPluginCustomTemplates.h b/ios/Classes/include/CleverTapPluginCustomTemplates.h new file mode 120000 index 00000000..367fdecc --- /dev/null +++ b/ios/Classes/include/CleverTapPluginCustomTemplates.h @@ -0,0 +1 @@ +../CleverTapPluginCustomTemplates.h \ No newline at end of file diff --git a/ios/Classes/include/CleverTapPluginTemplatePresenter.h b/ios/Classes/include/CleverTapPluginTemplatePresenter.h new file mode 120000 index 00000000..aff2c7cf --- /dev/null +++ b/ios/Classes/include/CleverTapPluginTemplatePresenter.h @@ -0,0 +1 @@ +../CleverTapPluginTemplatePresenter.h \ No newline at end of file diff --git a/ios/clevertap_plugin.podspec b/ios/clevertap_plugin.podspec index e56e912f..f4887cb5 100644 --- a/ios/clevertap_plugin.podspec +++ b/ios/clevertap_plugin.podspec @@ -11,7 +11,8 @@ Pod::Spec.new do |s| s.author = { "CleverTap" => "http://www.clevertap.com" } s.source = { :path => '.' } s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.exclude_files = 'Classes/include/**/*' + s.public_header_files = 'Classes/*.h' s.dependency 'Flutter' s.dependency 'CleverTap-iOS-SDK', '7.6.0' s.ios.deployment_target = '9.0' diff --git a/ios/clevertap_plugin/Classes b/ios/clevertap_plugin/Classes new file mode 120000 index 00000000..3578bf8a --- /dev/null +++ b/ios/clevertap_plugin/Classes @@ -0,0 +1 @@ +../Classes \ No newline at end of file diff --git a/ios/clevertap_plugin/Package.swift b/ios/clevertap_plugin/Package.swift new file mode 100644 index 00000000..c16e5f28 --- /dev/null +++ b/ios/clevertap_plugin/Package.swift @@ -0,0 +1,32 @@ +// swift-tools-version: 5.9 +import PackageDescription + +let package = Package( + name: "clevertap_plugin", + platforms: [ + .iOS("12.0") + ], + products: [ + .library(name: "clevertap-plugin", targets: ["clevertap_plugin"]) + ], + dependencies: [ + .package( + url: "https://github.com/CleverTap/clevertap-ios-sdk", + from: "7.6.0" + ) + ], + targets: [ + .target( + name: "clevertap_plugin", + dependencies: [ + .product(name: "CleverTapSDK", package: "clevertap-ios-sdk") + ], + path: "Classes", + publicHeadersPath: "include", + cSettings: [ + .headerSearchPath("include"), + .headerSearchPath(".") + ] + ) + ] +) diff --git a/pubspec.yaml b/pubspec.yaml index 1e3a71ab..fa5a6ac0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -28,6 +28,7 @@ flutter: pluginClass: CleverTapPlugin ios: pluginClass: CleverTapPlugin + swiftPackageName: clevertap_plugin web: pluginClass: CleverTapPluginWeb fileName: clevertap_plugin_web.dart