Skip to content

Commit

Permalink
wip: re-align customauth
Browse files Browse the repository at this point in the history
  • Loading branch information
metalurgical committed Jun 14, 2024
1 parent 1378dc1 commit 79ba527
Show file tree
Hide file tree
Showing 78 changed files with 1,846 additions and 3,367 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
platform:
- iOS
steps:
- uses: actions/checkout@v2.3.4
- uses: actions/checkout@v4
- name: Remove Development.xcworkspace to avoid tooling confusion
run: rm -rf Development.xcworkspace
- uses: mxcl/xcodebuild@v1
- uses: mxcl/xcodebuild@v3.0.0
with:
platform: ${{ matrix.platform }}
action: test
Expand Down
2 changes: 1 addition & 1 deletion CustomAuth.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ Pod::Spec.new do |spec|
spec.module_name = "CustomAuth"
spec.source = { :git => "https://github.com/torusresearch/customauth-swift-sdk.git", :tag => spec.version }
spec.source_files = "Sources/CustomAuth/*.{swift}","Sources/CustomAuth/**/*.{swift}"
spec.dependency 'Torus-utils', '~> 8.1.0'
spec.dependency 'Torus-utils', '~> 9.0.0'
spec.dependency 'JWTDecode', '~> 3.1.0'
end
65 changes: 10 additions & 55 deletions CustomAuthDemo/CustomAuthDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,13 @@
objects = {

/* Begin PBXBuildFile section */
511CEACC2452D4EC00A7ACE9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 511CEACB2452D4EC00A7ACE9 /* AppDelegate.swift */; };
511CEACE2452D4EC00A7ACE9 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 511CEACD2452D4EC00A7ACE9 /* SceneDelegate.swift */; };
511CEAD02452D4EC00A7ACE9 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 511CEACF2452D4EC00A7ACE9 /* ContentView.swift */; };
511CEAD22452D4EF00A7ACE9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 511CEAD12452D4EF00A7ACE9 /* Assets.xcassets */; };
511CEAD52452D4EF00A7ACE9 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 511CEAD42452D4EF00A7ACE9 /* Preview Assets.xcassets */; };
511CEAD82452D4EF00A7ACE9 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 511CEAD62452D4EF00A7ACE9 /* LaunchScreen.storyboard */; };
511CEAE32452D4EF00A7ACE9 /* CustomAuthDemoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 511CEAE22452D4EF00A7ACE9 /* CustomAuthDemoTests.swift */; };
511CEAEE2452D4EF00A7ACE9 /* CustomAuthDemoUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 511CEAED2452D4EF00A7ACE9 /* CustomAuthDemoUITests.swift */; };
51775EB72484B66A00A29680 /* CustomAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 51775EB62484B66A00A29680 /* CustomAuth */; };
B36D0EFF2BA033AD008F4C71 /* PromiseKit in Frameworks */ = {isa = PBXBuildFile; productRef = B36D0EFE2BA033AD008F4C71 /* PromiseKit */; };
B37E3CEE2C1CF30F00B63F41 /* CustomAuthDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B37E3CED2C1CF30F00B63F41 /* CustomAuthDemo.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -38,12 +35,9 @@

/* Begin PBXFileReference section */
511CEAC82452D4EC00A7ACE9 /* CustomAuthDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CustomAuthDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
511CEACB2452D4EC00A7ACE9 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
511CEACD2452D4EC00A7ACE9 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
511CEACF2452D4EC00A7ACE9 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
511CEAD12452D4EF00A7ACE9 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
511CEAD42452D4EF00A7ACE9 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
511CEAD72452D4EF00A7ACE9 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
511CEAD92452D4EF00A7ACE9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
511CEADE2452D4EF00A7ACE9 /* CustomAuthDemoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CustomAuthDemoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
511CEAE22452D4EF00A7ACE9 /* CustomAuthDemoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomAuthDemoTests.swift; sourceTree = "<group>"; };
Expand All @@ -54,6 +48,7 @@
51721D842474E4B700C22BAD /* torus-direct-swift-sdk */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "torus-direct-swift-sdk"; path = ..; sourceTree = "<group>"; };
517C5F5D24693F9D006D5A43 /* CustomAuthDemo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = CustomAuthDemo.entitlements; sourceTree = "<group>"; };
A3C24F222A70FAF9002F4FC9 /* customauth-swift-sdk */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "customauth-swift-sdk"; path = ..; sourceTree = "<group>"; };
B37E3CED2C1CF30F00B63F41 /* CustomAuthDemo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomAuthDemo.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -62,7 +57,6 @@
buildActionMask = 2147483647;
files = (
51775EB72484B66A00A29680 /* CustomAuth in Frameworks */,
B36D0EFF2BA033AD008F4C71 /* PromiseKit in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -99,7 +93,6 @@
511CEAE12452D4EF00A7ACE9 /* CustomAuthDemoTests */,
511CEAEC2452D4EF00A7ACE9 /* CustomAuthDemoUITests */,
511CEAC92452D4EC00A7ACE9 /* Products */,
A84257F51AACA6652F347CFD /* Pods */,
18B4F998A7F88C302F18BA73 /* Frameworks */,
);
sourceTree = "<group>";
Expand All @@ -117,12 +110,10 @@
511CEACA2452D4EC00A7ACE9 /* CustomAuthDemo */ = {
isa = PBXGroup;
children = (
B37E3CED2C1CF30F00B63F41 /* CustomAuthDemo.swift */,
517C5F5D24693F9D006D5A43 /* CustomAuthDemo.entitlements */,
511CEACB2452D4EC00A7ACE9 /* AppDelegate.swift */,
511CEACD2452D4EC00A7ACE9 /* SceneDelegate.swift */,
511CEACF2452D4EC00A7ACE9 /* ContentView.swift */,
511CEAD12452D4EF00A7ACE9 /* Assets.xcassets */,
511CEAD62452D4EF00A7ACE9 /* LaunchScreen.storyboard */,
511CEAD92452D4EF00A7ACE9 /* Info.plist */,
511CEAD32452D4EF00A7ACE9 /* Preview Content */,
);
Expand Down Expand Up @@ -163,13 +154,6 @@
name = Packages;
sourceTree = "<group>";
};
A84257F51AACA6652F347CFD /* Pods */ = {
isa = PBXGroup;
children = (
);
path = Pods;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand All @@ -188,7 +172,6 @@
name = CustomAuthDemo;
packageProductDependencies = (
51775EB62484B66A00A29680 /* CustomAuth */,
B36D0EFE2BA033AD008F4C71 /* PromiseKit */,
);
productName = CustomAuthDemo;
productReference = 511CEAC82452D4EC00A7ACE9 /* CustomAuthDemo.app */;
Expand Down Expand Up @@ -263,7 +246,6 @@
);
mainGroup = 511CEABF2452D4EC00A7ACE9;
packageReferences = (
B36D0EFD2BA033AD008F4C71 /* XCRemoteSwiftPackageReference "PromiseKit" */,
);
productRefGroup = 511CEAC92452D4EC00A7ACE9 /* Products */;
projectDirPath = "";
Expand All @@ -281,7 +263,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
511CEAD82452D4EF00A7ACE9 /* LaunchScreen.storyboard in Resources */,
511CEAD52452D4EF00A7ACE9 /* Preview Assets.xcassets in Resources */,
511CEAD22452D4EF00A7ACE9 /* Assets.xcassets in Resources */,
);
Expand All @@ -308,9 +289,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
511CEACC2452D4EC00A7ACE9 /* AppDelegate.swift in Sources */,
511CEACE2452D4EC00A7ACE9 /* SceneDelegate.swift in Sources */,
511CEAD02452D4EC00A7ACE9 /* ContentView.swift in Sources */,
B37E3CEE2C1CF30F00B63F41 /* CustomAuthDemo.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -345,17 +325,6 @@
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
511CEAD62452D4EF00A7ACE9 /* LaunchScreen.storyboard */ = {
isa = PBXVariantGroup;
children = (
511CEAD72452D4EF00A7ACE9 /* Base */,
);
name = LaunchScreen.storyboard;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
511CEAF02452D4EF00A7ACE9 /* Debug */ = {
isa = XCBuildConfiguration;
Expand Down Expand Up @@ -485,7 +454,7 @@
DEVELOPMENT_TEAM = 2Q63NCPY55;
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = CustomAuthDemo/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.3;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -507,7 +476,7 @@
DEVELOPMENT_TEAM = 2Q63NCPY55;
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = CustomAuthDemo/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.3;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -526,7 +495,7 @@
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = CustomAuthDemoTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -547,7 +516,7 @@
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = CustomAuthDemoTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -567,6 +536,7 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = CustomAuthDemoUITests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -586,6 +556,7 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = CustomAuthDemoUITests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -640,27 +611,11 @@
};
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
B36D0EFD2BA033AD008F4C71 /* XCRemoteSwiftPackageReference "PromiseKit" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/mxcl/PromiseKit";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 8.1.1;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
51775EB62484B66A00A29680 /* CustomAuth */ = {
isa = XCSwiftPackageProductDependency;
productName = CustomAuth;
};
B36D0EFE2BA033AD008F4C71 /* PromiseKit */ = {
isa = XCSwiftPackageProductDependency;
package = B36D0EFD2BA033AD008F4C71 /* XCRemoteSwiftPackageReference "PromiseKit" */;
productName = PromiseKit;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 511CEAC02452D4EC00A7ACE9 /* Project object */;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,97 +1,68 @@
{
"object": {
"pins": [
{
"package": "AnyCodable",
"repositoryURL": "https://github.com/Flight-School/AnyCodable",
"state": {
"branch": null,
"revision": "862808b2070cd908cb04f9aafe7de83d35f81b05",
"version": "0.6.7"
}
},
{
"package": "BigInt",
"repositoryURL": "https://github.com/attaswift/BigInt.git",
"state": {
"branch": null,
"revision": "0ed110f7555c34ff468e72e1686e59721f2b0da6",
"version": "5.3.0"
}
},
{
"package": "CryptoSwift",
"repositoryURL": "https://github.com/krzyzanowskim/CryptoSwift",
"state": {
"branch": null,
"revision": "7892a123f7e8d0fe62f9f03728b17bbd4f94df5c",
"version": "1.8.1"
}
},
{
"package": "curvelib.swift",
"repositoryURL": "https://github.com/tkey/curvelib.swift",
"state": {
"branch": null,
"revision": "7dad3bf1793de263f83406c08c18c9316abf082f",
"version": "0.1.2"
}
},
{
"package": "FetchNodeDetails",
"repositoryURL": "https://github.com/torusresearch/fetch-node-details-swift",
"state": {
"branch": null,
"revision": "d591af500f32ce3c88d04af9bb74d746585acfea",
"version": "5.1.0"
}
},
{
"package": "jwt-kit",
"repositoryURL": "https://github.com/vapor/jwt-kit.git",
"state": {
"branch": null,
"revision": "e05513b5aec24f88012b6e3034115b6bc915356a",
"version": "4.13.2"
}
},
{
"package": "JWTDecode",
"repositoryURL": "https://github.com/auth0/JWTDecode.swift.git",
"state": {
"branch": null,
"revision": "58af7278797871e460d79496621b3e5366b865b2",
"version": "3.1.0"
}
},
{
"package": "PromiseKit",
"repositoryURL": "https://github.com/mxcl/PromiseKit",
"state": {
"branch": null,
"revision": "cb70b070cde06837cd10a1febdf6105c1a3bb348",
"version": "8.1.1"
}
},
{
"package": "swift-crypto",
"repositoryURL": "https://github.com/apple/swift-crypto.git",
"state": {
"branch": null,
"revision": "f0525da24dc3c6cbb2b6b338b65042bc91cbc4bb",
"version": "3.3.0"
}
},
{
"package": "TorusUtils",
"repositoryURL": "https://github.com/torusresearch/torus-utils-swift.git",
"state": {
"branch": null,
"revision": "04c62fd5f73f21bd01b7c07e08f6135db26c5940",
"version": "8.0.0"
}
"pins" : [
{
"identity" : "bigint",
"kind" : "remoteSourceControl",
"location" : "https://github.com/attaswift/BigInt.git",
"state" : {
"revision" : "0ed110f7555c34ff468e72e1686e59721f2b0da6",
"version" : "5.3.0"
}
]
},
"version": 1
},
{
"identity" : "curvelib.swift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/tkey/curvelib.swift",
"state" : {
"revision" : "9f88bd5e56d1df443a908f7a7e81ae4f4d9170ea",
"version" : "1.0.1"
}
},
{
"identity" : "fetch-node-details-swift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/torusresearch/fetch-node-details-swift",
"state" : {
"revision" : "22bfadf7491d77a0bc1953af002cadbd61383e7d",
"version" : "6.0.2"
}
},
{
"identity" : "jwt-kit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/vapor/jwt-kit.git",
"state" : {
"revision" : "c2595b9ad7f512d7f334830b4df1fed6e917946a",
"version" : "4.13.4"
}
},
{
"identity" : "jwtdecode.swift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/auth0/JWTDecode.swift.git",
"state" : {
"revision" : "58af7278797871e460d79496621b3e5366b865b2",
"version" : "3.1.0"
}
},
{
"identity" : "swift-crypto",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-crypto.git",
"state" : {
"revision" : "bc1c29221f6dfeb0ebbfbc98eb95cd3d4967868e",
"version" : "3.4.0"
}
},
{
"identity" : "torus-utils-swift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/torusresearch/torus-utils-swift.git",
"state" : {
"branch" : "feature_updates",
"revision" : "976da309c9e28670af763a82947276864c27c08e"
}
}
],
"version" : 2
}
Loading

0 comments on commit 79ba527

Please sign in to comment.