Skip to content

Commit 22c4c42

Browse files
objecthubobjecthub
committed
Implement OAuth2 library (lispkit http oauth) and integrate it into the iOS REPL. Fix make-schema-registry of library (lispkit json schema).
1 parent 4286251 commit 22c4c42

14 files changed

Lines changed: 1163 additions & 14 deletions

File tree

‎LispKit.xcodeproj/project.pbxproj‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1220,6 +1220,12 @@
12201220
CCD5B6092C276696002BF2F0 /* ThreadFutureLibrary.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCD5B6072C276696002BF2F0 /* ThreadFutureLibrary.swift */; };
12211221
CCD5B60B2C295951002BF2F0 /* HTTPLibrary.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCD5B60A2C295951002BF2F0 /* HTTPLibrary.swift */; };
12221222
CCD5B60C2C295951002BF2F0 /* HTTPLibrary.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCD5B60A2C295951002BF2F0 /* HTTPLibrary.swift */; };
1223+
CCD5B6162C3BC480002BF2F0 /* HTTPAOuthLibrary.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCD5B6152C3BC480002BF2F0 /* HTTPAOuthLibrary.swift */; };
1224+
CCD5B6172C3BC480002BF2F0 /* HTTPAOuthLibrary.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCD5B6152C3BC480002BF2F0 /* HTTPAOuthLibrary.swift */; };
1225+
CCD5B61A2C3BC57A002BF2F0 /* OAuth2 in Frameworks */ = {isa = PBXBuildFile; productRef = CCD5B6192C3BC57A002BF2F0 /* OAuth2 */; };
1226+
CCD5B61C2C3BC773002BF2F0 /* OAuth2 in Frameworks */ = {isa = PBXBuildFile; productRef = CCD5B61B2C3BC773002BF2F0 /* OAuth2 */; };
1227+
CCD5B6202C3BCAB0002BF2F0 /* LispKitReplOAuthConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCD5B61D2C3BCA1D002BF2F0 /* LispKitReplOAuthConfig.swift */; };
1228+
CCD5B6242C409E64002BF2F0 /* UIApplication.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCD5B6212C3BCE08002BF2F0 /* UIApplication.swift */; };
12231229
CCD5E55C262E342600C45EA0 /* 189.sld in Copy pre-installed SRFI libraries */ = {isa = PBXBuildFile; fileRef = CCD5E558262E309500C45EA0 /* 189.sld */; };
12241230
CCD5E55D262E342600C45EA0 /* 214.sld in Copy pre-installed SRFI libraries */ = {isa = PBXBuildFile; fileRef = CCD5E559262E31AE00C45EA0 /* 214.sld */; };
12251231
CCD5E561262E343E00C45EA0 /* 189.sld in Copy pre-installed SRFI libraries */ = {isa = PBXBuildFile; fileRef = CCD5E558262E309500C45EA0 /* 189.sld */; };
@@ -3615,6 +3621,9 @@
36153621
CCD5B5EB2C16E430002BF2F0 /* JSON.scm */ = {isa = PBXFileReference; lastKnownFileType = text; path = JSON.scm; sourceTree = "<group>"; };
36163622
CCD5B6072C276696002BF2F0 /* ThreadFutureLibrary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadFutureLibrary.swift; sourceTree = "<group>"; };
36173623
CCD5B60A2C295951002BF2F0 /* HTTPLibrary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTTPLibrary.swift; sourceTree = "<group>"; };
3624+
CCD5B6152C3BC480002BF2F0 /* HTTPAOuthLibrary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTTPAOuthLibrary.swift; sourceTree = "<group>"; };
3625+
CCD5B61D2C3BCA1D002BF2F0 /* LispKitReplOAuthConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LispKitReplOAuthConfig.swift; sourceTree = "<group>"; };
3626+
CCD5B6212C3BCE08002BF2F0 /* UIApplication.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIApplication.swift; sourceTree = "<group>"; };
36183627
CCD5E558262E309500C45EA0 /* 189.sld */ = {isa = PBXFileReference; lastKnownFileType = text; path = 189.sld; sourceTree = "<group>"; };
36193628
CCD5E559262E31AE00C45EA0 /* 214.sld */ = {isa = PBXFileReference; lastKnownFileType = text; path = 214.sld; sourceTree = "<group>"; };
36203629
CCD5E55A262E32EE00C45EA0 /* SRFI-214.scm */ = {isa = PBXFileReference; lastKnownFileType = text; path = "SRFI-214.scm"; sourceTree = "<group>"; };
@@ -3716,6 +3725,7 @@
37163725
isa = PBXFrameworksBuildPhase;
37173726
buildActionMask = 2147483647;
37183727
files = (
3728+
CCD5B61A2C3BC57A002BF2F0 /* OAuth2 in Frameworks */,
37193729
CC7D4B6D2A0D877C0066BA94 /* CLFormat in Frameworks */,
37203730
CCA6C3D42361149D007D2AF0 /* MarkdownKit in Frameworks */,
37213731
CC1D53392BF16F9F00EE1A24 /* DynamicJSON in Frameworks */,
@@ -3739,6 +3749,7 @@
37393749
isa = PBXFrameworksBuildPhase;
37403750
buildActionMask = 2147483647;
37413751
files = (
3752+
CCD5B61C2C3BC773002BF2F0 /* OAuth2 in Frameworks */,
37423753
CC7D4B7C2A2559BC0066BA94 /* CLFormat in Frameworks */,
37433754
CCC48D0525E5BFAE00D082AD /* MarkdownKit in Frameworks */,
37443755
CC1D533B2BF16FB900EE1A24 /* DynamicJSON in Frameworks */,
@@ -4684,6 +4695,7 @@
46844695
CC2DA7462773195600DE69CF /* ThreadLibrary.swift */,
46854696
CCD5B6072C276696002BF2F0 /* ThreadFutureLibrary.swift */,
46864697
CCD5B60A2C295951002BF2F0 /* HTTPLibrary.swift */,
4698+
CCD5B6152C3BC480002BF2F0 /* HTTPAOuthLibrary.swift */,
46874699
CC1D533C2BF1709E00EE1A24 /* JSONLibrary.swift */,
46884700
CCD5B5202C0D231E002BF2F0 /* JSONSchemaLibrary.swift */,
46894701
CC38528A23126F7A001D5E56 /* InternalLibrary.swift */,
@@ -4821,6 +4833,8 @@
48214833
CCD5E5DD2634B7C700C45EA0 /* Interpreter.swift */,
48224834
CCD5E5EB2634B8F100C45EA0 /* ConsoleOutput.swift */,
48234835
CCD5E5F02634B98B00C45EA0 /* PortableURL.swift */,
4836+
CCD5B61D2C3BCA1D002BF2F0 /* LispKitReplOAuthConfig.swift */,
4837+
CCD5B6212C3BCE08002BF2F0 /* UIApplication.swift */,
48244838
CCD5E5BC2634B62200C45EA0 /* Assets.xcassets */,
48254839
CCD5E5C12634B62200C45EA0 /* Info.plist */,
48264840
CCD5E5BE2634B62200C45EA0 /* Preview Content */,
@@ -5069,6 +5083,7 @@
50695083
CC7D4B6C2A0D877C0066BA94 /* CLFormat */,
50705084
CC2FB07D2AA3D83E00A20C71 /* SWCompression */,
50715085
CC1D53382BF16F9F00EE1A24 /* DynamicJSON */,
5086+
CCD5B6192C3BC57A002BF2F0 /* OAuth2 */,
50725087
);
50735088
productName = LispKit;
50745089
productReference = CCAD52BA1C48403800DBD8EE /* LispKit.framework */;
@@ -5146,6 +5161,7 @@
51465161
CC7D4B7B2A2559BC0066BA94 /* CLFormat */,
51475162
CC61CB372ACA116500C5A032 /* SWCompression */,
51485163
CC1D533A2BF16FB900EE1A24 /* DynamicJSON */,
5164+
CCD5B61B2C3BC773002BF2F0 /* OAuth2 */,
51495165
);
51505166
productName = "LispKit iOS";
51515167
productReference = CCC48C5625E5B8DC00D082AD /* LispKit.framework */;
@@ -5223,6 +5239,7 @@
52235239
CC7D4B6B2A0D877C0066BA94 /* XCRemoteSwiftPackageReference "swift-clformat" */,
52245240
CC2FB07C2AA3D83E00A20C71 /* XCRemoteSwiftPackageReference "SWCompression" */,
52255241
CC1D53372BF16F7E00EE1A24 /* XCRemoteSwiftPackageReference "swift-dynamicjson" */,
5242+
CCD5B6182C3BC57A002BF2F0 /* XCRemoteSwiftPackageReference "OAuth2" */,
52265243
);
52275244
productRefGroup = CCAD52BB1C48403800DBD8EE /* Products */;
52285245
projectDirPath = "";
@@ -5436,6 +5453,7 @@
54365453
CC2DA74A27747A8B00DE69CF /* EvalThread.swift in Sources */,
54375454
CC3B641A23822BCE00807476 /* NativeObject.swift in Sources */,
54385455
CC2DA74D2775131A00DE69CF /* ThreadManager.swift in Sources */,
5456+
CCD5B6162C3BC480002BF2F0 /* HTTPAOuthLibrary.swift in Sources */,
54395457
CC1D53322BE7AB4000EE1A24 /* CustomExpr.swift in Sources */,
54405458
CC0BA16C1DFC843C0063B9DE /* SystemLibrary.swift in Sources */,
54415459
CC372CCC27D013BF0091C474 /* EnumLibrary.swift in Sources */,
@@ -5538,6 +5556,7 @@
55385556
CC7D4B7F2A2A49B50066BA94 /* Formatter.swift in Sources */,
55395557
CCC48C9425E5B95B00D082AD /* Type.swift in Sources */,
55405558
CCC48CAA25E5B97100D082AD /* FeatureRequirement.swift in Sources */,
5559+
CCD5B6172C3BC480002BF2F0 /* HTTPAOuthLibrary.swift in Sources */,
55415560
CCB5DF5D29A16D62005E6453 /* Data.swift in Sources */,
55425561
CC2DA7582781037B00DE69CF /* EvalCondition.swift in Sources */,
55435562
CCC48C6725E5B94300D082AD /* ScanBuffer.swift in Sources */,
@@ -5617,11 +5636,13 @@
56175636
isa = PBXSourcesBuildPhase;
56185637
buildActionMask = 2147483647;
56195638
files = (
5639+
CCD5B6242C409E64002BF2F0 /* UIApplication.swift in Sources */,
56205640
CCD5E5F12634B98B00C45EA0 /* PortableURL.swift in Sources */,
56215641
CCD5E5DE2634B7C700C45EA0 /* Interpreter.swift in Sources */,
56225642
CCD5E5BB2634B62200C45EA0 /* ContentView.swift in Sources */,
56235643
CCD5E5EC2634B8F100C45EA0 /* ConsoleOutput.swift in Sources */,
56245644
CCD5E5F62634C7B600C45EA0 /* ConsoleView.swift in Sources */,
5645+
CCD5B6202C3BCAB0002BF2F0 /* LispKitReplOAuthConfig.swift in Sources */,
56255646
CCD5E5B92634B62200C45EA0 /* LispKitReplApp.swift in Sources */,
56265647
);
56275648
runOnlyForDeploymentPostprocessing = 0;
@@ -6325,6 +6346,14 @@
63256346
minimumVersion = 1.1.8;
63266347
};
63276348
};
6349+
CCD5B6182C3BC57A002BF2F0 /* XCRemoteSwiftPackageReference "OAuth2" */ = {
6350+
isa = XCRemoteSwiftPackageReference;
6351+
repositoryURL = "https://github.com/p2/OAuth2";
6352+
requirement = {
6353+
kind = upToNextMajorVersion;
6354+
minimumVersion = 5.3.5;
6355+
};
6356+
};
63286357
CCFB412525B2523C005B2429 /* XCRemoteSwiftPackageReference "ZIPFoundation" */ = {
63296358
isa = XCRemoteSwiftPackageReference;
63306359
repositoryURL = "https://github.com/weichsel/ZIPFoundation";
@@ -6416,6 +6445,16 @@
64166445
package = CCFB412525B2523C005B2429 /* XCRemoteSwiftPackageReference "ZIPFoundation" */;
64176446
productName = ZIPFoundation;
64186447
};
6448+
CCD5B6192C3BC57A002BF2F0 /* OAuth2 */ = {
6449+
isa = XCSwiftPackageProductDependency;
6450+
package = CCD5B6182C3BC57A002BF2F0 /* XCRemoteSwiftPackageReference "OAuth2" */;
6451+
productName = OAuth2;
6452+
};
6453+
CCD5B61B2C3BC773002BF2F0 /* OAuth2 */ = {
6454+
isa = XCSwiftPackageProductDependency;
6455+
package = CCD5B6182C3BC57A002BF2F0 /* XCRemoteSwiftPackageReference "OAuth2" */;
6456+
productName = OAuth2;
6457+
};
64196458
CCFB412625B2523C005B2429 /* ZIPFoundation */ = {
64206459
isa = XCSwiftPackageProductDependency;
64216460
package = CCFB412525B2523C005B2429 /* XCRemoteSwiftPackageReference "ZIPFoundation" */;

‎LispKit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Package.resolved‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Package.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ let package = Package(
5757
.package(url: "https://github.com/objecthub/swift-dynamicjson.git", branch: "main"),
5858
.package(url: "https://github.com/weichsel/ZIPFoundation.git", from: "0.9.19"),
5959
.package(url: "https://github.com/tsolomko/SWCompression.git", from: "4.8.6"),
60+
.package(url: "https://github.com/p2/OAuth2.git", from: "5.3.5"),
6061
.package(url: "https://github.com/apple/swift-atomics.git", from: "1.2.0")
6162
],
6263
targets: [
@@ -69,6 +70,7 @@ let package = Package(
6970
.product(name: "DynamicJSON", package: "swift-dynamicjson"),
7071
.product(name: "ZIPFoundation", package: "ZIPFoundation"),
7172
.product(name: "SWCompression", package: "SWCompression"),
73+
.product(name: "OAuth2", package: "OAuth2"),
7274
.product(name: "Atomics", package: "swift-atomics")
7375
],
7476
exclude: [

0 commit comments

Comments
 (0)