Skip to content

Commit

Permalink
Add new processinfo extension (#19)
Browse files Browse the repository at this point in the history 
* New extension

* Fix unit test warning
  • Loading branch information
@ofournier-nuglif
ofournier-nuglif authored Jun 13, 2023
1 parent d577ffe commit 8e3e38f
Show file tree
Hide file tree
Showing 8 changed files with 85 additions and 25 deletions.
4 changes: 3 additions & 1 deletion .swiftpm/xcode/xcshareddata/xcschemes/NGToolsTests.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
skipped = "NO"
parallelizable = "YES"
testExecutionOrdering = "random">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "NGToolsTests"
Expand Down
1 change: 0 additions & 1 deletion Cartfile
View file

This file was deleted.

1 change: 0 additions & 1 deletion Cartfile.resolved
View file

This file was deleted.

70 changes: 50 additions & 20 deletions NGTools.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 53;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -40,14 +40,16 @@
A421580C26EA350F008C21D2 /* NSDirectionalEdgeInsets+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A42157D426EA34CA008C21D2 /* NSDirectionalEdgeInsets+Extensions.swift */; };
A421580D26EA350F008C21D2 /* UIEdgeInsets+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A42157CE26EA34CA008C21D2 /* UIEdgeInsets+Extensions.swift */; };
A421580E26EA350F008C21D2 /* String+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A42157CD26EA34CA008C21D2 /* String+Extensions.swift */; };
A494C0B327C40E9700EA0C37 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A494C0B227C40E9700EA0C37 /* RxSwift.framework */; platformFilter = ios; };
A4871FB32A38C4F300281A97 /* ProcessInfo+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4871FB22A38C4F300281A97 /* ProcessInfo+Extensions.swift */; };
A4871FB62A38C53D00281A97 /* RxCocoa in Frameworks */ = {isa = PBXBuildFile; productRef = A4871FB52A38C53D00281A97 /* RxCocoa */; };
A4871FB82A38C53D00281A97 /* RxRelay in Frameworks */ = {isa = PBXBuildFile; productRef = A4871FB72A38C53D00281A97 /* RxRelay */; };
A4871FBA2A38C53D00281A97 /* RxSwift in Frameworks */ = {isa = PBXBuildFile; productRef = A4871FB92A38C53D00281A97 /* RxSwift */; };
A494C0B827C40EC700EA0C37 /* MigrationStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = A494C0B627C40EC700EA0C37 /* MigrationStore.swift */; };
A494C0B927C40EC700EA0C37 /* MigrationTaskState.swift in Sources */ = {isa = PBXBuildFile; fileRef = A494C0B727C40EC700EA0C37 /* MigrationTaskState.swift */; };
A494C0BC27C40EE700EA0C37 /* MigrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A494C0BA27C40ED700EA0C37 /* MigrationTests.swift */; };
A494C0BF27C411E000EA0C37 /* NGTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A421579C26EA3470008C21D2 /* NGTools.framework */; };
A4C75F4D27BED95600F752A3 /* MigrationTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4C75F4C27BED95600F752A3 /* MigrationTask.swift */; };
A4C75F5027BED96E00F752A3 /* MigrationRunner.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4C75F4F27BED96E00F752A3 /* MigrationRunner.swift */; };
B217362F28F8B231004D4F13 /* RxSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = B217362E28F8B231004D4F13 /* RxSwift.xcframework */; platformFilter = ios; };
B2454D7E29102936001E7B9E /* CryptoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2454D7D29102936001E7B9E /* CryptoTests.swift */; };
B24713052911633100FBD1E9 /* CryptoBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = B24713042911633100FBD1E9 /* CryptoBuilder.swift */; };
B24713092911665300FBD1E9 /* CryptoKitAES.swift in Sources */ = {isa = PBXBuildFile; fileRef = B24713082911665300FBD1E9 /* CryptoKitAES.swift */; };
Expand Down Expand Up @@ -108,13 +110,12 @@
A42157D726EA34CA008C21D2 /* Data+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Data+Extensions.swift"; sourceTree = "<group>"; };
A42157D826EA34CA008C21D2 /* UIImage+UIColor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIImage+UIColor.swift"; sourceTree = "<group>"; };
A42157D926EA34CA008C21D2 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
A494C0B227C40E9700EA0C37 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = "<group>"; };
A4871FB22A38C4F300281A97 /* ProcessInfo+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ProcessInfo+Extensions.swift"; sourceTree = "<group>"; };
A494C0B627C40EC700EA0C37 /* MigrationStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationStore.swift; sourceTree = "<group>"; };
A494C0B727C40EC700EA0C37 /* MigrationTaskState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationTaskState.swift; sourceTree = "<group>"; };
A494C0BA27C40ED700EA0C37 /* MigrationTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationTests.swift; sourceTree = "<group>"; };
A4C75F4C27BED95600F752A3 /* MigrationTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrationTask.swift; sourceTree = "<group>"; };
A4C75F4F27BED96E00F752A3 /* MigrationRunner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrationRunner.swift; sourceTree = "<group>"; };
B217362E28F8B231004D4F13 /* RxSwift.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RxSwift.xcframework; path = Carthage/Build/RxSwift.xcframework; sourceTree = "<group>"; };
B2454D7D29102936001E7B9E /* CryptoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CryptoTests.swift; sourceTree = "<group>"; };
B24713042911633100FBD1E9 /* CryptoBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CryptoBuilder.swift; sourceTree = "<group>"; };
B24713082911665300FBD1E9 /* CryptoKitAES.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CryptoKitAES.swift; sourceTree = "<group>"; };
Expand All @@ -131,8 +132,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
A494C0B327C40E9700EA0C37 /* RxSwift.framework in Frameworks */,
B217362F28F8B231004D4F13 /* RxSwift.xcframework in Frameworks */,
A4871FBA2A38C53D00281A97 /* RxSwift in Frameworks */,
A4871FB82A38C53D00281A97 /* RxRelay in Frameworks */,
A4871FB62A38C53D00281A97 /* RxCocoa in Frameworks */,
B295F3B4290772E500CB4087 /* CryptoSwift in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -233,15 +235,14 @@
A42157D526EA34CA008C21D2 /* Calendar+Extensions.swift */,
A42157D626EA34CA008C21D2 /* URL+Extensions.swift */,
A42157D826EA34CA008C21D2 /* UIImage+UIColor.swift */,
A4871FB22A38C4F300281A97 /* ProcessInfo+Extensions.swift */,
);
path = Extensions;
sourceTree = "<group>";
};
A494C0B127C40E9700EA0C37 /* Frameworks */ = {
isa = PBXGroup;
children = (
B217362E28F8B231004D4F13 /* RxSwift.xcframework */,
A494C0B227C40E9700EA0C37 /* RxSwift.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -319,6 +320,9 @@
name = NGTools;
packageProductDependencies = (
B295F3B3290772E500CB4087 /* CryptoSwift */,
A4871FB52A38C53D00281A97 /* RxCocoa */,
A4871FB72A38C53D00281A97 /* RxRelay */,
A4871FB92A38C53D00281A97 /* RxSwift */,
);
productName = NGTools;
productReference = A421579C26EA3470008C21D2 /* NGTools.framework */;
Expand Down Expand Up @@ -348,8 +352,9 @@
6E197BD12190D663006FC412 /* Project object */ = {
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastSwiftUpdateCheck = 1250;
LastUpgradeCheck = 1250;
LastUpgradeCheck = 1430;
ORGANIZATIONNAME = Nuglif;
TargetAttributes = {
A421579B26EA3470008C21D2 = {
Expand All @@ -371,6 +376,7 @@
mainGroup = 6E197BD02190D663006FC412;
packageReferences = (
B295F3B2290772E500CB4087 /* XCRemoteSwiftPackageReference "CryptoSwift" */,
A4871FB42A38C53C00281A97 /* XCRemoteSwiftPackageReference "RxSwift" */,
);
productRefGroup = 6E197BDB2190D663006FC412 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -421,6 +427,7 @@
B247130D2911697600FBD1E9 /* CryptoKitServerEncryptor.swift in Sources */,
A42157EB26EA34CA008C21D2 /* memoization.swift in Sources */,
B24713092911665300FBD1E9 /* CryptoKitAES.swift in Sources */,
A4871FB32A38C4F300281A97 /* ProcessInfo+Extensions.swift in Sources */,
A421580426EA350F008C21D2 /* UIColor+Extensions.swift in Sources */,
A42157E226EA34CA008C21D2 /* CacheItem.swift in Sources */,
A421580726EA350F008C21D2 /* UIFont+Extensions.swift in Sources */,
Expand Down Expand Up @@ -524,7 +531,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -583,7 +590,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
Expand All @@ -598,12 +605,14 @@
A42157AE26EA3470008C21D2 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = Z45WA4MSEP;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
Expand All @@ -616,6 +625,8 @@
"@loader_path/Frameworks",
);
MARKETING_VERSION = 2.0.0;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
PRODUCT_BUNDLE_IDENTIFIER = com.nuglif.NGTools;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
Expand All @@ -627,12 +638,14 @@
A42157AF26EA3470008C21D2 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = Z45WA4MSEP;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
Expand All @@ -645,6 +658,8 @@
"@loader_path/Frameworks",
);
MARKETING_VERSION = 2.0.0;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
PRODUCT_BUNDLE_IDENTIFIER = com.nuglif.NGTools;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
Expand All @@ -659,10 +674,6 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = Z45WA4MSEP;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = Tests/NGToolsTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -682,10 +693,6 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = Z45WA4MSEP;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = Tests/NGToolsTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -732,6 +739,14 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
A4871FB42A38C53C00281A97 /* XCRemoteSwiftPackageReference "RxSwift" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/ReactiveX/RxSwift";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 6.0.0;
};
};
B295F3B2290772E500CB4087 /* XCRemoteSwiftPackageReference "CryptoSwift" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/krzyzanowskim/CryptoSwift.git";
Expand All @@ -743,6 +758,21 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
A4871FB52A38C53D00281A97 /* RxCocoa */ = {
isa = XCSwiftPackageProductDependency;
package = A4871FB42A38C53C00281A97 /* XCRemoteSwiftPackageReference "RxSwift" */;
productName = RxCocoa;
};
A4871FB72A38C53D00281A97 /* RxRelay */ = {
isa = XCSwiftPackageProductDependency;
package = A4871FB42A38C53C00281A97 /* XCRemoteSwiftPackageReference "RxSwift" */;
productName = RxRelay;
};
A4871FB92A38C53D00281A97 /* RxSwift */ = {
isa = XCSwiftPackageProductDependency;
package = A4871FB42A38C53C00281A97 /* XCRemoteSwiftPackageReference "RxSwift" */;
productName = RxSwift;
};
B295F3B3290772E500CB4087 /* CryptoSwift */ = {
isa = XCSwiftPackageProductDependency;
package = B295F3B2290772E500CB4087 /* XCRemoteSwiftPackageReference "CryptoSwift" */;
Expand Down
2 changes: 1 addition & 1 deletion NGTools.xcodeproj/xcshareddata/xcschemes/NGTools.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1250"
LastUpgradeVersion = "1430"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
9 changes: 9 additions & 0 deletions Package.resolved
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
{
"object": {
"pins": [
{
"package": "CryptoSwift",
"repositoryURL": "https://github.com/krzyzanowskim/CryptoSwift.git",
"state": {
"branch": null,
"revision": "32f641cf24fc7abc1c591a2025e9f2f572648b0f",
"version": "1.7.2"
}
},
{
"package": "RxSwift",
"repositoryURL": "https://github.com/ReactiveX/RxSwift",
Expand Down
18 changes: 18 additions & 0 deletions Sources/NGTools/Extensions/ProcessInfo+Extensions.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
//
// ProcessInfo+Extensions.swift
// NGTools
//
// Created by Olivier Fournier on 2023-06-13.
// Copyright © 2023 Nuglif. All rights reserved.
//

import Foundation

public extension ProcessInfo {

var isAppRunningOnMac: Bool {
guard #available(iOS 14.0, *) else { return false }

return isiOSAppOnMac
}
}
5 changes: 4 additions & 1 deletion Tests/NGToolsTests/UrlTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@ final class UrlTests: XCTestCase {

func testUrlComponentsWithArray() {
let baseUrl = "https://testhost.com?cust_params=\("key1=value1&key2=value2".encoded)"
let parameters: [String: Any] = ["key3": ["v1", true, 99], "key4": "value4"]
var parameters = [String: Any]()

parameters["key3"] = ["v1", true, 99] as [Any]
parameters["key4"] = "value4"

let components = baseUrl.integrate(parameters)
let expectedComponents = URLComponents(string: "https://testhost.com?cust_params=\("key1=value1&key2=value2&key3=v1,true,99&key4=value4".encoded)")
Expand Down

0 comments on commit 8e3e38f

Please sign in to comment.