Skip to content

Commit 22f1b85

Browse files
turkenhturkenh
committed
Switch to swift packages and update Yams
Fixes #9 Signed-off-by: Hasan Turken <[email protected]>
1 parent 2ea7da6 commit 22f1b85

File tree

74 files changed

+36
-20450
lines changed

Some content is hidden

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

74 files changed

+36
-20450
lines changed

‎KubeContext.xcodeproj/project.pbxproj

Lines changed: 36 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88

99
/* Begin PBXBuildFile section */
1010
8A0A020E21D2BDFB007DF454 /* ui-test-config-cleaned.yaml in Resources */ = {isa = PBXBuildFile; fileRef = 8A0A020D21D2BDFB007DF454 /* ui-test-config-cleaned.yaml */; };
11+
8A5DB217259535A1004F6EED /* Yams in Frameworks */ = {isa = PBXBuildFile; productRef = 8A5DB216259535A1004F6EED /* Yams */; };
12+
8A5DB21D259535D3004F6EED /* SwiftyStoreKit in Frameworks */ = {isa = PBXBuildFile; productRef = 8A5DB21C259535D3004F6EED /* SwiftyStoreKit */; };
1113
8A795B772595240E003EA721 /* EonilFSEvents in Frameworks */ = {isa = PBXBuildFile; productRef = 8A795B762595240E003EA721 /* EonilFSEvents */; };
12-
8AD3AE6921F520BC00C81839 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8AD3AE6821F520BC00C81839 /* StoreKit.framework */; };
1314
E422CCAD216E8D0A0008D173 /* Config.swift in Sources */ = {isa = PBXBuildFile; fileRef = E422CCAC216E8D0A0008D173 /* Config.swift */; };
1415
E439374F21791F8A0077CCF1 /* KubeContextTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E439374E21791F8A0077CCF1 /* KubeContextTests.swift */; };
1516
E4393759217926C40077CCF1 /* TestData in Resources */ = {isa = PBXBuildFile; fileRef = E4393757217922E90077CCF1 /* TestData */; };
@@ -29,7 +30,6 @@
2930
E4F96DBB217B3D3E004428F6 /* KubeContextBadFileTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4F96DBA217B3D3E004428F6 /* KubeContextBadFileTests.swift */; };
3031
E4F96DBF217B552D004428F6 /* UtilsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4F96DBE217B552D004428F6 /* UtilsTests.swift */; };
3132
E4F96DC7217B60BB004428F6 /* KubeContextUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4F96DC6217B60BB004428F6 /* KubeContextUITests.swift */; };
32-
E52B02DB6E72B33E719EA6A3 /* Pods_KubeContext.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9DBDB0F631DAD622DF0D6157 /* Pods_KubeContext.framework */; };
3333
/* End PBXBuildFile section */
3434

3535
/* Begin PBXContainerItemProxy section */
@@ -63,10 +63,7 @@
6363
/* End PBXCopyFilesBuildPhase section */
6464

6565
/* Begin PBXFileReference section */
66-
6E647E203802CA7F9FBE6AB9 /* Pods-KubeContext.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KubeContext.release.xcconfig"; path = "Pods/Target Support Files/Pods-KubeContext/Pods-KubeContext.release.xcconfig"; sourceTree = "<group>"; };
6766
8A0A020D21D2BDFB007DF454 /* ui-test-config-cleaned.yaml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "ui-test-config-cleaned.yaml"; path = "../../../KubeContext/KubeContextUITests/TestData/ui-test-config-cleaned.yaml"; sourceTree = "<group>"; };
68-
8AD3AE6821F520BC00C81839 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
69-
9DBDB0F631DAD622DF0D6157 /* Pods_KubeContext.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_KubeContext.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7067
E422CCAC216E8D0A0008D173 /* Config.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Config.swift; sourceTree = "<group>"; };
7168
E439374C21791F8A0077CCF1 /* KubeContextTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KubeContextTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
7269
E439374E21791F8A0077CCF1 /* KubeContextTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KubeContextTests.swift; sourceTree = "<group>"; };
@@ -92,7 +89,6 @@
9289
E4F96DC4217B60BB004428F6 /* KubeContextUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KubeContextUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
9390
E4F96DC6217B60BB004428F6 /* KubeContextUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KubeContextUITests.swift; sourceTree = "<group>"; };
9491
E4F96DC8217B60BB004428F6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
95-
E62649087C44EE8C0FBE5E58 /* Pods-KubeContext.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KubeContext.debug.xcconfig"; path = "Pods/Target Support Files/Pods-KubeContext/Pods-KubeContext.debug.xcconfig"; sourceTree = "<group>"; };
9692
/* End PBXFileReference section */
9793

