Merge pull request #2039 from microsoft/feature/SPM-support

Swift Package Manager support (Analytics & Crashes)
microsoft · May 8, 2020 · 8ca3526 · 8ca3526
2 parents ff78f0c + 3a7560f
commit 8ca3526
Show file tree

Hide file tree

Showing 47 changed files with 135 additions and 0 deletions.
diff --git a/AppCenter.xcworkspace/contents.xcworkspacedata b/AppCenter.xcworkspace/contents.xcworkspacedata
diff --git a/AppCenter/AppCenter/include/AppCenter.h b/AppCenter/AppCenter/include/AppCenter.h
@@ -0,0 +1 @@
+../AppCenter.h
diff --git a/AppCenter/AppCenter/include/MSAbstractLog.h b/AppCenter/AppCenter/include/MSAbstractLog.h
@@ -0,0 +1 @@
+../Model/MSAbstractLog.h
diff --git a/AppCenter/AppCenter/include/MSAppCenter.h b/AppCenter/AppCenter/include/MSAppCenter.h
@@ -0,0 +1 @@
+../MSAppCenter.h
diff --git a/AppCenter/AppCenter/include/MSAppCenterErrors.h b/AppCenter/AppCenter/include/MSAppCenterErrors.h
@@ -0,0 +1 @@
+../MSAppCenterErrors.h
diff --git a/AppCenter/AppCenter/include/MSChannelGroupProtocol.h b/AppCenter/AppCenter/include/MSChannelGroupProtocol.h
@@ -0,0 +1 @@
+../MSChannelGroupProtocol.h
diff --git a/AppCenter/AppCenter/include/MSChannelProtocol.h b/AppCenter/AppCenter/include/MSChannelProtocol.h
@@ -0,0 +1 @@
+../MSChannelProtocol.h
diff --git a/AppCenter/AppCenter/include/MSConstants+Flags.h b/AppCenter/AppCenter/include/MSConstants+Flags.h
@@ -0,0 +1 @@
+../MSConstants+Flags.h
diff --git a/AppCenter/AppCenter/include/MSConstants.h b/AppCenter/AppCenter/include/MSConstants.h
@@ -0,0 +1 @@
+../MSConstants.h
diff --git a/AppCenter/AppCenter/include/MSCustomProperties.h b/AppCenter/AppCenter/include/MSCustomProperties.h
@@ -0,0 +1 @@
+../MSCustomProperties.h
diff --git a/AppCenter/AppCenter/include/MSDevice.h b/AppCenter/AppCenter/include/MSDevice.h
@@ -0,0 +1 @@
+../Model/MSDevice.h
diff --git a/AppCenter/AppCenter/include/MSEnable.h b/AppCenter/AppCenter/include/MSEnable.h
@@ -0,0 +1 @@
+../MSEnable.h
diff --git a/AppCenter/AppCenter/include/MSLog.h b/AppCenter/AppCenter/include/MSLog.h
@@ -0,0 +1 @@
+../Model/MSLog.h
diff --git a/AppCenter/AppCenter/include/MSLogWithProperties.h b/AppCenter/AppCenter/include/MSLogWithProperties.h
@@ -0,0 +1 @@
+../Model/MSLogWithProperties.h
diff --git a/AppCenter/AppCenter/include/MSLogger.h b/AppCenter/AppCenter/include/MSLogger.h
@@ -0,0 +1 @@
+../MSLogger.h
diff --git a/AppCenter/AppCenter/include/MSService.h b/AppCenter/AppCenter/include/MSService.h
@@ -0,0 +1 @@
+../MSService.h
diff --git a/AppCenter/AppCenter/include/MSServiceAbstract.h b/AppCenter/AppCenter/include/MSServiceAbstract.h
@@ -0,0 +1 @@
+../MSServiceAbstract.h
diff --git a/AppCenter/AppCenter/include/MSWrapperLogger.h b/AppCenter/AppCenter/include/MSWrapperLogger.h
@@ -0,0 +1 @@
+../MSWrapperLogger.h
diff --git a/AppCenter/AppCenter/include/MSWrapperSdk.h b/AppCenter/AppCenter/include/MSWrapperSdk.h
@@ -0,0 +1 @@
+../Model/MSWrapperSdk.h
diff --git a/AppCenterAnalytics/AppCenterAnalytics/include/AppCenterAnalytics.h b/AppCenterAnalytics/AppCenterAnalytics/include/AppCenterAnalytics.h
@@ -0,0 +1 @@
+../AppCenterAnalytics.h
diff --git a/AppCenterAnalytics/AppCenterAnalytics/include/MSAbstractLog.h b/AppCenterAnalytics/AppCenterAnalytics/include/MSAbstractLog.h
@@ -0,0 +1 @@
+../../../AppCenter/AppCenter/Model/MSAbstractLog.h
diff --git a/AppCenterAnalytics/AppCenterAnalytics/include/MSAnalytics.h b/AppCenterAnalytics/AppCenterAnalytics/include/MSAnalytics.h
@@ -0,0 +1 @@
+../MSAnalytics.h
diff --git a/AppCenterAnalytics/AppCenterAnalytics/include/MSAnalyticsAuthenticationProvider.h b/AppCenterAnalytics/AppCenterAnalytics/include/MSAnalyticsAuthenticationProvider.h
@@ -0,0 +1 @@
+../TransmissionTarget/MSAnalyticsAuthenticationProvider.h
diff --git a/AppCenterAnalytics/AppCenterAnalytics/include/MSAnalyticsAuthenticationProviderDelegate.h b/AppCenterAnalytics/AppCenterAnalytics/include/MSAnalyticsAuthenticationProviderDelegate.h
@@ -0,0 +1 @@
+../TransmissionTarget/MSAnalyticsAuthenticationProviderDelegate.h
diff --git a/AppCenterAnalytics/AppCenterAnalytics/include/MSAnalyticsTransmissionTarget.h b/AppCenterAnalytics/AppCenterAnalytics/include/MSAnalyticsTransmissionTarget.h
@@ -0,0 +1 @@
+../TransmissionTarget/MSAnalyticsTransmissionTarget.h
diff --git a/AppCenterAnalytics/AppCenterAnalytics/include/MSConstants+Flags.h b/AppCenterAnalytics/AppCenterAnalytics/include/MSConstants+Flags.h
@@ -0,0 +1 @@
+../../../AppCenter/AppCenter/MSConstants+Flags.h
diff --git a/AppCenterAnalytics/AppCenterAnalytics/include/MSEventLog.h b/AppCenterAnalytics/AppCenterAnalytics/include/MSEventLog.h
@@ -0,0 +1 @@
+../Model/MSEventLog.h
diff --git a/AppCenterAnalytics/AppCenterAnalytics/include/MSEventProperties.h b/AppCenterAnalytics/AppCenterAnalytics/include/MSEventProperties.h
@@ -0,0 +1 @@
+../Model/MSEventProperties.h
diff --git a/AppCenterAnalytics/AppCenterAnalytics/include/MSLogWithNameAndProperties.h b/AppCenterAnalytics/AppCenterAnalytics/include/MSLogWithNameAndProperties.h
@@ -0,0 +1 @@
+../Model/MSLogWithNameAndProperties.h
diff --git a/AppCenterAnalytics/AppCenterAnalytics/include/MSLogWithProperties.h b/AppCenterAnalytics/AppCenterAnalytics/include/MSLogWithProperties.h
@@ -0,0 +1 @@
+../../../AppCenter/AppCenter/Model/MSLogWithProperties.h
diff --git a/AppCenterAnalytics/AppCenterAnalytics/include/MSPropertyConfigurator.h b/AppCenterAnalytics/AppCenterAnalytics/include/MSPropertyConfigurator.h
@@ -0,0 +1 @@
+../TransmissionTarget/MSPropertyConfigurator.h
diff --git a/AppCenterAnalytics/AppCenterAnalytics/include/MSService.h b/AppCenterAnalytics/AppCenterAnalytics/include/MSService.h
@@ -0,0 +1 @@
+../../../AppCenter/AppCenter/MSService.h
diff --git a/AppCenterAnalytics/AppCenterAnalytics/include/MSServiceAbstract.h b/AppCenterAnalytics/AppCenterAnalytics/include/MSServiceAbstract.h
@@ -0,0 +1 @@
+../../../AppCenter/AppCenter/MSServiceAbstract.h
diff --git a/AppCenterCrashes/AppCenterCrashes/include/AppCenterCrashes.h b/AppCenterCrashes/AppCenterCrashes/include/AppCenterCrashes.h
@@ -0,0 +1 @@
+../AppCenterCrashes.h
diff --git a/AppCenterCrashes/AppCenterCrashes/include/MSAbstractLog.h b/AppCenterCrashes/AppCenterCrashes/include/MSAbstractLog.h
@@ -0,0 +1 @@
+../../../AppCenter/AppCenter/Model/MSAbstractLog.h
diff --git a/AppCenterCrashes/AppCenterCrashes/include/MSCrashHandlerSetupDelegate.h b/AppCenterCrashes/AppCenterCrashes/include/MSCrashHandlerSetupDelegate.h
@@ -0,0 +1 @@
+../WrapperSDKUtilities/MSCrashHandlerSetupDelegate.h
diff --git a/AppCenterCrashes/AppCenterCrashes/include/MSCrashes.h b/AppCenterCrashes/AppCenterCrashes/include/MSCrashes.h
@@ -0,0 +1 @@
+../MSCrashes.h
diff --git a/AppCenterCrashes/AppCenterCrashes/include/MSCrashesDelegate.h b/AppCenterCrashes/AppCenterCrashes/include/MSCrashesDelegate.h
@@ -0,0 +1 @@
+../MSCrashesDelegate.h
diff --git a/AppCenterCrashes/AppCenterCrashes/include/MSErrorAttachmentLog+Utility.h b/AppCenterCrashes/AppCenterCrashes/include/MSErrorAttachmentLog+Utility.h
@@ -0,0 +1 @@
+../Model/MSErrorAttachmentLog+Utility.h
diff --git a/AppCenterCrashes/AppCenterCrashes/include/MSErrorAttachmentLog.h b/AppCenterCrashes/AppCenterCrashes/include/MSErrorAttachmentLog.h
@@ -0,0 +1 @@
+../Model/MSErrorAttachmentLog.h
diff --git a/AppCenterCrashes/AppCenterCrashes/include/MSErrorReport.h b/AppCenterCrashes/AppCenterCrashes/include/MSErrorReport.h
@@ -0,0 +1 @@
+../Model/MSErrorReport.h
diff --git a/AppCenterCrashes/AppCenterCrashes/include/MSService.h b/AppCenterCrashes/AppCenterCrashes/include/MSService.h
@@ -0,0 +1 @@
+../../../AppCenter/AppCenter/MSService.h
diff --git a/AppCenterCrashes/AppCenterCrashes/include/MSServiceAbstract.h b/AppCenterCrashes/AppCenterCrashes/include/MSServiceAbstract.h
@@ -0,0 +1 @@
+../../../AppCenter/AppCenter/MSServiceAbstract.h
diff --git a/AppCenterCrashes/AppCenterCrashes/include/MSWrapperCrashesHelper.h b/AppCenterCrashes/AppCenterCrashes/include/MSWrapperCrashesHelper.h
@@ -0,0 +1 @@
+../WrapperSDKUtilities/MSWrapperCrashesHelper.h
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@
 ### App Center
 
 * **[Improvement]** Use namespaced `NSUserDefaults` keys with the **MSAppCenter** prefix for all the keys set by the SDK. Fixed a few keys missing namespace.
