Merge pull request #30 from erf23/core-beta

AMSDK-7218: v1.0.2beta2-ACPCore update
Adobe-Marketing-Cloud · Nov 21, 2018 · 6c2ce2c · 6c2ce2c
2 parents 701a2b6 + bf90311
commit 6c2ce2c
Show file tree

Hide file tree

Showing 19 changed files with 63 additions and 206 deletions.
diff --git a/ACPCoreBeta.podspec b/ACPCoreBeta.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "ACPCoreBeta"
-  s.version      = "1.0.2beta"
+  s.version      = "1.0.2beta2"
   s.summary      = "BETA - Core framework for Adobe Experience Cloud SDK. Written and Supported by Adobe, the official Pod for the Adobe Experience Cloud."
   s.description  = <<-DESC
                    By using the Adobe Cloud Platform SDKs (“Beta”), you hereby acknowledge that the Beta is provided “as is” without warranty of any kind. Adobe shall have no obligation to maintain, correct, update, change, modify or otherwise support the Beta. You are advised to use caution and not to rely in any way on the correct functioning or performance of such Beta and/or accompanying materials.
@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
 
   s.license      = {:type => "Commercial", :text => "Adobe Systems, Incorporated.  All Rights Reserved."}
   s.author       = "Adobe Cloud Platform SDK Team"
-  s.source       = { :git => 'https://github.com/Adobe-Marketing-Cloud/acp-sdks.git', :tag => "v1.0.2beta-ACPCore" }
+  s.source       = { :git => 'https://github.com/Adobe-Marketing-Cloud/acp-sdks.git', :tag => "v1.0.2beta2-ACPCore" }
   s.platform     = :ios, '10.0'
 
   s.default_subspec = 'iOS'

diff --git a/ACPCore_iOS.framework/ACPCore_iOS b/ACPCore_iOS.framework/ACPCore_iOS
diff --git a/ACPCore_iOS.framework/Headers/ACPCore.h b/ACPCore_iOS.framework/Headers/ACPCore.h
@@ -1,10 +1,10 @@
 //
 //  ACPCore.h
-//  Adobe Digital Marketing Suite -- iOS Application Measurement Library
+//  Adobe Experience Platform -- iOS Framework
 //
-//  Copyright 1996-2018. Adobe, Inc. All Rights Reserved
+//  Copyright 1996-2018. Adobe. All Rights Reserved
 //
-//  Core Version: 1.0.0b
+//  Core Version: 1.0.2beta
 
 #import <Foundation/Foundation.h>
 

diff --git a/ACPCore_iOS.framework/Headers/ACPCore_iOS.h b/ACPCore_iOS.framework/Headers/ACPCore_iOS.h
@@ -1,20 +1,8 @@
-/* ************************************************************************
- *
- * ADOBE CONFIDENTIAL
- * ___________________
- *
- * Copyright 2018 Adobe Systems Incorporated
- * All Rights Reserved.
- *
- * NOTICE:  All information contained herein is, and remains
- * the property of Adobe Systems Incorporated and its suppliers,
- * if any.  The intellectual and technical concepts contained
- * herein are proprietary to Adobe Systems Incorporated and its
- * suppliers and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from Adobe Systems Incorporated.
- **************************************************************************/
+//
+//  ACPCore_iOS.h
+//  Adobe Experience Platform -- iOS Framework
+//
+//  Copyright 1996-2018. Adobe. All Rights Reserved
 
 #import <UIKit/UIKit.h>
 

diff --git a/ACPCore_iOS.framework/Headers/ACPExtension.h b/ACPCore_iOS.framework/Headers/ACPExtension.h
@@ -1,20 +1,8 @@
-/* **************************************************************************
- *
- * ADOBE CONFIDENTIAL
- * ___________________
- *
- * Copyright 2018 Adobe Systems Incorporated
- * All Rights Reserved.
- *
- * NOTICE:  All information contained herein is, and remains
- * the property of Adobe Systems Incorporated and its suppliers,
- * if any.  The intellectual and technical concepts contained
- * herein are proprietary to Adobe Systems Incorporated and its
- * suppliers and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from Adobe Systems Incorporated.
- ****************************************************************************/
+//
+//  ACPExtension.h
+//  Adobe Experience Platform -- iOS Framework
+//
+//  Copyright 1996-2018. Adobe. All Rights Reserved
 
 #ifndef ADOBEMOBILE_ADBEXTENSIONINTERFACE_H
 #define ADOBEMOBILE_ADBEXTENSIONINTERFACE_H

