[CHORE] Trunk push error resolution (#7)

The pod trunk is failling with source files and license error. moved the podspec file to the parent directory for `pod lib lint` to work in both local and trunk. [TESTING] Release 0.0.1 version.
amazon-archives · Jan 20, 2020 · d6e86e0 · d6e86e0
1 parent a993059
commit d6e86e0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/...analytics-hub-ios/AppAnalyticsHub.podspec → AppAnalyticsHub.podspec b/...analytics-hub-ios/AppAnalyticsHub.podspec → AppAnalyticsHub.podspec
@@ -15,11 +15,11 @@ Pod::Spec.new do |s|
                        This CocoaPod provides a library that allows you to instrument your code with operational and behavioural metrics independent of the underlying metrics systems. The library allows you to record a metric with 1 or more systems integrated in your application without the need to create multiple events.
                        DESC
   s.homepage         = "https://github.com/amzn/app-analytics-hub"
-  s.license          = {:type => 'MIT', :file => '../LICENSE'}
+  s.license          = {:type => 'MIT', :file => 'LICENSE'}
   s.author           = { "Naveen Thontepu" => "[email protected]" }
   s.source           = { :git => "https://github.com/amzn/app-analytics-hub.git", :tag => s.version.to_s }
   s.platform     = :ios, '8.0'
   s.requires_arc = true
 
-  s.source_files = 'library/AppAnalyticsHubiOS/**/*'
+  s.source_files = 'app-analytics-hub-ios/library/AppAnalyticsHubiOS/**/*'
 end
diff --git a/app-analytics-hub-ios/sample/AppAnalyticsHubSample.xcodeproj/project.pbxproj b/app-analytics-hub-ios/sample/AppAnalyticsHubSample.xcodeproj/project.pbxproj
@@ -112,7 +112,7 @@
 				66A2ED2023CC408D00117100 /* Sources */,
 				66A2ED2123CC408D00117100 /* Frameworks */,
 				66A2ED2223CC408D00117100 /* Resources */,
-				3D6F26265E7667E41C115F32 /* [CP] Embed Pods Frameworks */,
+				97BB99EAD6E724B1185890B5 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -170,43 +170,43 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		3D6F26265E7667E41C115F32 /* [CP] Embed Pods Frameworks */ = {
+		5A7B495A47399F378945EE53 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-AppAnalyticsHubSample/Pods-AppAnalyticsHubSample-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Embed Pods Frameworks";
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-AppAnalyticsHubSample/Pods-AppAnalyticsHubSample-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-AppAnalyticsHubSample-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-AppAnalyticsHubSample/Pods-AppAnalyticsHubSample-frameworks.sh\"\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;
 		};
-		5A7B495A47399F378945EE53 /* [CP] Check Pods Manifest.lock */ = {
+		97BB99EAD6E724B1185890B5 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-AppAnalyticsHubSample/Pods-AppAnalyticsHubSample-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
+			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-AppAnalyticsHubSample-checkManifestLockResult.txt",
+				"${PODS_ROOT}/Target Support Files/Pods-AppAnalyticsHubSample/Pods-AppAnalyticsHubSample-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			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";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-AppAnalyticsHubSample/Pods-AppAnalyticsHubSample-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

diff --git a/app-analytics-hub-ios/sample/Podfile b/app-analytics-hub-ios/sample/Podfile
@@ -5,7 +5,7 @@ target 'AppAnalyticsHubSample' do
   # Comment the next line if you don't want to use dynamic frameworks
   use_frameworks!
 
-  pod 'AppAnalyticsHub', :path => '../' 
+  pod 'AppAnalyticsHub', :path => '../../' 
 
   # Pods for AppAnalyticsHubSample