Skip to content

Commit 9f42dab

Browse files
committed
Merge branch 'develop'
2 parents 9c61f0d + c978a56 commit 9f42dab

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

ManagedToDos.xcodeproj/project.pbxproj

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
E8548E6A2AC454F100809E08 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E8548E692AC454F100809E08 /* Assets.xcassets */; };
1313
E8548E6E2AC454F100809E08 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E8548E6D2AC454F100809E08 /* Preview Assets.xcassets */; };
1414
E8548E772AC4559200809E08 /* ToDo.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8548E762AC4559200809E08 /* ToDo.swift */; };
15-
E8548E7A2AC455C900809E08 /* ManagedModels in Frameworks */ = {isa = PBXBuildFile; productRef = E8548E792AC455C900809E08 /* ManagedModels */; };
1615
E8548E7D2AC456B600809E08 /* ToDoList.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8548E7C2AC456B600809E08 /* ToDoList.swift */; };
1716
E8548E7F2AC45B2300809E08 /* PreviewData.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8548E7E2AC45B2300809E08 /* PreviewData.swift */; };
1817
E8548E8F2AC45EDD00809E08 /* ToDoListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8548E8A2AC45EDD00809E08 /* ToDoListView.swift */; };
1918
E8548E902AC45EDD00809E08 /* ToDoListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8548E8B2AC45EDD00809E08 /* ToDoListCell.swift */; };
2019
E8548E912AC45EDD00809E08 /* ToDoEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8548E8C2AC45EDD00809E08 /* ToDoEditor.swift */; };
2120
E8548E922AC45EDD00809E08 /* ToDoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8548E8D2AC45EDD00809E08 /* ToDoCell.swift */; };
2221
E8548E932AC45EDD00809E08 /* ToDoListsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8548E8E2AC45EDD00809E08 /* ToDoListsView.swift */; };
22+
E8CA5EC82BB057DD003E8514 /* ManagedModels in Frameworks */ = {isa = PBXBuildFile; productRef = E8CA5EC72BB057DD003E8514 /* ManagedModels */; };
2323
/* End PBXBuildFile section */
2424