9894
/* Begin PBXFrameworksBuildPhase section */
@@ -107,9 +103,9 @@
107103
isa = PBXFrameworksBuildPhase;
108104
buildActionMask = 2147483647;
109105
files = (
110-
8AD3AE6921F520BC00C81839 /* StoreKit.framework in Frameworks */,
106+
8A5DB21D259535D3004F6EED /* SwiftyStoreKit in Frameworks */,
107+
8A5DB217259535A1004F6EED /* Yams in Frameworks */,
111108
8A795B772595240E003EA721 /* EonilFSEvents in Frameworks */,
112-
E52B02DB6E72B33E719EA6A3 /* Pods_KubeContext.framework in Frameworks */,
113109
);
114110
runOnlyForDeploymentPostprocessing = 0;
115111
};
@@ -163,8 +159,6 @@
163159
E439374D21791F8A0077CCF1 /* KubeContextTests */,
164160
E4F96DC5217B60BB004428F6 /* KubeContextUITests */,
165161
E4DE5AE12166AAD800B6959B /* Products */,
166-
E69E3543D6CBED77C75F771D /* Pods */,
167-
EE5964428F10BB7385B75A69 /* Frameworks */,
168162
);
169163
sourceTree = "<group>";
170164
};
@@ -205,24 +199,6 @@
205199
path = KubeContextUITests;
206200
sourceTree = "<group>";
207201
};
208-
E69E3543D6CBED77C75F771D /* Pods */ = {
209-
isa = PBXGroup;
210-
children = (
211-
E62649087C44EE8C0FBE5E58 /* Pods-KubeContext.debug.xcconfig */,
212-
6E647E203802CA7F9FBE6AB9 /* Pods-KubeContext.release.xcconfig */,
213-
);
214-
name = Pods;
215-
sourceTree = "<group>";
216-
};
217-
EE5964428F10BB7385B75A69 /* Frameworks */ = {
218-
isa = PBXGroup;
219-
children = (
220-
8AD3AE6821F520BC00C81839 /* StoreKit.framework */,
221-
9DBDB0F631DAD622DF0D6157 /* Pods_KubeContext.framework */,
222-
);
223-
name = Frameworks;
224-
sourceTree = "<group>";
225-
};
226202
/* End PBXGroup section */
227203

