Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Swift Package Manager support (Analytics & Crashes) #2039

Merged
merged 35 commits into from
May 8, 2020
Merged

Swift Package Manager support (Analytics & Crashes) #2039

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
d039b26
Add Package.swift file
Apr 22, 2020
07d7320
Add modulemap files; fixes
Apr 22, 2020
57e3c94
Rearrange manifest file
Apr 22, 2020
9531915
Add paths
Apr 22, 2020
f1b1fda
Changes in package.swift
Apr 22, 2020
a8fa73e
Downgrade to swift tools 5.0
Apr 22, 2020
61ac500
Add symlinks
Apr 22, 2020
c1e01a2
Remove broken symlinks
Apr 22, 2020
e5271d8
Symlinks fix
Apr 22, 2020
20e7e09
Add core headers symlinks
Apr 22, 2020
35420c5
Remove Push module from manifest
Apr 22, 2020
fc577ef
Add analytics symlinks
Apr 22, 2020
fa93d9f
Update script file to write version into Package swift file
vvechkanov Apr 22, 2020
3439f6a
Remove redundant files
Apr 22, 2020
b12f406
Remove sqlite library from analytics module
Apr 23, 2020
66b29a5
Check modulemap fix
Apr 23, 2020
1a6865d
Remove zlib
Apr 23, 2020
f2912a2
Add information about SPM to changelog
Apr 23, 2020
245e2db
Update CHANGELOG.md
Apr 24, 2020
46c5803
Fix bash script code
vvechkanov Apr 24, 2020
5e0ed72
Merge pull request #2037 from microsoft/feature/spm/manifest
MatkovIvan Apr 24, 2020
dbe63e4
Fix sed command
vvechkanov Apr 24, 2020
cdf13cf
Merge pull request #2038 from microsoft/feature/version-bump-script
MatkovIvan Apr 24, 2020
d421bd5
no core for spm
Apr 29, 2020
2219358
Merge pull request #2043 from microsoft/feature/spm-hide-core
MatkovIvan Apr 29, 2020
4d3d612
add Crashes to SPM manifest
May 5, 2020
250e42e
add symlinks to public headers
May 5, 2020
2ebbef0
update changelog
May 5, 2020
933cdb9
changelog update
May 5, 2020
599d0a1
Merge pull request #2048 from microsoft/feature/spm-crashes
MatkovIvan May 6, 2020
928d953
Add platforms list to SwiftPM manifest
MatkovIvan May 6, 2020
08498eb
Specify library types in SwiftPM manifest
MatkovIvan May 7, 2020
bef146c
Update branch for PLCR
May 7, 2020
00e02af
Merge branch 'develop' into feature/SPM-support
MatkovIvan May 7, 2020
3a7560f
Add revision instead of master
May 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions AppCenter.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions AppCenter/AppCenter/include/AppCenter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../AppCenter.h
MatkovIvan marked this conversation as resolved.
Show resolved Hide resolved
1 change: 1 addition & 0 deletions AppCenter/AppCenter/include/MSAbstractLog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../Model/MSAbstractLog.h
1 change: 1 addition & 0 deletions AppCenter/AppCenter/include/MSAppCenter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../MSAppCenter.h
1 change: 1 addition & 0 deletions AppCenter/AppCenter/include/MSAppCenterErrors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../MSAppCenterErrors.h
1 change: 1 addition & 0 deletions AppCenter/AppCenter/include/MSChannelGroupProtocol.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../MSChannelGroupProtocol.h
1 change: 1 addition & 0 deletions AppCenter/AppCenter/include/MSChannelProtocol.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../MSChannelProtocol.h
1 change: 1 addition & 0 deletions AppCenter/AppCenter/include/MSConstants+Flags.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../MSConstants+Flags.h
1 change: 1 addition & 0 deletions AppCenter/AppCenter/include/MSConstants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../MSConstants.h
1 change: 1 addition & 0 deletions AppCenter/AppCenter/include/MSCustomProperties.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../MSCustomProperties.h
1 change: 1 addition & 0 deletions AppCenter/AppCenter/include/MSDevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../Model/MSDevice.h
1 change: 1 addition & 0 deletions AppCenter/AppCenter/include/MSEnable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../MSEnable.h
1 change: 1 addition & 0 deletions AppCenter/AppCenter/include/MSLog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../Model/MSLog.h
1 change: 1 addition & 0 deletions AppCenter/AppCenter/include/MSLogWithProperties.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../Model/MSLogWithProperties.h
1 change: 1 addition & 0 deletions AppCenter/AppCenter/include/MSLogger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../MSLogger.h
1 change: 1 addition & 0 deletions AppCenter/AppCenter/include/MSService.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../MSService.h
1 change: 1 addition & 0 deletions AppCenter/AppCenter/include/MSServiceAbstract.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../MSServiceAbstract.h
1 change: 1 addition & 0 deletions AppCenter/AppCenter/include/MSWrapperLogger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../MSWrapperLogger.h
1 change: 1 addition & 0 deletions AppCenter/AppCenter/include/MSWrapperSdk.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../Model/MSWrapperSdk.h
1 change: 1 addition & 0 deletions AppCenterAnalytics/AppCenterAnalytics/include/AppCenterAnalytics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../AppCenterAnalytics.h
1 change: 1 addition & 0 deletions AppCenterAnalytics/AppCenterAnalytics/include/MSAbstractLog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../AppCenter/AppCenter/Model/MSAbstractLog.h
1 change: 1 addition & 0 deletions AppCenterAnalytics/AppCenterAnalytics/include/MSAnalytics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../MSAnalytics.h
1 change: 1 addition & 0 deletions AppCenterAnalytics/AppCenterAnalytics/include/MSAnalyticsAuthenticationProvider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../TransmissionTarget/MSAnalyticsAuthenticationProvider.h
1 change: 1 addition & 0 deletions AppCenterAnalytics/AppCenterAnalytics/include/MSAnalyticsAuthenticationProviderDelegate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../TransmissionTarget/MSAnalyticsAuthenticationProviderDelegate.h
1 change: 1 addition & 0 deletions AppCenterAnalytics/AppCenterAnalytics/include/MSAnalyticsTransmissionTarget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../TransmissionTarget/MSAnalyticsTransmissionTarget.h
1 change: 1 addition & 0 deletions AppCenterAnalytics/AppCenterAnalytics/include/MSConstants+Flags.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../AppCenter/AppCenter/MSConstants+Flags.h
1 change: 1 addition & 0 deletions AppCenterAnalytics/AppCenterAnalytics/include/MSEventLog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../Model/MSEventLog.h
1 change: 1 addition & 0 deletions AppCenterAnalytics/AppCenterAnalytics/include/MSEventProperties.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../Model/MSEventProperties.h
1 change: 1 addition & 0 deletions AppCenterAnalytics/AppCenterAnalytics/include/MSLogWithNameAndProperties.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../Model/MSLogWithNameAndProperties.h
1 change: 1 addition & 0 deletions AppCenterAnalytics/AppCenterAnalytics/include/MSLogWithProperties.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../AppCenter/AppCenter/Model/MSLogWithProperties.h
1 change: 1 addition & 0 deletions AppCenterAnalytics/AppCenterAnalytics/include/MSPropertyConfigurator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../TransmissionTarget/MSPropertyConfigurator.h
1 change: 1 addition & 0 deletions AppCenterAnalytics/AppCenterAnalytics/include/MSService.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../AppCenter/AppCenter/MSService.h
1 change: 1 addition & 0 deletions AppCenterAnalytics/AppCenterAnalytics/include/MSServiceAbstract.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../AppCenter/AppCenter/MSServiceAbstract.h
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 Core and Analytics modules.
MatkovIvan marked this conversation as resolved.
Show resolved Hide resolved

___

## Version 3.1.1
Expand Down
60 changes: 60 additions & 0 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
// 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",
products: [
.library(
name: "AppCenter",
targets: ["AppCenter"]),
.library(
name: "AppCenterAnalytics",
targets: ["AppCenterAnalytics"])
],
dependencies: [
],
targets: [
.target(
name: "AppCenter",
dependencies: [],
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\""),
MatkovIvan marked this conversation as resolved.
Show resolved Hide resolved
.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])),
]
)
]
)
5 changes: 5 additions & 0 deletions vsts/internal-version-increment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
MatkovIvan marked this conversation as resolved.
Show resolved Hide resolved
sed -i '' 's/\(define("APP_CENTER_C_VERSION",[[:space:]]*to:*\).*/\1''"\\"'$publish_version'\\""),''/g' $swift_package_file
MatkovIvan marked this conversation as resolved.
Show resolved Hide resolved
sed -i '' 's/\(define("APP_CENTER_C_BUILD",[[:space:]]*to:*\).*/\1''"\\"'$latest_build_number'\\""),''/g' $swift_package_file