diff --git a/ACPCore_iOS.framework/Headers/ACPExtensionApi.h b/ACPCore_iOS.framework/Headers/ACPExtensionApi.h
@@ -1,20 +1,8 @@
-/* **************************************************************************
- *
- * ADOBE CONFIDENTIAL
- * ___________________
- *
- * Copyright 2018 Adobe Systems Incorporated
- * All Rights Reserved.
- *
- * NOTICE:  All information contained herein is, and remains
- * the property of Adobe Systems Incorporated and its suppliers,
- * if any.  The intellectual and technical concepts contained
- * herein are proprietary to Adobe Systems Incorporated and its
- * suppliers and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from Adobe Systems Incorporated.
- ****************************************************************************/
+//
+//  ACPExtensionApi.h
+//  Adobe Experience Platform -- iOS Framework
+//
+//  Copyright 1996-2018. Adobe. All Rights Reserved
 
 #ifndef ADOBEMOBILE_ADBEXTENSIONSERVICES_H
 #define ADOBEMOBILE_ADBEXTENSIONSERVICES_H

diff --git a/ACPCore_iOS.framework/Headers/ACPExtensionError.h b/ACPCore_iOS.framework/Headers/ACPExtensionError.h
@@ -1,20 +1,8 @@
-/* **************************************************************************
- *
- * ADOBE CONFIDENTIAL
- * ___________________
- *
- * Copyright 2018 Adobe Systems Incorporated
- * All Rights Reserved.
- *
- * NOTICE:  All information contained herein is, and remains
- * the property of Adobe Systems Incorporated and its suppliers,
- * if any.  The intellectual and technical concepts contained
- * herein are proprietary to Adobe Systems Incorporated and its
- * suppliers and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from Adobe Systems Incorporated.
- ****************************************************************************/
+//
+//  ACPExtensionError.h
+//  Adobe Experience Platform -- iOS Framework
+//
+//  Copyright 1996-2018. Adobe. All Rights Reserved
 
 #ifndef ADOBEMOBILE_ADBEXTENSIONERROR_H
 #define ADOBEMOBILE_ADBEXTENSIONERROR_H

diff --git a/ACPCore_iOS.framework/Headers/ACPExtensionEvent.h b/ACPCore_iOS.framework/Headers/ACPExtensionEvent.h
@@ -1,20 +1,8 @@
-/* **************************************************************************
- *
- * ADOBE CONFIDENTIAL
- * ___________________
- *
- * Copyright 2018 Adobe Systems Incorporated
- * All Rights Reserved.
- *
- * NOTICE:  All information contained herein is, and remains
- * the property of Adobe Systems Incorporated and its suppliers,
- * if any.  The intellectual and technical concepts contained
- * herein are proprietary to Adobe Systems Incorporated and its
- * suppliers and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from Adobe Systems Incorporated.
- ****************************************************************************/
+//
+//  ACPExtensionEvent.h
+//  Adobe Experience Platform -- iOS Framework
+//
+//  Copyright 1996-2018. Adobe. All Rights Reserved
 
 #ifndef ADOBEMOBILE_ADBEXTENSIONEVENT_H
 #define ADOBEMOBILE_ADBEXTENSIONEVENT_H

diff --git a/ACPCore_iOS.framework/Headers/ACPExtensionListener.h b/ACPCore_iOS.framework/Headers/ACPExtensionListener.h
@@ -1,20 +1,8 @@
-/* **************************************************************************
- *
- * ADOBE CONFIDENTIAL
- * ___________________
- *
- * Copyright 2018 Adobe Systems Incorporated
- * All Rights Reserved.
- *
- * NOTICE:  All information contained herein is, and remains
- * the property of Adobe Systems Incorporated and its suppliers,
- * if any.  The intellectual and technical concepts contained
- * herein are proprietary to Adobe Systems Incorporated and its
- * suppliers and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from Adobe Systems Incorporated.
- ****************************************************************************/
+//
+//  ACPExtensionListener.h
+//  Adobe Experience Platform -- iOS Framework
+//
+//  Copyright 1996-2018. Adobe. All Rights Reserved
 
 #ifndef ADOBEMOBILE_ADBEXTENSIONLISTENER_H
 #define ADOBEMOBILE_ADBEXTENSIONLISTENER_H