228204
/* Begin PBXNativeTarget section */
@@ -248,11 +224,9 @@
248224
isa = PBXNativeTarget;
249225
buildConfigurationList = E4DE5AF02166AAD900B6959B /* Build configuration list for PBXNativeTarget "KubeContext" */;
250226
buildPhases = (
251-
F737CDCEDCE68D54DDA65CCB /* [CP] Check Pods Manifest.lock */,
252227
E4DE5ADC2166AAD800B6959B /* Sources */,
253228
E4DE5ADD2166AAD800B6959B /* Frameworks */,
254229
E4DE5ADE2166AAD800B6959B /* Resources */,
255-
6C8CF513156D406A7F26275E /* [CP] Embed Pods Frameworks */,
256230
);
257231
buildRules = (
258232
);
@@ -261,6 +235,8 @@
261235
name = KubeContext;
262236
packageProductDependencies = (
263237
8A795B762595240E003EA721 /* EonilFSEvents */,
238+
8A5DB216259535A1004F6EED /* Yams */,
239+
8A5DB21C259535D3004F6EED /* SwiftyStoreKit */,
264240
);
265241
productName = KubeContext;
266242
productReference = E4DE5AE02166AAD800B6959B /* KubeContext.app */;
@@ -327,6 +303,8 @@
327303
mainGroup = E4DE5AD72166AAD800B6959B;
328304
packageReferences = (
329305
8A795B752595240E003EA721 /* XCRemoteSwiftPackageReference "FSEvents" */,
306+
8A5DB215259535A1004F6EED /* XCRemoteSwiftPackageReference "Yams" */,
307+
8A5DB21B259535D3004F6EED /* XCRemoteSwiftPackageReference "SwiftyStoreKit" */,
330308
);
331309
productRefGroup = E4DE5AE12166AAD800B6959B /* Products */;
332310
projectDirPath = "";
@@ -370,47 +348,6 @@
370348
};
371349
/* End PBXResourcesBuildPhase section */
372350

