Skip to content

Commit 659fbb2

Browse files
gavirawson-applegavirawson-apple
authored
3.1.7 (#727)
1 parent 13e3a43 commit 659fbb2

File tree

394 files changed

+1310
-943
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

394 files changed

+1310
-943
lines changed

‎CKWorkspace.xcworkspace/xcshareddata/IDETemplateMacros.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<key>FILEHEADER</key>
66
<string>
77
/*
8-
Copyright (c) ___YEAR___, Apple Inc. All rights reserved.
8+
Copyright (c) 2016-___YEAR___, Apple Inc. All rights reserved.
99
1010
Redistribution and use in source and binary forms, with or without modification,
1111
are permitted provided that the following conditions are met:

‎CareKit/CareKit.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 53;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -830,16 +830,6 @@
830830
};
831831
/* End PBXGroup section */
832832

833-
/* Begin PBXHeadersBuildPhase section */
834-
8605A5B71C4F04EC00DD65FF /* Headers */ = {
835-
isa = PBXHeadersBuildPhase;
836-
buildActionMask = 2147483647;
837-
files = (
838-
);
839-
runOnlyForDeploymentPostprocessing = 0;
840-
};
841-
/* End PBXHeadersBuildPhase section */
842-
843833
/* Begin PBXNativeTarget section */
844834
5196C7F8226F8F8F00F1C2A2 /* CareKitTests */ = {
845835
isa = PBXNativeTarget;
@@ -864,7 +854,6 @@
864854
buildConfigurationList = 8605A5CE1C4F04EC00DD65FF /* Build configuration list for PBXNativeTarget "CareKit" */;
865855
buildPhases = (
866856
8605A5B51C4F04EC00DD65FF /* Sources */,
867-
8605A5B71C4F04EC00DD65FF /* Headers */,
868857
8605A5B61C4F04EC00DD65FF /* Frameworks */,
869858
8605A5B81C4F04EC00DD65FF /* Resources */,
870859
);
@@ -885,7 +874,7 @@
885874
attributes = {
886875
BuildIndependentTargetsInParallel = YES;
887876
LastSwiftUpdateCheck = 1020;
888-
LastUpgradeCheck = 1430;
877+
LastUpgradeCheck = 1620;
889878
ORGANIZATIONNAME = carekit.org;
890879
TargetAttributes = {
891880
5196C7F8226F8F8F00F1C2A2 = {
@@ -937,6 +926,7 @@
937926
};
938927
/* End PBXResourcesBuildPhase section */
939928

929+
940930
/* Begin PBXSourcesBuildPhase section */
941931
5196C7F5226F8F8F00F1C2A2 /* Sources */ = {
942932
isa = PBXSourcesBuildPhase;
@@ -1108,7 +1098,6 @@
11081098
isa = XCBuildConfiguration;
11091099
buildSettings = {
11101100
ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
1111-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
11121101
CLANG_ANALYZER_NONNULL = YES;
11131102
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
11141103
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -1121,7 +1110,6 @@
11211110
DEVELOPMENT_TEAM = "";
11221111
GCC_C_LANGUAGE_STANDARD = gnu11;
11231112
INFOPLIST_FILE = CareKitTests/Info.plist;
1124-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
11251113
LD_RUNPATH_SEARCH_PATHS = (
11261114
"$(inherited)",
11271115
"@executable_path/Frameworks",
@@ -1144,7 +1132,6 @@
11441132
isa = XCBuildConfiguration;
11451133
buildSettings = {
11461134
ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
1147-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
11481135
CLANG_ANALYZER_NONNULL = YES;
11491136
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
11501137
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -1157,7 +1144,6 @@
11571144
DEVELOPMENT_TEAM = "";
11581145
GCC_C_LANGUAGE_STANDARD = gnu11;
11591146
INFOPLIST_FILE = CareKitTests/Info.plist;
1160-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
11611147
LD_RUNPATH_SEARCH_PATHS = (
11621148
"$(inherited)",
11631149
"@executable_path/Frameworks",
@@ -1213,7 +1199,7 @@
12131199
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
12141200
COPY_PHASE_STRIP = NO;
12151201
CURRENT_PROJECT_VERSION = "$(BUILD_NUMBER)";
1216-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1202+
DEBUG_INFORMATION_FORMAT = dwarf;
12171203
ENABLE_STRICT_OBJC_MSGSEND = YES;
12181204
ENABLE_TESTABILITY = YES;
12191205
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1237,7 +1223,7 @@
12371223
GCC_WARN_UNUSED_FUNCTION = YES;
12381224
GCC_WARN_UNUSED_LABEL = YES;
12391225
GCC_WARN_UNUSED_VARIABLE = YES;
1240-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1226+
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
12411227
MARKETING_VERSION = "$(VERSION_NUMBER)";
12421228
MTL_ENABLE_DEBUG_INFO = YES;
12431229
ONLY_ACTIVE_ARCH = YES;
@@ -1251,7 +1237,7 @@
12511237
TARGETED_DEVICE_FAMILY = "1,2";
12521238
VERSIONING_SYSTEM = "apple-generic";
12531239
VERSION_INFO_PREFIX = "";
1254-
WATCHOS_DEPLOYMENT_TARGET = 7.0;
1240+
WATCHOS_DEPLOYMENT_TARGET = 8.7;
12551241
};
12561242
name = Debug;
12571243
};
@@ -1296,6 +1282,7 @@
12961282
COPY_PHASE_STRIP = NO;
12971283
CURRENT_PROJECT_VERSION = "$(BUILD_NUMBER)";
12981284
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1285+
ENABLE_MODULE_VERIFIER = YES;
12991286
ENABLE_NS_ASSERTIONS = NO;
13001287
ENABLE_STRICT_OBJC_MSGSEND = YES;
13011288
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1313,7 +1300,7 @@
13131300
GCC_WARN_UNUSED_FUNCTION = YES;
13141301
GCC_WARN_UNUSED_LABEL = YES;
13151302
GCC_WARN_UNUSED_VARIABLE = YES;
1316-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1303+
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
13171304
MARKETING_VERSION = "$(VERSION_NUMBER)";
13181305
MTL_ENABLE_DEBUG_INFO = NO;
13191306
ONLY_ACTIVE_ARCH = NO;
@@ -1327,7 +1314,7 @@
13271314
VALIDATE_PRODUCT = YES;
13281315
VERSIONING_SYSTEM = "apple-generic";
13291316
VERSION_INFO_PREFIX = "";
1330-
WATCHOS_DEPLOYMENT_TARGET = 7.0;
1317+
WATCHOS_DEPLOYMENT_TARGET = 8.7;
13311318
};
13321319
name = Release;
13331320
};
@@ -1345,12 +1332,10 @@
13451332
DYLIB_CURRENT_VERSION = 1;
13461333
DYLIB_INSTALL_NAME_BASE = "@rpath";
13471334
ENABLE_BITCODE = NO;
1348-
ENABLE_MODULE_VERIFIER = YES;
13491335
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
13501336
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
13511337
INFOPLIST_FILE = CareKit/Info.plist;
13521338
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1353-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
13541339
LD_RUNPATH_SEARCH_PATHS = (
13551340
"$(inherited)",
13561341
"@executable_path/Frameworks",
@@ -1390,12 +1375,10 @@
13901375
DYLIB_CURRENT_VERSION = 1;
13911376
DYLIB_INSTALL_NAME_BASE = "@rpath";
13921377
ENABLE_BITCODE = NO;
1393-
ENABLE_MODULE_VERIFIER = YES;
13941378
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
13951379
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
13961380
INFOPLIST_FILE = CareKit/Info.plist;
13971381
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1398-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
13991382
LD_RUNPATH_SEARCH_PATHS = (
14001383
"$(inherited)",
14011384
"@executable_path/Frameworks",

‎CareKit/CareKit.xcodeproj/xcshareddata/IDETemplateMacros.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<key>FILEHEADER</key>
66
<string>
77
/*
8-
Copyright (c) ___YEAR___, Apple Inc. All rights reserved.
8+
Copyright (c) 2016-___YEAR___, Apple Inc. All rights reserved.
99
1010
Redistribution and use in source and binary forms, with or without modification,
1111
are permitted provided that the following conditions are met:

‎CareKit/CareKit.xcodeproj/xcshareddata/xcschemes/CareKit.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1620"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎CareKit/CareKit/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>$(VERSION_NUMBER)</string>
18+
<string>$(MARKETING_VERSION)</string>
1919
<key>CFBundleSignature</key>
2020
<string></string>
2121
<key>CFBundleVersion</key>
22-
<string>$(BUILD_NUMBER)</string>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
2323
<key>NSPrincipalClass</key>
2424
<string></string>
2525
</dict>

‎CareKit/CareKit/Shared/Extensions/Calendar+Extensions.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2019, Apple Inc. All rights reserved.
2+
Copyright (c) 2016-2025, Apple Inc. All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without modification,
55
are permitted provided that the following conditions are met:

‎CareKit/CareKit/Shared/Extensions/LinearCareTaskProgress+Extension.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2021, Apple Inc. All rights reserved.
2+
Copyright (c) 2016-2025, Apple Inc. All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without modification,
55
are permitted provided that the following conditions are met:

‎CareKit/CareKit/Shared/Extensions/Number+Extension.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2020, Apple Inc. All rights reserved.
2+
Copyright (c) 2016-2025, Apple Inc. All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without modification,
55
are permitted provided that the following conditions are met:

‎CareKit/CareKit/Shared/Extensions/OCKAnyContact+Extension.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2021, Apple Inc. All rights reserved.
2+
Copyright (c) 2016-2025, Apple Inc. All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without modification,
55
are permitted provided that the following conditions are met:

‎CareKit/CareKit/Shared/Extensions/OCKAnyEvent+Extension.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2019, Apple Inc. All rights reserved.
2+
Copyright (c) 2016-2025, Apple Inc. All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without modification,
55
are permitted provided that the following conditions are met:

0 commit comments

Comments
 (0)