Merge pull request #113 from amplitude/rename-carthage-framework

Rename carthage framework
amplitude · Aug 18, 2016 · 837be3e · 837be3e
2 parents 872b987 + ac2ae7d
commit 837be3e
Show file tree

Hide file tree

Showing 30 changed files with 42 additions and 9,696 deletions.
diff --git a/Amplitude.xcodeproj/project.pbxproj b/Amplitude.xcodeproj/project.pbxproj
@@ -88,7 +88,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		343AB4171CC99F4F00962943 /* AmplitudeFramework.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AmplitudeFramework.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		343AB4171CC99F4F00962943 /* Amplitude.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Amplitude.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		343AB4191CC99F4F00962943 /* AmplitudeFramework.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AmplitudeFramework.h; sourceTree = "<group>"; };
 		343AB41B1CC99F4F00962943 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		60227C091CC5AB8A007C117B /* AMPRevenue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AMPRevenue.h; sourceTree = "<group>"; };
@@ -128,6 +128,7 @@
 		9DFBB9C91AB0D26E0017F703 /* BaseTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BaseTestCase.m; sourceTree = "<group>"; };
 		9DFBB9CB1AB0D47A0017F703 /* SessionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SessionTests.m; sourceTree = "<group>"; };
 		C671D5C7AB6BB2A4B86F6EDF /* Pods-test.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-test.release.xcconfig"; path = "Pods/Target Support Files/Pods-test/Pods-test.release.xcconfig"; sourceTree = "<group>"; };
+		D7280F441D655B9900CF13D4 /* Amplitude.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = Amplitude.modulemap; sourceTree = "<group>"; };
 		E93C8C541A59B3B9001339A5 /* AMPLocationManagerDelegateTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AMPLocationManagerDelegateTests.m; sourceTree = "<group>"; };
 		E96785E11A48E93F00887CCD /* AMPARCMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AMPARCMacros.h; sourceTree = "<group>"; };
 		E96785E21A48E93F00887CCD /* AMPConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AMPConstants.h; sourceTree = "<group>"; };
@@ -172,6 +173,7 @@
 			isa = PBXGroup;
 			children = (
 				343AB4191CC99F4F00962943 /* AmplitudeFramework.h */,
+				D7280F441D655B9900CF13D4 /* Amplitude.modulemap */,
 				343AB41B1CC99F4F00962943 /* Info.plist */,
 			);
 			path = AmplitudeFramework;
