admin/Reflect
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into develop

Browse Source 
# Conflicts:
#	Feels.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
This commit is contained in:
Trey t
2022-03-17 11:08:54 -05:00
parent ec58aae65b ef365d5dba
commit d46ad53e1e
2 changed files with 40 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Feels.xcodeproj/project.pbxproj
View File

@@ -1107,7 +1107,7 @@
CODE_SIGN_ENTITLEMENTS = "Feels (iOS)Dev.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 21;
CURRENT_PROJECT_VERSION = 22;
DEVELOPMENT_TEAM = V3PF3M6B6U;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
@@ -1143,7 +1143,7 @@
CODE_SIGN_ENTITLEMENTS = "Feels (iOS).entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 21;
CURRENT_PROJECT_VERSION = 22;
DEVELOPMENT_TEAM = V3PF3M6B6U;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;

186
Feels.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@@ -1,151 +1,41 @@
{
"object": {
"pins": [
{
"package": "abseil",
"repositoryURL": "https://github.com/firebase/abseil-cpp-SwiftPM.git",
"state": {
"branch": null,
"revision": "fffc3c2729be5747390ad02d5100291a0d9ad26a",
"version": "0.20200225.4"
}
},
{
"package": "BoringSSL-GRPC",
"repositoryURL": "https://github.com/firebase/boringssl-SwiftPM.git",
"state": {
"branch": null,
"revision": "734a8247442fde37df4364c21f6a0085b6a36728",
"version": "0.7.2"
}
},
{
"package": "ChartsPackage",
"repositoryURL": "https://github.com/akatreyt/ChartsPackage",
"state": {
"branch": "master",
"revision": "ab1aa4f8ade9540e9d2f19f7cb8b8e6ac0c2a8fd",
"version": null
}
},
{
"package": "CloudKitSyncMonitor",
"repositoryURL": "https://github.com/ggruen/CloudKitSyncMonitor",
"state": {
"branch": null,
"revision": "980208a30685713c4c4eb10897206a2e2574ed3f",
"version": "1.1.1"
}
},
{
"package": "Firebase",
"repositoryURL": "https://github.com/firebase/firebase-ios-sdk",
"state": {
"branch": null,
"revision": "d4c4e8c7b8898ea771e90beab71112ea279d73a5",
"version": "8.13.0"
}
},
{
"package": "GoogleAppMeasurement",
"repositoryURL": "https://github.com/google/GoogleAppMeasurement.git",
"state": {
"branch": null,
"revision": "6cc2991c11872510a5314bc112cc7558dd9d046a",
"version": "8.12.0"
}
},
{
"package": "GoogleDataTransport",
"repositoryURL": "https://github.com/google/GoogleDataTransport.git",
"state": {
"branch": null,
"revision": "15ccdfd25ac55b9239b82809531ff26605e7556e",
"version": "9.1.2"
}
},
{
"package": "GoogleUtilities",
"repositoryURL": "https://github.com/google/GoogleUtilities.git",
"state": {
"branch": null,
"revision": "b3bb0c5551fb3f80ca939829639ab5b093edd14f",
"version": "7.7.0"
}
},
{
"package": "gRPC",
"repositoryURL": "https://github.com/firebase/grpc-SwiftPM.git",
"state": {
"branch": null,
"revision": "fb405dd2c7901485f7e158b24e3a0a47e4efd8b5",
"version": "1.28.4"
}
},
{
"package": "GTMSessionFetcher",
"repositoryURL": "https://github.com/google/gtm-session-fetcher.git",
"state": {
"branch": null,
"revision": "bc6a19702ac76ac4e488b68148710eb815f9bc56",
"version": "1.7.0"
}
},
{
"package": "leveldb",
"repositoryURL": "https://github.com/firebase/leveldb.git",
"state": {
"branch": null,
"revision": "0706abcc6b0bd9cedfbb015ba840e4a780b5159b",
"version": "1.22.2"
}
},
{
"package": "nanopb",
"repositoryURL": "https://github.com/firebase/nanopb.git",
"state": {
"branch": null,
"revision": "7ee9ef9f627d85cbe1b8c4f49a3ed26eed216c77",
"version": "2.30908.0"
}
},
{
"package": "Promises",
"repositoryURL": "https://github.com/google/promises.git",
"state": {
"branch": null,
"revision": "611337c330350c9c1823ad6d671e7f936af5ee13",
"version": "2.0.0"
}
},
{
"package": "swift-algorithms",
"repositoryURL": "https://github.com/apple/swift-algorithms",
"state": {
"branch": null,
"revision": "2327673b0e9c7e90e6b1826376526ec3627210e4",
"version": "0.2.1"
}
},
{
"package": "swift-numerics",
"repositoryURL": "https://github.com/apple/swift-numerics",
"state": {
"branch": null,
"revision": "6583ac70c326c3ee080c1d42d9ca3361dca816cd",
"version": "0.1.0"
}
},
{
"package": "SwiftProtobuf",
"repositoryURL": "https://github.com/apple/swift-protobuf.git",
"state": {
"branch": null,
"revision": "e1499bc69b9040b29184f7f2996f7bab467c1639",
"version": "1.19.0"
}
"pins" : [
{
"identity" : "chartspackage",
"kind" : "remoteSourceControl",
"location" : "https://github.com/akatreyt/ChartsPackage",
"state" : {
"branch" : "master",
"revision" : "ab1aa4f8ade9540e9d2f19f7cb8b8e6ac0c2a8fd"
}
]
},
"version": 1
},
{
"identity" : "cloudkitsyncmonitor",
"kind" : "remoteSourceControl",
"location" : "https://github.com/ggruen/CloudKitSyncMonitor",
"state" : {
"revision" : "980208a30685713c4c4eb10897206a2e2574ed3f",
"version" : "1.1.1"
}
},
{
"identity" : "swift-algorithms",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-algorithms",
"state" : {
"revision" : "2327673b0e9c7e90e6b1826376526ec3627210e4",
"version" : "0.2.1"
}
},
{
"identity" : "swift-numerics",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-numerics",
"state" : {
"revision" : "6583ac70c326c3ee080c1d42d9ca3361dca816cd",
"version" : "0.1.0"
}
}
],
"version" : 2
}