Skip to content

Commit 4c77e8b

Browse files
koji-1009koji-1009
authored
Merge pull request #26 from studyplus/remove_keychain_access
Remove KeychainAccess
2 parents 17f554c + 780178a commit 4c77e8b

File tree

8 files changed

+91
-168
lines changed

8 files changed

+91
-168
lines changed

‎Examples/Demo.xcodeproj/project.pbxproj

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

99
/* Begin PBXBuildFile section */
@@ -13,7 +13,6 @@
1313
183FDA8F1E7510F10085589F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 183FDA8E1E7510F10085589F /* Assets.xcassets */; };
1414
183FDA921E7510F10085589F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 183FDA901E7510F10085589F /* LaunchScreen.storyboard */; };
1515
183FDA9D1E7510F10085589F /* DemoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 183FDA9C1E7510F10085589F /* DemoTests.swift */; };
16-
6538472725F35D6300A6D7D9 /* StudyplusSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 658C822725F21569002291FE /* StudyplusSDK.framework */; };
1716
6538472825F35D6300A6D7D9 /* StudyplusSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 658C822725F21569002291FE /* StudyplusSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1817
/* End PBXBuildFile section */
1918

@@ -74,7 +73,6 @@
7473
isa = PBXFrameworksBuildPhase;
7574
buildActionMask = 2147483647;
7675
files = (
77-
6538472725F35D6300A6D7D9 /* StudyplusSDK.framework in Frameworks */,
7876
);
7977
runOnlyForDeploymentPostprocessing = 0;
8078
};
@@ -220,7 +218,6 @@
220218
);
221219
mainGroup = 183FDA5D1E7510920085589F;
222220
packageReferences = (
223-
65AEE17B25F2116C00821E1E /* XCRemoteSwiftPackageReference "KeychainAccess" */,
224221
);
225222
productRefGroup = 183FDA681E7510920085589F /* Products */;
226223
projectDirPath = "";
@@ -437,8 +434,7 @@
437434
MTL_ENABLE_DEBUG_INFO = NO;
438435
OTHER_SWIFT_FLAGS = "-D RELEASE";
439436
SDKROOT = iphoneos;
440-
SWIFT_COMPILATION_MODE = wholemodule;
441-
SWIFT_OPTIMIZATION_LEVEL = "-O";
437+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
442438
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
443439
TARGETED_DEVICE_FAMILY = "1,2";
444440
VALIDATE_PRODUCT = YES;
@@ -454,10 +450,7 @@
454450
DEVELOPMENT_TEAM = "";
455451
INFOPLIST_FILE = Demo/Info.plist;
456452
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
457-
LD_RUNPATH_SEARCH_PATHS = (
458-
"$(inherited)",
459-
"@executable_path/Frameworks",
460-
);
453+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
461454
MARKETING_VERSION = 2.0.1;
462455
OTHER_SWIFT_FLAGS = "$(inherited)";
463456
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.Demo;
@@ -473,10 +466,7 @@
473466
DEVELOPMENT_TEAM = "";
474467
INFOPLIST_FILE = Demo/Info.plist;
475468
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
476-
LD_RUNPATH_SEARCH_PATHS = (
477-
"$(inherited)",
478-
"@executable_path/Frameworks",
479-
);
469+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
480470
MARKETING_VERSION = 2.0.1;
481471
OTHER_SWIFT_FLAGS = "$(inherited)";
482472
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.Demo;
@@ -492,11 +482,7 @@
492482
BUNDLE_LOADER = "$(TEST_HOST)";
493483
INFOPLIST_FILE = DemoTests/Info.plist;
494484
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
495-
LD_RUNPATH_SEARCH_PATHS = (
496-
"$(inherited)",
497-
"@executable_path/Frameworks",
498-
"@loader_path/Frameworks",
499-
);
485+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
500486
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.DemoTests;
501487
PRODUCT_NAME = "$(TARGET_NAME)";
502488
SWIFT_VERSION = 5.0;
@@ -511,11 +497,7 @@
511497
BUNDLE_LOADER = "$(TEST_HOST)";
512498
INFOPLIST_FILE = DemoTests/Info.plist;
513499
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
514-
LD_RUNPATH_SEARCH_PATHS = (
515-
"$(inherited)",
516-
"@executable_path/Frameworks",
517-
"@loader_path/Frameworks",
518-
);
500+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
519501
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.DemoTests;
520502
PRODUCT_NAME = "$(TARGET_NAME)";
521503
SWIFT_VERSION = 5.0;
@@ -554,17 +536,6 @@
554536
defaultConfigurationName = Release;
555537
};
556538
/* End XCConfigurationList section */
557-
558-
/* Begin XCRemoteSwiftPackageReference section */
559-
65AEE17B25F2116C00821E1E /* XCRemoteSwiftPackageReference "KeychainAccess" */ = {
560-
isa = XCRemoteSwiftPackageReference;
561-
repositoryURL = "https://github.com/kishikawakatsumi/KeychainAccess";
562-
requirement = {
563-
kind = upToNextMajorVersion;
564-
minimumVersion = 4.2.2;
565-
};
566-
};
567-
/* End XCRemoteSwiftPackageReference section */
568539
};
569540
rootObject = 183FDA5E1E7510920085589F /* Project object */;
570541
}

‎Examples/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎Lib/StudyplusSDK.xcodeproj/project.pbxproj

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