diff --git a/ACPCore_iOS.framework/Headers/ACPMobileVisitorId.h b/ACPCore_iOS.framework/Headers/ACPMobileVisitorId.h
@@ -1,21 +1,8 @@
-/*************************************************************************
- *
- * ADOBE CONFIDENTIAL
- * ___________________
- *
- *  Copyright 2017 Adobe Systems Incorporated
- *  All Rights Reserved.
- *
- * NOTICE:  All information contained herein is, and remains
- * the property of Adobe Systems Incorporated and its suppliers,
- * if any.  The intellectual and technical concepts contained
- * herein are proprietary to Adobe Systems Incorporated and its
- * suppliers and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from Adobe Systems Incorporated.
- *
- **************************************************************************/
+//
+//  ACPMobileVisitorId.h
+//  Adobe Experience Platform -- iOS Framework
+//
+//  Copyright 1996-2018. Adobe. All Rights Reserved
 
 #ifndef ADBMOBILEMARKETING_ACPMobileVisitorId_H
 #define ADBMOBILEMARKETING_ACPMobileVisitorId_H

diff --git a/ACPCore_iOS.framework/Headers/MobileMarketingCoreBridge.h b/ACPCore_iOS.framework/Headers/MobileMarketingCoreBridge.h
@@ -1,20 +1,8 @@
-/* **************************************************************************
- *
- * ADOBE CONFIDENTIAL
- * ___________________
- *
- * Copyright 2017 Adobe Systems Incorporated
- * All Rights Reserved.
- *
- * NOTICE:  All information contained herein is, and remains
- * the property of Adobe Systems Incorporated and its suppliers,
- * if any.  The intellectual and technical concepts contained
- * herein are proprietary to Adobe Systems Incorporated and its
- * suppliers and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from Adobe Systems Incorporated.
- ****************************************************************************/
+//
+//  MobileMarketingCoreBridge.h
+//  Adobe Experience Platform -- iOS Framework
+//
+//  Copyright 1996-2018. Adobe. All Rights Reserved
 
 #include <AdobeMarketingMobileCore/AdobeMarketingMobileCore.h>
 

diff --git a/ACPCore_iOS.framework/Headers/TypeBridge.h b/ACPCore_iOS.framework/Headers/TypeBridge.h
@@ -1,21 +1,8 @@
-/***************************************************************************
- *
- * ADOBE CONFIDENTIAL
- * ___________________
- *
- * Copyright 2017 Adobe Systems Incorporated
- * All Rights Reserved.
- *
- * NOTICE:  All information contained herein is, and remains
- * the property of Adobe Systems Incorporated and its suppliers,
- * if any.  The intellectual and technical concepts contained
- * herein are proprietary to Adobe Systems Incorporated and its
- * suppliers and are protected by trade secret or copyright law.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from Adobe Systems Incorporated.
- *
- **************************************************************************/
+//
+//  TypeBridge.h
+//  Adobe Experience Platform -- iOS Framework
+//
+//  Copyright 1996-2018. Adobe. All Rights Reserved
 
 #import <AdobeMarketingMobileCore/AdobeMarketingMobileCore.h>
 #import <Foundation/Foundation.h>

diff --git a/ACPCore_iOS.framework/Info.plist b/ACPCore_iOS.framework/Info.plist
diff --git a/AdobeMarketingMobileCore.framework/AdobeMarketingMobileCore b/AdobeMarketingMobileCore.framework/AdobeMarketingMobileCore
diff --git a/AdobeMarketingMobileCore.framework/Headers/EventHub.h b/AdobeMarketingMobileCore.framework/Headers/EventHub.h
@@ -27,6 +27,7 @@
 #include <string>
 #include <thread>
 #include <typeinfo>
+#include "Common.h"
 #include "Object.h"
 #include "Event.h"
 #include "TaskExecutor.h"