2525
/* Begin PBXFileReference section */
@@ -46,7 +46,7 @@
4646
isa = PBXFrameworksBuildPhase;
4747
buildActionMask = 2147483647;
4848
files = (
49-
E8548E7A2AC455C900809E08 /* ManagedModels in Frameworks */,
49+
E8CA5EC82BB057DD003E8514 /* ManagedModels in Frameworks */,
5050
);
5151
runOnlyForDeploymentPostprocessing = 0;
5252
};
@@ -133,7 +133,7 @@
133133
);
134134
name = ManagedToDos;
135135
packageProductDependencies = (
136-
E8548E792AC455C900809E08 /* ManagedModels */,
136+
E8CA5EC72BB057DD003E8514 /* ManagedModels */,
137137
);
138138
productName = ManagedToDos;
139139
productReference = E8548E622AC454F000809E08 /* ManagedToDos.app */;
@@ -147,7 +147,7 @@
147147
attributes = {
148148
BuildIndependentTargetsInParallel = 1;
149149
LastSwiftUpdateCheck = 1500;
150-
LastUpgradeCheck = 1500;
150+
LastUpgradeCheck = 1530;
151151
TargetAttributes = {
152152
E8548E612AC454F000809E08 = {
153153
CreatedOnToolsVersion = 15.0;
@@ -164,7 +164,7 @@
164164
);
165165
mainGroup = E8548E592AC454F000809E08;
166166
packageReferences = (
167-
E8548E782AC455C900809E08 /* XCRemoteSwiftPackageReference "ManagedModels" */,
167+
E8CA5EC62BB057DD003E8514 /* XCRemoteSwiftPackageReference "ManagedModels" */,
168168
);
169169
productRefGroup = E8548E632AC454F000809E08 /* Products */;
170170
projectDirPath = "";
@@ -242,6 +242,7 @@
242242
CLANG_WARN_UNREACHABLE_CODE = YES;
243243
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
244244
COPY_PHASE_STRIP = NO;
245+
DEAD_CODE_STRIPPING = YES;
245246
DEBUG_INFORMATION_FORMAT = dwarf;
246247
ENABLE_STRICT_OBJC_MSGSEND = YES;
247248
ENABLE_TESTABILITY = YES;
@@ -266,6 +267,7 @@
266267
ONLY_ACTIVE_ARCH = YES;
267268
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
268269
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
270+
SWIFT_STRICT_CONCURRENCY = complete;
269271
};
270272
name = Debug;
271273
};
@@ -303,6 +305,7 @@
303305
CLANG_WARN_UNREACHABLE_CODE = YES;
304306
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
305307
COPY_PHASE_STRIP = NO;
308+
DEAD_CODE_STRIPPING = YES;
306309
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
307310
ENABLE_NS_ASSERTIONS = NO;
308311
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -319,6 +322,7 @@
319322
MTL_ENABLE_DEBUG_INFO = NO;
320323
MTL_FAST_MATH = YES;
321324
SWIFT_COMPILATION_MODE = wholemodule;
325+
SWIFT_STRICT_CONCURRENCY = complete;
322326
};
323327
name = Release;
324328
};
@@ -330,6 +334,7 @@
330334
CODE_SIGN_ENTITLEMENTS = ManagedToDos/ManagedToDos.entitlements;
331335
CODE_SIGN_STYLE = Automatic;
332336
CURRENT_PROJECT_VERSION = 1;
337+
DEAD_CODE_STRIPPING = YES;
333338
DEVELOPMENT_ASSET_PATHS = "\"ManagedToDos/Preview Content\"";
334339
DEVELOPMENT_TEAM = 4GXF3JAMM4;
335340
ENABLE_HARDENED_RUNTIME = YES;
@@ -368,6 +373,7 @@
368373
CODE_SIGN_ENTITLEMENTS = ManagedToDos/ManagedToDos.entitlements;
369374
CODE_SIGN_STYLE = Automatic;
370375
CURRENT_PROJECT_VERSION = 1;
376+
DEAD_CODE_STRIPPING = YES;
371377
DEVELOPMENT_ASSET_PATHS = "\"ManagedToDos/Preview Content\"";
372378
DEVELOPMENT_TEAM = 4GXF3JAMM4;
373379
ENABLE_HARDENED_RUNTIME = YES;
@@ -422,20 +428,20 @@
422428
/* End XCConfigurationList section */
423429

424430
/* Begin XCRemoteSwiftPackageReference section */
425-
E8548E782AC455C900809E08 /* XCRemoteSwiftPackageReference "ManagedModels" */ = {
431+
E8CA5EC62BB057DD003E8514 /* XCRemoteSwiftPackageReference "ManagedModels" */ = {
426432
isa = XCRemoteSwiftPackageReference;
427-
repositoryURL = "git@github.com:Data-swift/ManagedModels.git";
433+
repositoryURL = "https://github.com/Data-swift/ManagedModels.git";
428434
requirement = {
429435
kind = upToNextMajorVersion;
430-
minimumVersion = 0.6.0;
436+
minimumVersion = 0.8.6;
431437
};
432438
};
433439
/* End XCRemoteSwiftPackageReference section */
434440

435441
/* Begin XCSwiftPackageProductDependency section */
436-
E8548E792AC455C900809E08 /* ManagedModels */ = {
442+
E8CA5EC72BB057DD003E8514 /* ManagedModels */ = {
437443
isa = XCSwiftPackageProductDependency;
438-
package = E8548E782AC455C900809E08 /* XCRemoteSwiftPackageReference "ManagedModels" */;
444+
package = E8CA5EC62BB057DD003E8514 /* XCRemoteSwiftPackageReference "ManagedModels" */;
439445
productName = ManagedModels;
440446
};
441447
/* End XCSwiftPackageProductDependency section */

ManagedToDos/Preview Content/PreviewData.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ enum PreviewData {
4949
return container
5050
}()
5151

52+
@MainActor
5253
static let firstToDoList : ToDoList? = {
5354
try! container.mainContext.fetch(ToDoList.fetchRequest()).first
5455
}()

0 commit comments

Comments
 (0)