+* **[Feature]** Swift Package Manager support for Analytics and Crashes modules.
+
 ___
 
 ## Version 3.1.1

diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,82 @@
+// swift-tools-version:5.0
+
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import PackageDescription
+
+let package = Package(
+    name: "App Center",
+    platforms: [
+        .iOS(.v9),
+        .macOS(.v10_10),
+        .tvOS(.v11)
+    ],
+    products: [
+        .library(
+            name: "AppCenterAnalytics",
+            type: .static,
+            targets: ["AppCenterAnalytics"]),
+        .library(
+            name: "AppCenterCrashes",
+            type: .static,
+            targets: ["AppCenterCrashes"])
+    ],
+    dependencies: [
+        .package(url: "https://github.com/microsoft/plcrashreporter.git", .revision("44b167048312b404f5aeb70381019deb6158f219")),
+    ],
+    targets: [
+        .target(
+            name: "AppCenter",
+            path: "AppCenter/AppCenter",
+            exclude: ["Support"],
+            cSettings: [
+                .define("APP_CENTER_C_NAME", to: "\"appcenter.ios\"", .when(platforms: [.iOS])),
+                .define("APP_CENTER_C_NAME", to: "\"appcenter.macos\"", .when(platforms: [.macOS])),
+                .define("APP_CENTER_C_NAME", to: "\"appcenter.tvos\"", .when(platforms: [.tvOS])),
+                .define("APP_CENTER_C_VERSION", to:"\"3.1.1\""),
+                .define("APP_CENTER_C_BUILD", to:"\"1\""),
+                .headerSearchPath("**"),
+            ],
+            linkerSettings: [
+                .linkedLibrary("z"),
+                .linkedLibrary("sqlite3"),
+                .linkedFramework("Foundation"),
+                .linkedFramework("SystemConfiguration"),
+                .linkedFramework("AppKit", .when(platforms: [.macOS])),
+                .linkedFramework("UIKit", .when(platforms: [.iOS, .tvOS])),
+                .linkedFramework("CoreTelephony", .when(platforms: [.iOS])),
+            ]
+        ),
+        .target(
+            name: "AppCenterAnalytics",
+            dependencies: ["AppCenter"],
+            path: "AppCenterAnalytics/AppCenterAnalytics",
+            exclude: ["Support"],
+            cSettings: [
+                .headerSearchPath("**"),
+                .headerSearchPath("../../AppCenter/AppCenter/**"),
+            ],
+            linkerSettings: [
+                .linkedFramework("Foundation"),
+                .linkedFramework("UIKit", .when(platforms: [.iOS, .tvOS])),
+                .linkedFramework("AppKit", .when(platforms: [.macOS])),
+            ]
+        ),
+        .target(
+            name: "AppCenterCrashes",
+            dependencies: ["AppCenter", "CrashReporter"],
+            path: "AppCenterCrashes/AppCenterCrashes",
+            exclude: ["Support"],
+            cSettings: [
+                .headerSearchPath("**"),
+                .headerSearchPath("../../AppCenter/AppCenter/**"),
+            ],
+            linkerSettings: [
+                .linkedFramework("Foundation"),
+                .linkedFramework("UIKit", .when(platforms: [.iOS, .tvOS])),
+                .linkedFramework("AppKit", .when(platforms: [.macOS])),
+            ]
+        )
+    ]
+)
diff --git a/vsts/internal-version-increment.sh b/vsts/internal-version-increment.sh
@@ -75,3 +75,8 @@ fi
 if [ "$BUILD_SOURCEBRANCHNAME" != "master" ]; then
   sed -i '' 's/\(VERSION_STRING[[:space:]]*=[[:space:]]*\).*/\1'$publish_version'/g' $VERSION_FILENAME
 fi
+
+# Update swift package manager config file
+swift_package_file='Package.swift'
+sed -i '' 's/\(define("APP_CENTER_C_VERSION",[[:space:]]*to:*\).*/\1''"\\"'$publish_version'\\""),''/g' $swift_package_file
+sed -i '' 's/\(define("APP_CENTER_C_BUILD",[[:space:]]*to:*\).*/\1''"\\"'$latest_build_number'\\""),''/g' $swift_package_file