373-
/* Begin PBXShellScriptBuildPhase section */
374-
6C8CF513156D406A7F26275E /* [CP] Embed Pods Frameworks */ = {
375-
isa = PBXShellScriptBuildPhase;
376-
buildActionMask = 2147483647;
377-
files = (
378-
);
379-
inputPaths = (
380-
"${SRCROOT}/Pods/Target Support Files/Pods-KubeContext/Pods-KubeContext-frameworks.sh",
381-
"${BUILT_PRODUCTS_DIR}/SwiftyStoreKit/SwiftyStoreKit.framework",
382-
"${BUILT_PRODUCTS_DIR}/Yams/Yams.framework",
383-
);
384-
name = "[CP] Embed Pods Frameworks";
385-
outputPaths = (
386-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyStoreKit.framework",
387-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Yams.framework",
388-
);
389-
runOnlyForDeploymentPostprocessing = 0;
390-
shellPath = /bin/sh;
391-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-KubeContext/Pods-KubeContext-frameworks.sh\"\n";
392-
showEnvVarsInLog = 0;
393-
};
394-
F737CDCEDCE68D54DDA65CCB /* [CP] Check Pods Manifest.lock */ = {
395-
isa = PBXShellScriptBuildPhase;
396-
buildActionMask = 2147483647;
397-
files = (
398-
);
399-
inputPaths = (
400-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
401-
"${PODS_ROOT}/Manifest.lock",
402-
);
403-
name = "[CP] Check Pods Manifest.lock";
404-
outputPaths = (
405-
"$(DERIVED_FILE_DIR)/Pods-KubeContext-checkManifestLockResult.txt",
406-
);
407-
runOnlyForDeploymentPostprocessing = 0;
408-
shellPath = /bin/sh;
409-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
410-
showEnvVarsInLog = 0;
411-
};
412-
/* End PBXShellScriptBuildPhase section */
413-
414351
/* Begin PBXSourcesBuildPhase section */
415352
E439374821791F8A0077CCF1 /* Sources */ = {
416353
isa = PBXSourcesBuildPhase;
@@ -563,7 +500,7 @@
563500
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
564501
GCC_WARN_UNUSED_FUNCTION = YES;
565502
GCC_WARN_UNUSED_VARIABLE = YES;
566-
MACOSX_DEPLOYMENT_TARGET = 10.11;
503+
MACOSX_DEPLOYMENT_TARGET = 11.1;
567504
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
568505
MTL_FAST_MATH = YES;
569506
ONLY_ACTIVE_ARCH = YES;
@@ -618,7 +555,7 @@
618555
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
619556
GCC_WARN_UNUSED_FUNCTION = YES;
620557
GCC_WARN_UNUSED_VARIABLE = YES;
621-
MACOSX_DEPLOYMENT_TARGET = 10.11;
558+
MACOSX_DEPLOYMENT_TARGET = 11.1;
622559
MTL_ENABLE_DEBUG_INFO = NO;
623560
MTL_FAST_MATH = YES;
624561
SDKROOT = macosx;
@@ -629,7 +566,6 @@
629566
};
630567
E4DE5AF12166AAD900B6959B /* Debug */ = {
631568
isa = XCBuildConfiguration;
632-
baseConfigurationReference = E62649087C44EE8C0FBE5E58 /* Pods-KubeContext.debug.xcconfig */;
633569
buildSettings = {
634570
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
635571
CODE_SIGN_ENTITLEMENTS = KubeContext/KubeContext.entitlements;
@@ -653,7 +589,6 @@
653589
};
654590
E4DE5AF22166AAD900B6959B /* Release */ = {
655591
isa = XCBuildConfiguration;
656-
baseConfigurationReference = 6E647E203802CA7F9FBE6AB9 /* Pods-KubeContext.release.xcconfig */;
657592
buildSettings = {
658593
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
659594
CODE_SIGN_ENTITLEMENTS = KubeContext/KubeContext.entitlements;
@@ -755,6 +690,22 @@
755690
/* End XCConfigurationList section */
756691

757692
/* Begin XCRemoteSwiftPackageReference section */
693+
8A5DB215259535A1004F6EED /* XCRemoteSwiftPackageReference "Yams" */ = {
694+
isa = XCRemoteSwiftPackageReference;
695+
repositoryURL = "[email protected]:jpsim/Yams.git";
696+
requirement = {
697+
kind = upToNextMajorVersion;
698+
minimumVersion = 4.0.3;
699+
};
700+
};
701+
8A5DB21B259535D3004F6EED /* XCRemoteSwiftPackageReference "SwiftyStoreKit" */ = {
702+
isa = XCRemoteSwiftPackageReference;
703+
repositoryURL = "[email protected]:bizz84/SwiftyStoreKit.git";
704+
requirement = {
705+
kind = upToNextMajorVersion;
706+
minimumVersion = 0.16.1;
707+
};
708+
};
758709
8A795B752595240E003EA721 /* XCRemoteSwiftPackageReference "FSEvents" */ = {
759710
isa = XCRemoteSwiftPackageReference;
760711
repositoryURL = "[email protected]:eonil/FSEvents.git";
@@ -766,6 +717,16 @@
766717
/* End XCRemoteSwiftPackageReference section */
767718

768719
/* Begin XCSwiftPackageProductDependency section */
720+
8A5DB216259535A1004F6EED /* Yams */ = {
721+
isa = XCSwiftPackageProductDependency;
722+
package = 8A5DB215259535A1004F6EED /* XCRemoteSwiftPackageReference "Yams" */;
723+
productName = Yams;
724+
};
725+
8A5DB21C259535D3004F6EED /* SwiftyStoreKit */ = {
726+
isa = XCSwiftPackageProductDependency;
727+
package = 8A5DB21B259535D3004F6EED /* XCRemoteSwiftPackageReference "SwiftyStoreKit" */;
728+
productName = SwiftyStoreKit;
729+
};
769730
8A795B762595240E003EA721 /* EonilFSEvents */ = {
770731
isa = XCSwiftPackageProductDependency;
771732
package = 8A795B752595240E003EA721 /* XCRemoteSwiftPackageReference "FSEvents" */;

‎KubeContext.xcworkspace/contents.xcworkspacedata

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

‎KubeContext.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

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

‎KubeContext.xcworkspace/xcshareddata/swiftpm/Package.resolved

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

‎Podfile

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

‎Podfile.lock

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

‎Pods/Manifest.lock

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

0 commit comments

Comments
 (0)