Swift package support (#213)

* - Supported Swift package - Changed source code structure
amplitude · Nov 21, 2019 · 0f098f2 · 0f098f2
1 parent 0356de2
commit 0f098f2
Show file tree

Hide file tree

Showing 41 changed files with 42 additions and 5 deletions.
diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git a/Amplitude-iOS.podspec b/Amplitude-iOS.podspec
@@ -8,8 +8,8 @@ Pod::Spec.new do |s|
   s.source                 = { :git => "https://github.com/amplitude/Amplitude-iOS.git", :tag => "v4.8.2" }
   s.ios.deployment_target  = '8.0'
   s.tvos.deployment_target = '9.0'
-  s.source_files           = 'Amplitude/*.{h,m}', 'Amplitude/SSLCertificatePinning/*.{h,m}'
-  s.resources              = 'Amplitude/*.der'
+  s.source_files           = 'Sources/Amplitude/*.{h,m}', 'Sources/Amplitude/SSLCertificatePinning/*.{h,m}'
+  s.resources              = 'Sources/Amplitude/*.der'
   s.requires_arc           = true
   s.library 	             = 'sqlite3.0'
 end
diff --git a/Amplitude.xcodeproj/project.pbxproj b/Amplitude.xcodeproj/project.pbxproj
@@ -263,6 +263,14 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		02267F682355C80800E1F8E2 /* Sources */ = {
+			isa = PBXGroup;
+			children = (
+				E98C05251A48E7FE00800C63 /* Amplitude */,
+			);
+			path = Sources;
+			sourceTree = "<group>";
+		};
 		343AB4181CC99F4F00962943 /* AmplitudeFramework */ = {
 			isa = PBXGroup;
 			children = (
@@ -320,7 +328,7 @@
 		E98C051A1A48E7FE00800C63 = {
 			isa = PBXGroup;
 			children = (
-				E98C05251A48E7FE00800C63 /* Amplitude */,
+				02267F682355C80800E1F8E2 /* Sources */,
 				E98C052F1A48E7FE00800C63 /* AmplitudeTests */,
 				343AB4181CC99F4F00962943 /* AmplitudeFramework */,
 				600CBC601E2EF5B0001F58A9 /* AmplitudeTVOSTests */,
@@ -580,6 +588,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = E98C051A1A48E7FE00800C63;

diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,21 @@
+// swift-tools-version:4.2
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "Amplitude",
+    products: [
+        .library(
+            name: "Amplitude",
+            targets: ["Amplitude"]),
+    ],
+    targets: [
+        .target(
+            name: "Amplitude",
+            path: "Sources",
+            exclude: [],
+            sources: ["Amplitude", "Amplitude/"],
+            publicHeadersPath: "Amplitude"),
+    ]
+)
diff --git a/Podfile.lock b/Podfile.lock
@@ -5,12 +5,12 @@ DEPENDENCIES:
   - OCMock (~> 3.2.1)
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  https://github.com/CocoaPods/Specs.git:
     - OCMock
 
 SPEC CHECKSUMS:
   OCMock: 18c9b7e67d4c2770e95bb77a9cc1ae0c91fe3835
 
 PODFILE CHECKSUM: ffab5ccb87c60a8697a7f2dd2dfe3e86cef2ac90
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.8.3
diff --git a/Amplitude/AMPARCMacros.h → Sources/Amplitude/AMPARCMacros.h b/Amplitude/AMPARCMacros.h → Sources/Amplitude/AMPARCMacros.h
diff --git a/Amplitude/AMPConstants.h → Sources/Amplitude/AMPConstants.h b/Amplitude/AMPConstants.h → Sources/Amplitude/AMPConstants.h
diff --git a/Amplitude/AMPConstants.m → Sources/Amplitude/AMPConstants.m b/Amplitude/AMPConstants.m → Sources/Amplitude/AMPConstants.m
diff --git a/Amplitude/AMPDatabaseHelper.h → Sources/Amplitude/AMPDatabaseHelper.h b/Amplitude/AMPDatabaseHelper.h → Sources/Amplitude/AMPDatabaseHelper.h
diff --git a/Amplitude/AMPDatabaseHelper.m → Sources/Amplitude/AMPDatabaseHelper.m b/Amplitude/AMPDatabaseHelper.m → Sources/Amplitude/AMPDatabaseHelper.m
diff --git a/Amplitude/AMPDeviceInfo.h → Sources/Amplitude/AMPDeviceInfo.h b/Amplitude/AMPDeviceInfo.h → Sources/Amplitude/AMPDeviceInfo.h
diff --git a/Amplitude/AMPDeviceInfo.m → Sources/Amplitude/AMPDeviceInfo.m b/Amplitude/AMPDeviceInfo.m → Sources/Amplitude/AMPDeviceInfo.m
diff --git a/Amplitude/AMPIdentify.h → Sources/Amplitude/AMPIdentify.h b/Amplitude/AMPIdentify.h → Sources/Amplitude/AMPIdentify.h
diff --git a/Amplitude/AMPIdentify.m → Sources/Amplitude/AMPIdentify.m b/Amplitude/AMPIdentify.m → Sources/Amplitude/AMPIdentify.m
diff --git a/Amplitude/AMPLocationManagerDelegate.h → ...es/Amplitude/AMPLocationManagerDelegate.h b/Amplitude/AMPLocationManagerDelegate.h → ...es/Amplitude/AMPLocationManagerDelegate.h
diff --git a/Amplitude/AMPLocationManagerDelegate.m → ...es/Amplitude/AMPLocationManagerDelegate.m b/Amplitude/AMPLocationManagerDelegate.m → ...es/Amplitude/AMPLocationManagerDelegate.m
diff --git a/Amplitude/AMPRevenue.h → Sources/Amplitude/AMPRevenue.h b/Amplitude/AMPRevenue.h → Sources/Amplitude/AMPRevenue.h
diff --git a/Amplitude/AMPRevenue.m → Sources/Amplitude/AMPRevenue.m b/Amplitude/AMPRevenue.m → Sources/Amplitude/AMPRevenue.m
diff --git a/Amplitude/AMPTrackingOptions.h → Sources/Amplitude/AMPTrackingOptions.h b/Amplitude/AMPTrackingOptions.h → Sources/Amplitude/AMPTrackingOptions.h
diff --git a/Amplitude/AMPTrackingOptions.m → Sources/Amplitude/AMPTrackingOptions.m b/Amplitude/AMPTrackingOptions.m → Sources/Amplitude/AMPTrackingOptions.m
diff --git a/Amplitude/AMPURLConnection.h → Sources/Amplitude/AMPURLConnection.h b/Amplitude/AMPURLConnection.h → Sources/Amplitude/AMPURLConnection.h
diff --git a/Amplitude/AMPURLConnection.m → Sources/Amplitude/AMPURLConnection.m b/Amplitude/AMPURLConnection.m → Sources/Amplitude/AMPURLConnection.m
diff --git a/Amplitude/AMPURLSession.h → Sources/Amplitude/AMPURLSession.h b/Amplitude/AMPURLSession.h → Sources/Amplitude/AMPURLSession.h
diff --git a/Amplitude/AMPURLSession.m → Sources/Amplitude/AMPURLSession.m b/Amplitude/AMPURLSession.m → Sources/Amplitude/AMPURLSession.m
diff --git a/Amplitude/AMPUtils.h → Sources/Amplitude/AMPUtils.h b/Amplitude/AMPUtils.h → Sources/Amplitude/AMPUtils.h
diff --git a/Amplitude/AMPUtils.m → Sources/Amplitude/AMPUtils.m b/Amplitude/AMPUtils.m → Sources/Amplitude/AMPUtils.m
diff --git a/Amplitude/Amplitude+SSLPinning.h → Sources/Amplitude/Amplitude+SSLPinning.h b/Amplitude/Amplitude+SSLPinning.h → Sources/Amplitude/Amplitude+SSLPinning.h
diff --git a/Amplitude/Amplitude.h → Sources/Amplitude/Amplitude.h b/Amplitude/Amplitude.h → Sources/Amplitude/Amplitude.h
diff --git a/Amplitude/Amplitude.m → Sources/Amplitude/Amplitude.m b/Amplitude/Amplitude.m → Sources/Amplitude/Amplitude.m
diff --git a/Amplitude/AppledocSettings.plist → Sources/Amplitude/AppledocSettings.plist b/Amplitude/AppledocSettings.plist → Sources/Amplitude/AppledocSettings.plist
diff --git a/...odoCaLimitedRsaCertificationAuthority.der → ...odoCaLimitedRsaCertificationAuthority.der b/...odoCaLimitedRsaCertificationAuthority.der → ...odoCaLimitedRsaCertificationAuthority.der
diff --git a/Amplitude/ComodoRsaCA.der → Sources/Amplitude/ComodoRsaCA.der b/Amplitude/ComodoRsaCA.der → Sources/Amplitude/ComodoRsaCA.der
diff --git a/Amplitude/ComodoRsaDomainValidationCA.der → ...Amplitude/ComodoRsaDomainValidationCA.der b/Amplitude/ComodoRsaDomainValidationCA.der → ...Amplitude/ComodoRsaDomainValidationCA.der
diff --git a/...ertificatePinning/ISPCertificatePinning.h → ...ertificatePinning/ISPCertificatePinning.h b/...ertificatePinning/ISPCertificatePinning.h → ...ertificatePinning/ISPCertificatePinning.h
diff --git a/...ertificatePinning/ISPCertificatePinning.m → ...ertificatePinning/ISPCertificatePinning.m b/...ertificatePinning/ISPCertificatePinning.m → ...ertificatePinning/ISPCertificatePinning.m
diff --git a/...inning/ISPPinnedNSURLConnectionDelegate.h → ...inning/ISPPinnedNSURLConnectionDelegate.h b/...inning/ISPPinnedNSURLConnectionDelegate.h → ...inning/ISPPinnedNSURLConnectionDelegate.h
diff --git a/...inning/ISPPinnedNSURLConnectionDelegate.m → ...inning/ISPPinnedNSURLConnectionDelegate.m b/...inning/ISPPinnedNSURLConnectionDelegate.m → ...inning/ISPPinnedNSURLConnectionDelegate.m
diff --git a/...tePinning/ISPPinnedNSURLSessionDelegate.h → ...tePinning/ISPPinnedNSURLSessionDelegate.h b/...tePinning/ISPPinnedNSURLSessionDelegate.h → ...tePinning/ISPPinnedNSURLSessionDelegate.h
diff --git a/...tePinning/ISPPinnedNSURLSessionDelegate.m → ...tePinning/ISPPinnedNSURLSessionDelegate.m b/...tePinning/ISPPinnedNSURLSessionDelegate.m → ...tePinning/ISPPinnedNSURLSessionDelegate.m
diff --git a/...ePinning/SSLCertificatePinning-Prefix.pch → ...ePinning/SSLCertificatePinning-Prefix.pch b/...ePinning/SSLCertificatePinning-Prefix.pch → ...ePinning/SSLCertificatePinning-Prefix.pch
diff --git a/Amplitude/api.amplitude.com.der → Sources/Amplitude/api.amplitude.com.der b/Amplitude/api.amplitude.com.der → Sources/Amplitude/api.amplitude.com.der