99
/* Begin PBXBuildFile section */
@@ -16,7 +16,6 @@
1616
183FDAB11E754DCB0085589F /* StudyplusAPIRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 183FDAB01E754DCB0085589F /* StudyplusAPIRequest.swift */; };
1717
183FDAB31E7561B90085589F /* StudyplusRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = 183FDAB21E7561B90085589F /* StudyplusRecord.swift */; };
1818
183FDAB51E7584C50085589F /* StudyplusRecordAmount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 183FDAB41E7584C50085589F /* StudyplusRecordAmount.swift */; };
19-
65AEE16D25F2111600821E1E /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = 65AEE16C25F2111600821E1E /* KeychainAccess */; };
2019
/* End PBXBuildFile section */
2120

2221
/* Begin PBXContainerItemProxy section */
@@ -49,7 +48,6 @@
4948
isa = PBXFrameworksBuildPhase;
5049
buildActionMask = 2147483647;
5150
files = (
52-
65AEE16D25F2111600821E1E /* KeychainAccess in Frameworks */,
5351
);
5452
runOnlyForDeploymentPostprocessing = 0;
5553
};
@@ -135,7 +133,6 @@
135133
);
136134
name = StudyplusSDK;
137135
packageProductDependencies = (
138-
65AEE16C25F2111600821E1E /* KeychainAccess */,
139136
);
140137
productName = StudyplusSDK;
141138
productReference = 183FDA671E7510920085589F /* StudyplusSDK.framework */;
@@ -191,7 +188,6 @@
191188
);
192189
mainGroup = 183FDA5D1E7510920085589F;
193190
packageReferences = (
194-
65AEE16B25F2111600821E1E /* XCRemoteSwiftPackageReference "KeychainAccess" */,
195191
);
196192
productRefGroup = 183FDA681E7510920085589F /* Products */;
197193
projectDirPath = "";
@@ -367,8 +363,7 @@
367363
MTL_ENABLE_DEBUG_INFO = NO;
368364
OTHER_SWIFT_FLAGS = "-D RELEASE";
369365
SDKROOT = iphoneos;
370-
SWIFT_COMPILATION_MODE = wholemodule;
371-
SWIFT_OPTIMIZATION_LEVEL = "-O";
366+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
372367
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
373368
TARGETED_DEVICE_FAMILY = "1,2";
374369
VALIDATE_PRODUCT = YES;
@@ -393,11 +388,7 @@
393388
INFOPLIST_FILE = StudyplusSDK/Info.plist;
394389
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
395390
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
396-
LD_RUNPATH_SEARCH_PATHS = (
397-
"$(inherited)",
398-
"@executable_path/Frameworks",
399-
"@loader_path/Frameworks",
400-
);
391+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
401392
MARKETING_VERSION = 2.0.1;
402393
OTHER_SWIFT_FLAGS = "$(inherited)";
403394
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.StudyplusSDK;
@@ -423,11 +414,7 @@
423414
INFOPLIST_FILE = StudyplusSDK/Info.plist;
424415
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
425416
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
426-
LD_RUNPATH_SEARCH_PATHS = (
427-
"$(inherited)",
428-
"@executable_path/Frameworks",
429-
"@loader_path/Frameworks",
430-
);
417+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
431418
MARKETING_VERSION = 2.0.1;
432419
OTHER_SWIFT_FLAGS = "$(inherited)";
433420
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.StudyplusSDK;
@@ -442,11 +429,7 @@
442429
buildSettings = {
443430
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
444431
INFOPLIST_FILE = StudyplusSDKTests/Info.plist;
445-
LD_RUNPATH_SEARCH_PATHS = (
446-
"$(inherited)",
447-
"@executable_path/Frameworks",
448-
"@loader_path/Frameworks",
449-
);
432+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
450433
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.StudyplusSDKTests;
451434
PRODUCT_NAME = "$(TARGET_NAME)";
452435
SWIFT_VERSION = 5.0;
@@ -458,11 +441,7 @@
458441
buildSettings = {
459442
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
460443
INFOPLIST_FILE = StudyplusSDKTests/Info.plist;
461-
LD_RUNPATH_SEARCH_PATHS = (
462-
"$(inherited)",
463-
"@executable_path/Frameworks",
464-
"@loader_path/Frameworks",
465-
);
444+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
466445
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.StudyplusSDKTests;
467446
PRODUCT_NAME = "$(TARGET_NAME)";
468447
SWIFT_VERSION = 5.0;
@@ -500,25 +479,6 @@
500479
defaultConfigurationName = Release;
501480
};
502481
/* End XCConfigurationList section */
503-
504-
/* Begin XCRemoteSwiftPackageReference section */
505-
65AEE16B25F2111600821E1E /* XCRemoteSwiftPackageReference "KeychainAccess" */ = {
506-
isa = XCRemoteSwiftPackageReference;
507-
repositoryURL = "https://github.com/kishikawakatsumi/KeychainAccess";
508-
requirement = {
509-
kind = upToNextMajorVersion;
510-
minimumVersion = 4.2.2;
511-
};
512-
};
513-
/* End XCRemoteSwiftPackageReference section */
514-
515-
/* Begin XCSwiftPackageProductDependency section */
516-
65AEE16C25F2111600821E1E /* KeychainAccess */ = {
517-
isa = XCSwiftPackageProductDependency;
518-
package = 65AEE16B25F2111600821E1E /* XCRemoteSwiftPackageReference "KeychainAccess" */;
519-
productName = KeychainAccess;
520-
};
521-
/* End XCSwiftPackageProductDependency section */
522482
};
523483
rootObject = 183FDA5E1E7510920085589F /* Project object */;
524484
}

‎Lib/StudyplusSDK.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)