conflict fix

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

Gems/AWSClientAuth/Code/CMakeLists.txt

@@ -15,9 +15,9 @@ ly_add_target(
         awsclientauth_files.cmake
     INCLUDE_DIRECTORIES
         PUBLIC
-            Include/Public
+            Include
         PRIVATE
-            Include/Private
+            Source
     BUILD_DEPENDENCIES
         PRIVATE
             AZ::AzCore
@@ -35,7 +35,7 @@ ly_add_target(
         awsclientauth_shared_files.cmake
     INCLUDE_DIRECTORIES
         PRIVATE
-            Include/Private
+            Source
     BUILD_DEPENDENCIES
         PRIVATE
             AZ::AzCore
@@ -97,8 +97,8 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
             awsclientauth_test_files.cmake
         INCLUDE_DIRECTORIES
             PRIVATE
-                "Include/Private"
-                "Include/Public"
+                Source
+                Include
                 Tests
         BUILD_DEPENDENCIES
             PRIVATE

Gems/AWSClientAuth/Code/awsclientauth_files.cmake

@@ -7,46 +7,43 @@
 #
 
 set(FILES
-    Include/Public/Authentication/AuthenticationProviderBus.h
-    Include/Public/Authentication/AuthenticationTokens.h
-    Include/Public/Authorization/AWSCognitoAuthorizationBus.h
-    Include/Public/Authorization/ClientAuthAWSCredentials.h
-    Include/Public/UserManagement/AWSCognitoUserManagementBus.h
+    Include/Authentication/AuthenticationProviderBus.h
+    Include/Authentication/AuthenticationTokens.h
+    Include/Authorization/AWSCognitoAuthorizationBus.h
+    Include/Authorization/ClientAuthAWSCredentials.h
+    Include/UserManagement/AWSCognitoUserManagementBus.h
 
-    Include/Private/AWSClientAuthSystemComponent.h
-    Include/Private/AWSClientAuthBus.h
-    Include/Private/AWSClientAuthResourceMappingConstants.h
-    Include/Private/Authentication/AuthenticationProviderTypes.h
-    Include/Private/Authentication/AuthenticationProviderScriptCanvasBus.h
-    Include/Private/Authentication/AuthenticationProviderManager.h
-    Include/Private/Authentication/AuthenticationNotificationBusBehaviorHandler.h
-
-    Include/Private/Authorization/AWSCognitoAuthorizationController.h
-    Include/Private/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.h
-    Include/Private/Authorization/AWSCognitoAuthorizationNotificationBusBehaviorHandler.h
-    Include/Private/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.h
-
-    Include/Private/UserManagement/AWSCognitoUserManagementController.h
-    Include/Private/UserManagement/UserManagementNotificationBusBehaviorHandler.h
-    
-    Include/Private/Authentication/AuthenticationProviderInterface.h
-    Include/Private/Authentication/OAuthConstants.h
-    Include/Private/Authentication/AWSCognitoAuthenticationProvider.h
-    Include/Private/Authentication/LWAAuthenticationProvider.h
-    Include/Private/Authentication/GoogleAuthenticationProvider.h
- 
     Source/AWSClientAuthSystemComponent.cpp
-    Source/Authentication/AuthenticationTokens.cpp
-    Source/Authentication/AuthenticationProviderInterface.cpp
-    Source/Authentication/AuthenticationProviderManager.cpp
-    Source/Authentication/AWSCognitoAuthenticationProvider.cpp
-    Source/Authentication/LWAAuthenticationProvider.cpp
-    Source/Authentication/GoogleAuthenticationProvider.cpp
+    Source/AWSClientAuthSystemComponent.h
+    Source/AWSClientAuthBus.h
+    Source/AWSClientAuthResourceMappingConstants.h
+
+    Source/Authentication/AuthenticationNotificationBusBehaviorHandler.h
+    Source/Authentication/AuthenticationProviderInterface.cpp
+    Source/Authentication/AuthenticationProviderInterface.h
+    Source/Authentication/AuthenticationProviderManager.cpp
+    Source/Authentication/AuthenticationProviderManager.h
+    Source/Authentication/AuthenticationProviderScriptCanvasBus.h
+    Source/Authentication/AuthenticationProviderTypes.h
+    Source/Authentication/AuthenticationTokens.cpp
+    Source/Authentication/AWSCognitoAuthenticationProvider.cpp
+    Source/Authentication/AWSCognitoAuthenticationProvider.h
+    Source/Authentication/LWAAuthenticationProvider.cpp
+    Source/Authentication/LWAAuthenticationProvider.h
+    Source/Authentication/GoogleAuthenticationProvider.cpp
+    Source/Authentication/GoogleAuthenticationProvider.h  
+    Source/Authentication/OAuthConstants.h
 
-    Source/Authorization/ClientAuthAWSCredentials.cpp
-    Source/Authorization/AWSCognitoAuthorizationController.cpp
-    Source/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.cpp
     Source/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.cpp
+    Source/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.h
+    Source/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.cpp
+    Source/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.h
+    Source/Authorization/AWSCognitoAuthorizationController.cpp
+    Source/Authorization/AWSCognitoAuthorizationController.h
+    Source/Authorization/AWSCognitoAuthorizationNotificationBusBehaviorHandler.h
+    Source/Authorization/ClientAuthAWSCredentials.cpp
 
     Source/UserManagement/AWSCognitoUserManagementController.cpp
+    Source/UserManagement/AWSCognitoUserManagementController.h
+    Source/UserManagement/UserManagementNotificationBusBehaviorHandler.h
 )

Gems/AWSClientAuth/Code/awsclientauth_shared_files.cmake

@@ -7,6 +7,6 @@
 #
 
 set(FILES
-    Include/Private/AWSClientAuthModule.h
     Source/AWSClientAuthModule.cpp
+    Source/AWSClientAuthModule.h
 )

Gems/AWSCore/Code/CMakeLists.txt

@@ -16,10 +16,10 @@ ly_add_target(
          ${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
     INCLUDE_DIRECTORIES
         PUBLIC
-            Include/Public
+            Include
             ${pal_dir}
         PRIVATE
-            Include/Private
+            Source
     BUILD_DEPENDENCIES
         PRIVATE
             AZ::AzCore
@@ -36,7 +36,7 @@ ly_add_target(
         awscore_shared_files.cmake
     INCLUDE_DIRECTORIES
         PRIVATE
-            Include/Private
+            Source
     BUILD_DEPENDENCIES
         PRIVATE
             AZ::AzCore
@@ -71,10 +71,10 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
             ${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_editor_files.cmake
         INCLUDE_DIRECTORIES
             PRIVATE
-                Include/Private
+                Source
                 ${pal_dir}
             PUBLIC
-                Include/Public
+                Include
         BUILD_DEPENDENCIES
             PRIVATE
                 AZ::AzQtComponents
@@ -93,7 +93,7 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
             awscore_editor_shared_files.cmake
         INCLUDE_DIRECTORIES
             PRIVATE
-                Include/Private
+                Source
         BUILD_DEPENDENCIES
             PRIVATE
                 AZ::AzCore
@@ -112,7 +112,7 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
                 awscore_resourcemappingtool_files.cmake
             INCLUDE_DIRECTORIES
                 PRIVATE
-                    Include/Private
+                    Source
             BUILD_DEPENDENCIES
                 PRIVATE
                     Gem::AWSCore.Editor.Static
@@ -156,8 +156,8 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
             awscore_tests_files.cmake
         INCLUDE_DIRECTORIES
             PRIVATE
-                Include/Private
-                Include/Public
+                Source
+                Include
                 Tests
         BUILD_DEPENDENCIES
             PRIVATE
@@ -190,9 +190,9 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
                 ${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_editor_tests_files.cmake
             INCLUDE_DIRECTORIES
                 PRIVATE
-                    Include/Private
+                    Source
                     ${pal_dir}
-                    Include/Public
+                    Include
                     Tests
             COMPILE_DEFINITIONS
                 PRIVATE

Gems/AWSCore/Code/awscore_editor_files.cmake

@@ -7,25 +7,25 @@
 #
 
 set(FILES
-    Include/Private/AWSCoreEditorSystemComponent.h
-    Include/Private/Editor/Attribution/AWSCoreAttributionConstant.h
-    Include/Private/Editor/Attribution/AWSCoreAttributionMetric.h
-    Include/Private/Editor/Attribution/AWSCoreAttributionManager.h
-    Include/Private/Editor/Attribution/AWSCoreAttributionSystemComponent.h
-    Include/Private/Editor/Attribution/AWSAttributionServiceApi.h
-    Include/Private/Editor/Attribution/AWSCoreAttributionConsentDialog.h
-    Include/Private/Editor/AWSCoreEditorManager.h
-    Include/Private/Editor/Constants/AWSCoreEditorMenuLinks.h
-    Include/Private/Editor/Constants/AWSCoreEditorMenuNames.h
-    Include/Private/Editor/UI/AWSCoreEditorMenu.h
-    Include/Private/Editor/UI/AWSCoreResourceMappingToolAction.h
     Source/AWSCoreEditorSystemComponent.cpp
-    Source/Editor/AWSCoreEditorManager.cpp
+    Source/AWSCoreEditorSystemComponent.h
+    Source/Editor/Attribution/AWSCoreAttributionConstant.h
     Source/Editor/Attribution/AWSCoreAttributionMetric.cpp
+    Source/Editor/Attribution/AWSCoreAttributionMetric.h
     Source/Editor/Attribution/AWSCoreAttributionManager.cpp
+    Source/Editor/Attribution/AWSCoreAttributionManager.h
     Source/Editor/Attribution/AWSCoreAttributionSystemComponent.cpp
+    Source/Editor/Attribution/AWSCoreAttributionSystemComponent.h
     Source/Editor/Attribution/AWSAttributionServiceApi.cpp
+    Source/Editor/Attribution/AWSAttributionServiceApi.h
     Source/Editor/Attribution/AWSCoreAttributionConsentDialog.cpp
+    Source/Editor/Attribution/AWSCoreAttributionConsentDialog.h
+    Source/Editor/AWSCoreEditorManager.cpp
+    Source/Editor/AWSCoreEditorManager.h
+    Source/Editor/Constants/AWSCoreEditorMenuLinks.h
+    Source/Editor/Constants/AWSCoreEditorMenuNames.h
     Source/Editor/UI/AWSCoreEditorMenu.cpp
+    Source/Editor/UI/AWSCoreEditorMenu.h
     Source/Editor/UI/AWSCoreResourceMappingToolAction.cpp
+    Source/Editor/UI/AWSCoreResourceMappingToolAction.h
 )

Gems/AWSCore/Code/awscore_editor_shared_files.cmake

@@ -7,6 +7,6 @@
 #
 
 set(FILES
-    Include/Private/AWSCoreEditorModule.h
     Source/AWSCoreEditorModule.cpp
+    Source/AWSCoreEditorModule.h
 )

Gems/AWSCore/Code/awscore_files.cmake

@@ -7,50 +7,54 @@
 #
 
 set(FILES
-    Include/Public/AWSCoreBus.h
-    Include/Public/Credential/AWSCredentialBus.h
-    Include/Public/Framework/AWSApiClientJob.h
-    Include/Public/Framework/AWSApiClientJobConfig.h
-    Include/Public/Framework/AWSApiJob.h
-    Include/Public/Framework/AWSApiJobConfig.h
-    Include/Public/Framework/AWSApiRequestJob.h
-    Include/Public/Framework/AWSApiRequestJobConfig.h
-    Include/Public/Framework/Error.h
-    Include/Public/Framework/HttpClientComponent.h
-    Include/Public/Framework/HttpRequestJob.h
-    Include/Public/Framework/HttpRequestJobConfig.h
-    Include/Public/Framework/JobExecuter.h
-    Include/Public/Framework/JsonObjectHandler.h
-    Include/Public/Framework/JsonWriter.h
-    Include/Public/Framework/MultipartFormData.h
-    Include/Public/Framework/RequestBuilder.h
-    Include/Public/Framework/ServiceClientJob.h
-    Include/Public/Framework/ServiceClientJobConfig.h
-    Include/Public/Framework/ServiceJob.h
-    Include/Public/Framework/ServiceJobConfig.h
-    Include/Public/Framework/ServiceJobUtil.h
-    Include/Public/Framework/ServiceRequestJob.h
-    Include/Public/Framework/ServiceRequestJobConfig.h
-    Include/Public/Framework/Util.h
-    Include/Public/ResourceMapping/AWSResourceMappingBus.h
-    Include/Public/ScriptCanvas/AWSScriptBehaviorDynamoDB.h
-    Include/Public/ScriptCanvas/AWSScriptBehaviorLambda.h
-    Include/Public/ScriptCanvas/AWSScriptBehaviorS3.h
-    Include/Public/ScriptCanvas/AWSScriptBehaviorsComponent.h
-    Include/Private/AWSCoreInternalBus.h
-    Include/Private/AWSCoreSystemComponent.h
-    Include/Private/Configuration/AWSCoreConfiguration.h
-    Include/Private/Credential/AWSCredentialManager.h
-    Include/Private/Credential/AWSCVarCredentialHandler.h
-    Include/Private/Credential/AWSDefaultCredentialHandler.h
-    Include/Private/ResourceMapping/AWSResourceMappingConstants.h
-    Include/Private/ResourceMapping/AWSResourceMappingManager.h
-    Include/Private/ResourceMapping/AWSResourceMappingUtils.h
+    Include/AWSCoreBus.h
+    Include/Credential/AWSCredentialBus.h
+    Include/Framework/AWSApiClientJob.h
+    Include/Framework/AWSApiClientJobConfig.h
+    Include/Framework/AWSApiJob.h
+    Include/Framework/AWSApiJobConfig.h
+    Include/Framework/AWSApiRequestJob.h
+    Include/Framework/AWSApiRequestJobConfig.h
+    Include/Framework/Error.h
+    Include/Framework/HttpClientComponent.h
+    Include/Framework/HttpRequestJob.h
+    Include/Framework/HttpRequestJobConfig.h
+    Include/Framework/JobExecuter.h
+    Include/Framework/JsonObjectHandler.h
+    Include/Framework/JsonWriter.h
+    Include/Framework/MultipartFormData.h
+    Include/Framework/RequestBuilder.h
+    Include/Framework/ServiceClientJob.h
+    Include/Framework/ServiceClientJobConfig.h
+    Include/Framework/ServiceJob.h
+    Include/Framework/ServiceJobConfig.h
+    Include/Framework/ServiceJobUtil.h
+    Include/Framework/ServiceRequestJob.h
+    Include/Framework/ServiceRequestJobConfig.h
+    Include/Framework/Util.h
+    Include/ResourceMapping/AWSResourceMappingBus.h
+    Include/ScriptCanvas/AWSScriptBehaviorDynamoDB.h
+    Include/ScriptCanvas/AWSScriptBehaviorLambda.h
+    Include/ScriptCanvas/AWSScriptBehaviorS3.h
+    Include/ScriptCanvas/AWSScriptBehaviorsComponent.h
+
+    Source/AWSCoreInternalBus.h
     Source/AWSCoreSystemComponent.cpp
+    Source/AWSCoreSystemComponent.h
     Source/Configuration/AWSCoreConfiguration.cpp
+    Source/Configuration/AWSCoreConfiguration.h
     Source/Credential/AWSCredentialManager.cpp
+    Source/Credential/AWSCredentialManager.h
     Source/Credential/AWSCVarCredentialHandler.cpp
+    Source/Credential/AWSCVarCredentialHandler.h
     Source/Credential/AWSDefaultCredentialHandler.cpp
+    Source/Credential/AWSDefaultCredentialHandler.h
+    Source/ResourceMapping/AWSResourceMappingConstants.h
+    Source/ResourceMapping/AWSResourceMappingManager.cpp
+    Source/ResourceMapping/AWSResourceMappingManager.h
+    Source/ResourceMapping/AWSResourceMappingUtils.cpp
+    Source/ResourceMapping/AWSResourceMappingUtils.h
+    
     Source/Framework/AWSApiJob.cpp
     Source/Framework/AWSApiJobConfig.cpp
     Source/Framework/Error.cpp
@@ -61,8 +65,6 @@ set(FILES
     Source/Framework/RequestBuilder.cpp
     Source/Framework/ServiceJob.cpp
     Source/Framework/ServiceJobConfig.cpp
-    Source/ResourceMapping/AWSResourceMappingManager.cpp
-    Source/ResourceMapping/AWSResourceMappingUtils.cpp
     Source/ScriptCanvas/AWSScriptBehaviorDynamoDB.cpp
     Source/ScriptCanvas/AWSScriptBehaviorLambda.cpp
     Source/ScriptCanvas/AWSScriptBehaviorS3.cpp

Gems/AWSCore/Code/awscore_shared_files.cmake

@@ -7,6 +7,6 @@
 #
 
 set(FILES
-    Include/Private/AWSCoreModule.h
     Source/AWSCoreModule.cpp
+    Source/AWSCoreModule.h   
 )

Gems/AWSMetrics/Code/CMakeLists.txt

@@ -13,9 +13,9 @@ ly_add_target(
         awsmetrics_files.cmake
     INCLUDE_DIRECTORIES
         PUBLIC
-            Include/Public
+            Include
         PRIVATE
-            Include/Private
+            Source
     BUILD_DEPENDENCIES
         PRIVATE
             AZ::AzCore
@@ -32,9 +32,9 @@ ly_add_target(
         awsmetrics_shared_files.cmake
     INCLUDE_DIRECTORIES
         PUBLIC
-            Include/Public
+            Include
         PRIVATE
-            Include/Private
+            Source
     BUILD_DEPENDENCIES
         PRIVATE
             AZ::AzCore
@@ -88,8 +88,8 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
             awsmetrics_tests_files.cmake
         INCLUDE_DIRECTORIES
             PRIVATE
-                Include/Private
-                Include/Public
+                Include
+                Source
                 Tests
         BUILD_DEPENDENCIES
             PRIVATE