@@ -189,15 +190,8 @@ namespace AdobeMarketingMobile {
          *
          * TModule must be a subclass of Module.
          *
-         * Example:
-         *
-         *     class MyModule : public Module { ... };
-         *
-         *     void RegisterOneTimeListenerToMyModule(const std::shared_ptr<EventHub>& event_hub
-         *                                            EventType event_type, EventSource event_source, const std::string& pair_id,
-         *                                            const std::function<void(const std::shared_ptr<Event>&)>& listener_block) {
-         *         event_hub->RegisterOneTimeListener<MyModule>(event_type, event_source, pair_id, listener_block);
-         *     }
+         * This method is deprecated and it will be removed in the upcoming versions, use
+         * EventHub::RegisterOneTimeListener(std::string&, const std::function<void(const std::shared_ptr<Event>&)>&) instead
          *
          * @param event_type - the EventType of an event to listen for
          * @param event_source - the EventSource of an event to listen for
@@ -210,6 +204,10 @@ namespace AdobeMarketingMobile {
                                      const std::string& pair_id,
                                      const std::function<void(const std::shared_ptr<Event>&)>& listener_block);
 
+        /**
+         * This method is deprecated and it will be removed in the upcoming versions, use
+         * EventHub::RegisterOneTimeListener(std::string&, const std::function<void(const std::shared_ptr<Event>&)>&) instead
+         */
         template<class TModule>
         void RegisterOneTimeListener(const std::shared_ptr<EventType>& event_type,
                                      const std::shared_ptr<EventSource>& event_source,
@@ -298,11 +296,6 @@ namespace AdobeMarketingMobile {
          */
         static void CallModuleUnregisterModule(const std::shared_ptr<Module>& module);
 
-        /**
-         * @private
-         *
-         * Calls Module::RegisterOneTimeListenerBlock();
-         */
         static void CallModuleRegisterOneTimeListener(const std::shared_ptr<Module>& module,
                 const std::shared_ptr<EventType>& event_type,
                 const std::shared_ptr<EventSource>& event_source,
@@ -515,7 +508,6 @@ namespace AdobeMarketingMobile {
         static_assert(std::is_base_of<Module, TModule>::value, "Type of TModule must be derived from Module.");
 
         size_t type_hash = typeid(TModule).hash_code();
-
         RegisterOneTimeListener(type_hash, event_type, event_source, pair_id, listener_block);
     }
 
@@ -536,13 +528,7 @@ namespace AdobeMarketingMobile {
     template<class TModule>
     void EventHub::RegisterOneTimeListener(const std::string& pair_id,
                                            const std::function<void(const std::shared_ptr<Event>&)>& listener_block) {
-
-        // If you get an error on the following line, you need to make sure the type you pass
-        // into RegisterOneTimeListener is a subclass of Module.
-        static_assert(std::is_base_of<Module, TModule>::value, "Type of TModule must be derived from Module.");
-
         size_t type_hash = typeid(TModule).hash_code();
-
         RegisterOneTimeListener(type_hash, nullptr, nullptr, pair_id, listener_block);
     }
 }

diff --git a/AdobeMarketingMobileCore.framework/Headers/Module.h b/AdobeMarketingMobileCore.framework/Headers/Module.h
@@ -330,25 +330,7 @@ namespace AdobeMarketingMobile {
         void RegisterWildCardListener();
 
         /**
-         * Registers a one-time block with the parent event hub.
-         *
-         * A one-time block is an event handler that will cease to function after it sucessfully 'hears' one event.
-         *
-         * This method will only have an effect while the Module is registered. Calling this method before
-         * the Module is registered or after it is unregistered will be a noop.
-         *
-         * Threading
-         * =========
-         * This method is thread-safe.
-         *
-         * Due to threading, it is possible (but rare) for existing listeners on event_type/event_source to get invoked slightly after
-         * calling this function. For stricter ordering guarantees, Modules should override ModuleEventListener::OnUnregistered
-         * and ModuleEventListener::OnRegistered.
-         *
-         * @param type - the EventType of an event to listen for
-         * @param source - the EventSource of an event to listen for
-         * @param pair_id - optional pairID to listen for -- this is primarily used for request/response events
-         * @param block - the block to call when the event is heard
+         * This method is not used, keeping it for compatibility reasons
          */
         ADOBE_VIRTUAL_FOR_TESTS void RegisterOneTimeListenerBlock(const std::shared_ptr<EventType>& type,
                 const std::shared_ptr<EventSource>& source,

diff --git a/AdobeMarketingMobileCore.framework/Headers/ModuleEventListener.h b/AdobeMarketingMobileCore.framework/Headers/ModuleEventListener.h
@@ -71,7 +71,7 @@ namespace AdobeMarketingMobile {
      * A module may only have a single listener for a given event type and source.
      *
      * Alternatively, one time listeners can be registered to react once to a single, specific event.
-     * @see Module::RegisterOneTimeListenerBlock.
+     * @see EventHub::RegisterOneTimeListener.
      *
      * Responding to Events
      * ====================