Skip to content

Commit

Permalink
Merge pull request #415 from paulplant/swift-package-dependencies
Browse files Browse the repository at this point in the history 
Transition Cocoapods to Swift Package Dependencies
  • Loading branch information
@JohanDegraeve
JohanDegraeve authored Jan 28, 2023
2 parents 4be086a + 2c2992c commit a46bd45
Show file tree
Hide file tree
Showing 5 changed files with 139 additions and 122 deletions.
20 changes: 0 additions & 20 deletions Podfile
View file

This file was deleted.

36 changes: 0 additions & 36 deletions Podfile.lock
View file

This file was deleted.

161 changes: 98 additions & 63 deletions xdrip.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
archiveVersion = 1;
classes = {
};
objectVersion = 51;
objectVersion = 52;
objects = {

/* Begin PBXBuildFile section */
470824D2297484B500C52317 /* SwiftCharts in Frameworks */ = {isa = PBXBuildFile; productRef = 470824D1297484B500C52317 /* SwiftCharts */; };
470824D3297484B500C52317 /* SwiftCharts in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 470824D1297484B500C52317 /* SwiftCharts */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
470B618A270C448000561E56 /* Interface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 470B6188270C448000561E56 /* Interface.storyboard */; };
470B618C270C448100561E56 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 470B618B270C448100561E56 /* Assets.xcassets */; };
470B6192270C448100561E56 /* Watch App WatchKit Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 470B6191270C448100561E56 /* Watch App WatchKit Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
Expand All @@ -22,14 +24,16 @@
47503382247420A200D2260B /* BluetoothPeripheralView.strings in Resources */ = {isa = PBXBuildFile; fileRef = 47503384247420A200D2260B /* BluetoothPeripheralView.strings */; };
4752B400263570DA0081D551 /* ConstantsStatistics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4752B3FF263570DA0081D551 /* ConstantsStatistics.swift */; };
4752B4062635878E0081D551 /* SettingsViewStatisticsSettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4752B4052635878E0081D551 /* SettingsViewStatisticsSettingsViewModel.swift */; };
4779BCEE2974306300515714 /* ActionClosurable in Frameworks */ = {isa = PBXBuildFile; productRef = 4779BCED2974306300515714 /* ActionClosurable */; };
4779BCF12974307700515714 /* CryptoSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 4779BCF02974307700515714 /* CryptoSwift */; };
4779BCF42974308F00515714 /* PieCharts in Frameworks */ = {isa = PBXBuildFile; productRef = 4779BCF32974308F00515714 /* PieCharts */; };
477F45E6285B993200AC8475 /* GlucoseMiniChartManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 477F45E5285B993100AC8475 /* GlucoseMiniChartManager.swift */; };
47AB72F327105EF4005E7CAB /* SettingsViewHelpSettingModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47AB72F227105EF4005E7CAB /* SettingsViewHelpSettingModel.swift */; };
47ADD2DF27FAF8630025E2F4 /* ChartPointsScatterDownTrianglesLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47ADD2DE27FAF8630025E2F4 /* ChartPointsScatterDownTrianglesLayer.swift */; };
47ADD2E127FB05EB0025E2F4 /* ChartPointsScatterDownTrianglesWithDropdownLineLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47ADD2E027FB05EB0025E2F4 /* ChartPointsScatterDownTrianglesWithDropdownLineLayer.swift */; };
47B60F3726F389E2003198D3 /* LandscapeChartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47B60F3626F389E2003198D3 /* LandscapeChartViewController.swift */; };
47F8E95A2710255D00B8B02B /* ConstantsWatchApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F8E9592710255C00B8B02B /* ConstantsWatchApp.swift */; };
47FB28082636B04200042FFB /* StatisticsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47FB28072636B04200042FFB /* StatisticsManager.swift */; };
533272967B05B378D81F6529 /* Pods_xdrip.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DB0736D7B1553FC8350324C /* Pods_xdrip.framework */; };
CE1B2FE025D0264B00F642F5 /* LaunchScreen.strings in Resources */ = {isa = PBXBuildFile; fileRef = CE1B2FD125D0264900F642F5 /* LaunchScreen.strings */; };
CE1B2FE125D0264B00F642F5 /* Main.strings in Resources */ = {isa = PBXBuildFile; fileRef = CE1B2FD425D0264900F642F5 /* Main.strings */; };
D400F8032778BD8000B57648 /* TextsTreatmentsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D400F8022778BD8000B57648 /* TextsTreatmentsView.swift */; };
Expand Down Expand Up @@ -580,6 +584,17 @@
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
470824D4297484B500C52317 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
470824D3297484B500C52317 /* SwiftCharts in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
470B61A2270C448200561E56 /* Embed Watch Content */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -616,7 +631,6 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
170A1629CB2C62ADD901F4A6 /* Pods-xdrip.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-xdrip.release.xcconfig"; path = "Target Support Files/Pods-xdrip/Pods-xdrip.release.xcconfig"; sourceTree = "<group>"; };
198D44C3260A3A3300A2B4A2 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Common.strings; sourceTree = "<group>"; };
198D44C4260A3A3300A2B4A2 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Alerts.strings; sourceTree = "<group>"; };
198D44C5260A3A3300A2B4A2 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/AlertTypesSettingsView.strings; sourceTree = "<group>"; };
Expand Down Expand Up @@ -733,7 +747,6 @@
47B60F3626F389E2003198D3 /* LandscapeChartViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LandscapeChartViewController.swift; sourceTree = "<group>"; };
47F8E9592710255C00B8B02B /* ConstantsWatchApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConstantsWatchApp.swift; sourceTree = "<group>"; };
47FB28072636B04200042FFB /* StatisticsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatisticsManager.swift; sourceTree = "<group>"; };
4DB0736D7B1553FC8350324C /* Pods_xdrip.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_xdrip.framework; sourceTree = BUILT_PRODUCTS_DIR; };
666E283826F7E54C00ACE4DF /* xDrip.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = xDrip.xcconfig; path = xdrip/xDrip.xcconfig; sourceTree = "<group>"; };
666E283926F7E54C00ACE4DF /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Version.xcconfig; path = xdrip/Version.xcconfig; sourceTree = "<group>"; };
CE1B2FC825D0261500F642F5 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Alerts.strings; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1574,7 +1587,6 @@
F8FDFEA7260DE1A70047597D /* DTCustomColoredAccessory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DTCustomColoredAccessory.h; sourceTree = "<group>"; };
F8FDFEA8260DE1A70047597D /* DTCustomColoredAccessory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DTCustomColoredAccessory.m; sourceTree = "<group>"; };
F8FDFEAC260DE1B90047597D /* ConstantsUI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConstantsUI.swift; sourceTree = "<group>"; };
FB1D964808BD308C74247D66 /* Pods-xdrip.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-xdrip.debug.xcconfig"; path = "Target Support Files/Pods-xdrip/Pods-xdrip.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -1606,8 +1618,11 @@
buildActionMask = 2147483647;
files = (
F81F3C4225D1D91300520946 /* CoreNFC.framework in Frameworks */,
470824D2297484B500C52317 /* SwiftCharts in Frameworks */,
4779BCEE2974306300515714 /* ActionClosurable in Frameworks */,
F821CF9722AE589E005C1E43 /* HealthKit.framework in Frameworks */,
533272967B05B378D81F6529 /* Pods_xdrip.framework in Frameworks */,
4779BCF42974308F00515714 /* PieCharts in Frameworks */,
4779BCF12974307700515714 /* CryptoSwift in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1650,20 +1665,10 @@
F81F3C4125D1D91300520946 /* CoreNFC.framework */,
F821CF9622AE589E005C1E43 /* HealthKit.framework */,
F870D3D225126A49008967B0 /* NotificationCenter.framework */,
4DB0736D7B1553FC8350324C /* Pods_xdrip.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
6933F5E98A8280DB39890854 /* Pods */ = {
isa = PBXGroup;
children = (
FB1D964808BD308C74247D66 /* Pods-xdrip.debug.xcconfig */,
170A1629CB2C62ADD901F4A6 /* Pods-xdrip.release.xcconfig */,
);
path = Pods;
sourceTree = "<group>";
};
D4028CBE2774A4B900341476 /* Treatments */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -2268,7 +2273,6 @@
F8AC425B21ADEBD60078C348 /* Products */,
F8AC425C21ADEBD60078C348 /* xdrip */,
F85DC29B21CFCEB800B9F74A /* Recovered References */,
6933F5E98A8280DB39890854 /* Pods */,
48C0E851274A3BB6D42C6F20 /* Frameworks */,
666E283926F7E54C00ACE4DF /* Version.xcconfig */,
666E283826F7E54C00ACE4DF /* xDrip.xcconfig */,
Expand Down Expand Up @@ -3240,13 +3244,12 @@
isa = PBXNativeTarget;
buildConfigurationList = F8AC426E21ADEBD70078C348 /* Build configuration list for PBXNativeTarget "xdrip" */;
buildPhases = (
E95BFBBCCD8F2D55529701C3 /* [CP] Check Pods Manifest.lock */,
F8AC425621ADEBD60078C348 /* Sources */,
F8AC425721ADEBD60078C348 /* Frameworks */,
F8AC425821ADEBD60078C348 /* Resources */,
F870D3DE25126A49008967B0 /* Embed App Extensions */,
163869F46F6F1C9409269D58 /* [CP] Embed Pods Frameworks */,
470B61A2270C448200561E56 /* Embed Watch Content */,
470824D4297484B500C52317 /* Embed Frameworks */,
);
buildRules = (
);
Expand All @@ -3255,6 +3258,12 @@
470B61A0270C448200561E56 /* PBXTargetDependency */,
);
name = xdrip;
packageProductDependencies = (
4779BCED2974306300515714 /* ActionClosurable */,
4779BCF02974307700515714 /* CryptoSwift */,
4779BCF32974308F00515714 /* PieCharts */,
470824D1297484B500C52317 /* SwiftCharts */,
);
productName = xdrip;
productReference = F8AC425A21ADEBD60078C348 /* xdrip.app */;
productType = "com.apple.product-type.application";
Expand Down Expand Up @@ -3319,6 +3328,12 @@
el,
);
mainGroup = F8AC425121ADEBD60078C348;
packageReferences = (
4779BCE92974303400515714 /* XCRemoteSwiftPackageReference "SwiftCharts" */,
4779BCEC2974306300515714 /* XCRemoteSwiftPackageReference "ActionClosurable" */,
4779BCEF2974307700515714 /* XCRemoteSwiftPackageReference "CryptoSwift" */,
4779BCF22974308F00515714 /* XCRemoteSwiftPackageReference "PieCharts" */,
);
productRefGroup = F8AC425B21ADEBD60078C348 /* Products */;
projectDirPath = "";
projectRoot = "";
Expand Down Expand Up @@ -3518,48 +3533,6 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
163869F46F6F1C9409269D58 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-xdrip/Pods-xdrip-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-xdrip/Pods-xdrip-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-xdrip/Pods-xdrip-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
E95BFBBCCD8F2D55529701C3 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-xdrip-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
470B618D270C448100561E56 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down Expand Up @@ -4825,11 +4798,14 @@
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OBJROOT = "";
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SHARED_PRECOMPS_DIR = "";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_COMPILATION_MODE = singlefile;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SYMROOT = "";
};
name = Debug;
};
Expand Down Expand Up @@ -4884,16 +4860,18 @@
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
OBJROOT = "";
SDKROOT = iphoneos;
SHARED_PRECOMPS_DIR = "";
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SYMROOT = "";
VALIDATE_PRODUCT = YES;
};
name = Release;
};
F8AC426F21ADEBD70078C348 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = FB1D964808BD308C74247D66 /* Pods-xdrip.debug.xcconfig */;
buildSettings = {
APP_GROUP_IDENTIFIER = "group.com.${DEVELOPMENT_TEAM}.loopkit.LoopGroup";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
Expand Down Expand Up @@ -4921,7 +4899,6 @@
};
F8AC427021ADEBD70078C348 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 170A1629CB2C62ADD901F4A6 /* Pods-xdrip.release.xcconfig */;
buildSettings = {
APP_GROUP_IDENTIFIER = "group.com.${DEVELOPMENT_TEAM}.loopkit.LoopGroup";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
Expand Down Expand Up @@ -4996,6 +4973,64 @@
};
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
4779BCE92974303400515714 /* XCRemoteSwiftPackageReference "SwiftCharts" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/ivanschuetz/SwiftCharts";
requirement = {
branch = master;
kind = branch;
};
};
4779BCEC2974306300515714 /* XCRemoteSwiftPackageReference "ActionClosurable" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/takasek/ActionClosurable.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 2.0.0;
};
};
4779BCEF2974307700515714 /* XCRemoteSwiftPackageReference "CryptoSwift" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/krzyzanowskim/CryptoSwift.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.4.0;
};
};
4779BCF22974308F00515714 /* XCRemoteSwiftPackageReference "PieCharts" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/paulplant/PieCharts";
requirement = {
branch = master;
kind = branch;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
470824D1297484B500C52317 /* SwiftCharts */ = {
isa = XCSwiftPackageProductDependency;
package = 4779BCE92974303400515714 /* XCRemoteSwiftPackageReference "SwiftCharts" */;
productName = SwiftCharts;
};
4779BCED2974306300515714 /* ActionClosurable */ = {
isa = XCSwiftPackageProductDependency;
package = 4779BCEC2974306300515714 /* XCRemoteSwiftPackageReference "ActionClosurable" */;
productName = ActionClosurable;
};
4779BCF02974307700515714 /* CryptoSwift */ = {
isa = XCSwiftPackageProductDependency;
package = 4779BCEF2974307700515714 /* XCRemoteSwiftPackageReference "CryptoSwift" */;
productName = CryptoSwift;
};
4779BCF32974308F00515714 /* PieCharts */ = {
isa = XCSwiftPackageProductDependency;
package = 4779BCF22974308F00515714 /* XCRemoteSwiftPackageReference "PieCharts" */;
productName = PieCharts;
};
/* End XCSwiftPackageProductDependency section */

/* Begin XCVersionGroup section */
F85FF3C2252D0C32004E6FF1 /* xdrip.xcdatamodeld */ = {
isa = XCVersionGroup;
Expand Down
3 changes: 0 additions & 3 deletions xdrip.xcworkspace/contents.xcworkspacedata
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a46bd45

Please sign in to comment.