@@ -225,7 +227,7 @@
 			children = (
 				E98C05231A48E7FE00800C63 /* libAmplitude.a */,
 				E98C052E1A48E7FE00800C63 /* AmplitudeTests.xctest */,
-				343AB4171CC99F4F00962943 /* AmplitudeFramework.framework */,
+				343AB4171CC99F4F00962943 /* Amplitude.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -297,6 +299,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				343AB4321CC9A1EA00962943 /* Amplitude.h in Headers */,
 				343AB4351CC9A1EA00962943 /* AMPRevenue.h in Headers */,
 				343AB4341CC9A1EA00962943 /* AMPLocationManagerDelegate.h in Headers */,
 				343AB42F1CC9A1EA00962943 /* AMPDatabaseHelper.h in Headers */,
@@ -310,7 +313,6 @@
 				343AB4311CC9A1EA00962943 /* AMPIdentify.h in Headers */,
 				343AB4361CC9A1EA00962943 /* AMPURLConnection.h in Headers */,
 				343AB4391CC9A1EA00962943 /* ISPPinnedNSURLConnectionDelegate.h in Headers */,
-				343AB4321CC9A1EA00962943 /* Amplitude.h in Headers */,
 				343AB4371CC9A1EA00962943 /* AMPUtils.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -333,7 +335,7 @@
 			);
 			name = AmplitudeFramework;
 			productName = AmplitudeFramework;
-			productReference = 343AB4171CC99F4F00962943 /* AmplitudeFramework.framework */;
+			productReference = 343AB4171CC99F4F00962943 /* Amplitude.framework */;
 			productType = "com.apple.product-type.framework";
 		};
 		E98C05221A48E7FE00800C63 /* Amplitude */ = {
@@ -569,8 +571,9 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = AmplitudeFramework/Amplitude.modulemap;
 				PRODUCT_BUNDLE_IDENTIFIER = com.amplitude.AmplitudeFramework;
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = Amplitude;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -597,8 +600,9 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = AmplitudeFramework/Amplitude.modulemap;
 				PRODUCT_BUNDLE_IDENTIFIER = com.amplitude.AmplitudeFramework;
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = Amplitude;
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";

diff --git a/Amplitude.xcodeproj/xcshareddata/xcschemes/AmplitudeFramework.xcscheme b/Amplitude.xcodeproj/xcshareddata/xcschemes/AmplitudeFramework.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "343AB4161CC99F4F00962943"
-               BuildableName = "AmplitudeFramework.framework"
+               BuildableName = "Amplitude.framework"
                BlueprintName = "AmplitudeFramework"
                ReferencedContainer = "container:Amplitude.xcodeproj">
             </BuildableReference>
@@ -46,7 +46,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "343AB4161CC99F4F00962943"
-            BuildableName = "AmplitudeFramework.framework"
+            BuildableName = "Amplitude.framework"
             BlueprintName = "AmplitudeFramework"
             ReferencedContainer = "container:Amplitude.xcodeproj">
          </BuildableReference>
@@ -64,7 +64,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "343AB4161CC99F4F00962943"
-            BuildableName = "AmplitudeFramework.framework"
+            BuildableName = "Amplitude.framework"
             BlueprintName = "AmplitudeFramework"
             ReferencedContainer = "container:Amplitude.xcodeproj">
          </BuildableReference>

diff --git a/AmplitudeFramework/Amplitude.modulemap b/AmplitudeFramework/Amplitude.modulemap
@@ -0,0 +1,6 @@
+framework module Amplitude {
+    umbrella header "AmplitudeFramework.h"
+
+    export *
+    module * { export * }
+}
diff --git a/AmplitudeFramework/AmplitudeFramework.h b/AmplitudeFramework/AmplitudeFramework.h
@@ -1,24 +1,24 @@
 #import <UIKit/UIKit.h>
 
-//! Project version number for AmplitudeFramework.
-FOUNDATION_EXPORT double AmplitudeFrameworkVersionNumber;
+//! Project version number for Amplitude.
+FOUNDATION_EXPORT double AmplitudeVersionNumber;
 
-//! Project version string for AmplitudeFramework.
-FOUNDATION_EXPORT const unsigned char AmplitudeFrameworkVersionString[];
+//! Project version string for Amplitude.
+FOUNDATION_EXPORT const unsigned char AmplitudeVersionString[];
 
-// In this header, you should import all the public headers of your framework using statements like #import <AmplitudeFramework/PublicHeader.h>
+// In this header, you should import all the public headers of your framework using statements like #import <Amplitude/PublicHeader.h>
 
-#import <AmplitudeFramework/AMPARCMacros.h>
-#import <AmplitudeFramework/AMPConstants.h>
-#import <AmplitudeFramework/AMPDatabaseHelper.h>
-#import <AmplitudeFramework/AMPDeviceInfo.h>
-#import <AmplitudeFramework/AMPIdentify.h>
-#import <AmplitudeFramework/Amplitude.h>
-#import <AmplitudeFramework/Amplitude+SSLPinning.h>
-#import <AmplitudeFramework/AMPLocationManagerDelegate.h>
-#import <AmplitudeFramework/AMPRevenue.h>
-#import <AmplitudeFramework/AMPURLConnection.h>
-#import <AmplitudeFramework/AMPUtils.h>
-#import <AmplitudeFramework/SSLCertificatePinning/ISPCertificatePinning.h>
-#import <AmplitudeFramework/SSLCertificatePinning/ISPPinnedNSURLConnectionDelegate.h>
-#import <AmplitudeFramework/SSLCertificatePinning/ISPPinnedNSURLSessionDelegate.h>
+#import <Amplitude/AMPARCMacros.h>
+#import <Amplitude/AMPConstants.h>
+#import <Amplitude/AMPDatabaseHelper.h>
+#import <Amplitude/AMPDeviceInfo.h>
+#import <Amplitude/AMPIdentify.h>
+#import <Amplitude/Amplitude.h>
+#import <Amplitude/Amplitude+SSLPinning.h>
+#import <Amplitude/AMPLocationManagerDelegate.h>
+#import <Amplitude/AMPRevenue.h>
+#import <Amplitude/AMPURLConnection.h>
+#import <Amplitude/AMPUtils.h>
+#import <Amplitude/ISPCertificatePinning.h>
+#import <Amplitude/ISPPinnedNSURLConnectionDelegate.h>
+#import <Amplitude/ISPPinnedNSURLSessionDelegate.h>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,10 @@
 ## Unreleased
 
-### 3.8.4 (August 18, 2016)
+### 3.8.4 Re-release (August 19, 2016)
 
-* Added support for integration via Carthage. Thanks to @mpurland for the original PR.
+* Added support for integration via Carthage. Thanks to @mpurland for the original PR. Thanks to @lexrus for follow up PR to fix framework naming.
 * Cleaned up warnings for expression result unused.
+* Note if you installed 3.8.4 on August 18, just rerun `pod install` or `carthage update` to pull in the new changes. The re-release was to fix the Carthage framework naming.
 
 ### 3.8.3 (July 18, 2016)