Skip to content

Commit 317de46

Browse files
author
Zachary 'Clack' Cole
authored
Merge branch 'main' into add-swift-atomics
2 parents a228675 + 67eb391 commit 317de46

File tree

1 file changed

+132
-13
lines changed

1 file changed

+132
-13
lines changed

projects.json

Lines changed: 132 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2263,35 +2263,40 @@
22632263
"repository": "Git",
22642264
"url": "https://github.com/igor-makarov/RxReactiveObjC.git",
22652265
"path": "RxReactiveObjC",
2266-
"branch": "comitted-pods-for-swift-compat",
2266+
"branch": "main",
22672267
"maintainer": "[email protected]",
22682268
"compatibility": [
2269+
{
2270+
"version": "4.2",
2271+
"commit": "ec478bb68edbb8f10a7982bcffe9f1779de4e58b"
2272+
},
22692273
{
22702274
"version": "5.0",
2271-
"commit": "580693f3e60dc0c6219cd82cbae651f518940a7f"
2275+
"commit": "ec478bb68edbb8f10a7982bcffe9f1779de4e58b"
22722276
},
22732277
{
22742278
"version": "5.1",
2275-
"commit": "580693f3e60dc0c6219cd82cbae651f518940a7f"
2279+
"commit": "ec478bb68edbb8f10a7982bcffe9f1779de4e58b"
2280+
},
2281+
{
2282+
"version": "5.2",
2283+
"commit": "ec478bb68edbb8f10a7982bcffe9f1779de4e58b"
2284+
},
2285+
{
2286+
"version": "5.3",
2287+
"commit": "ec478bb68edbb8f10a7982bcffe9f1779de4e58b"
22762288
}
22772289
],
22782290
"platforms": [
22792291
"Darwin"
22802292
],
22812293
"actions": [
22822294
{
2283-
"action": "BuildXcodeWorkspaceScheme",
2284-
"workspace": "RxReactiveObjC.xcworkspace",
2285-
"scheme": "RxReactiveObjCSwiftCompat",
2286-
"destination": "generic/platform=iOS",
2287-
"configuration": "Release"
2295+
"action": "BuildSwiftPackage",
2296+
"configuration": "release"
22882297
},
22892298
{
2290-
"action": "TestXcodeWorkspaceScheme",
2291-
"workspace": "RxReactiveObjC.xcworkspace",
2292-
"scheme": "RxReactiveObjCSwiftCompat",
2293-
"destination": "platform=iOS Simulator,name=iPhone 7",
2294-
"configuration": "Debug"
2299+
"action": "TestSwiftPackage"
22952300
}
22962301
]
22972302
},
@@ -2621,6 +2626,32 @@
26212626
}
26222627
]
26232628
},
2629+
{
2630+
"repository": "Git",
2631+
"url": "https://github.com/apple/swift-algorithms",
2632+
"path": "swift-algorithms",
2633+
"branch": "main",
2634+
"maintainer": "[email protected]",
2635+
"compatibility": [
2636+
{
2637+
"version": "5.2",
2638+
"commit": "3864606e00177c3438db075df56659cdfbc01ca8"
2639+
}
2640+
],
2641+
"platforms": [
2642+
"Darwin"
2643+
],
2644+
"actions": [
2645+
{
2646+
"action": "BuildSwiftPackage",
2647+
"configuration": "release",
2648+
"tags": "swiftpm"
2649+
},
2650+
{
2651+
"action": "TestSwiftPackage"
2652+
}
2653+
]
2654+
},
26242655
{
26252656
"repository": "Git",
26262657
"url": "https://github.com/apple/swift-atomics",
@@ -2905,6 +2936,37 @@
29052936
}
29062937
]
29072938
},
2939+
{
2940+
"repository": "Git",
2941+
"url": "https://github.com/apple/swift-log",
2942+
"path": "swift-log",
2943+
"branch": "main",
2944+
"maintainer": "[email protected]",
2945+
"compatibility": [
2946+
{
2947+
"version": "5.0",
2948+
"commit": "16cfcc60e49d940c93367e5fe0e0533bd27e9733"
2949+
},
2950+
{
2951+
"version": "5.2",
2952+
"commit": "16cfcc60e49d940c93367e5fe0e0533bd27e9733"
2953+
}
2954+
],
2955+
"platforms": [
2956+
"Darwin",
2957+
"Linux"
2958+
],
2959+
"actions": [
2960+
{
2961+
"action": "BuildSwiftPackage",
2962+
"configuration": "release",
2963+
"tags": "sourcekit-disabled swiftpm"
2964+
},
2965+
{
2966+
"action": "TestSwiftPackage"
2967+
}
2968+
]
2969+
},
29082970
{
29092971
"repository": "Git",
29102972
"url": "https://github.com/apple/swift-nio-http2",
@@ -2932,6 +2994,37 @@
29322994
}
29332995
]
29342996
},
2997+
{
2998+
"repository": "Git",
2999+
"url": "https://github.com/apple/swift-metrics",
3000+
"path": "swift-metrics",
3001+
"branch": "main",
3002+
"maintainer": "[email protected]",
3003+
"compatibility": [
3004+
{
3005+
"version": "5.0",
3006+
"commit": "68e6cb29387754df21d96cb35d09b6ad0f59300f"
3007+
},
3008+
{
3009+
"version": "5.2",
3010+
"commit": "68e6cb29387754df21d96cb35d09b6ad0f59300f"
3011+
}
3012+
],
3013+
"platforms": [
3014+
"Darwin",
3015+
"Linux"
3016+
],
3017+
"actions": [
3018+
{
3019+
"action": "BuildSwiftPackage",
3020+
"configuration": "release",
3021+
"tags": "sourcekit-disabled swiftpm"
3022+
},
3023+
{
3024+
"action": "TestSwiftPackage"
3025+
}
3026+
]
3027+
},
29353028
{
29363029
"repository": "Git",
29373030
"url": "https://github.com/apple/swift-nio-extras",
@@ -2990,6 +3083,32 @@
29903083
}
29913084
]
29923085
},
3086+
{
3087+
"repository": "Git",
3088+
"url": "https://github.com/apple/swift-system",
3089+
"path": "swift-system",
3090+
"branch": "main",
3091+
"maintainer": "[email protected]",
3092+
"compatibility": [
3093+
{
3094+
"version": "5.2",
3095+
"commit": "0627d28e6ae514940c6ee061acfd36a3c231b87f"
3096+
}
3097+
],
3098+
"platforms": [
3099+
"Darwin"
3100+
],
3101+
"actions": [
3102+
{
3103+
"action": "BuildSwiftPackage",
3104+
"configuration": "release",
3105+
"tags": "swiftpm"
3106+
},
3107+
{
3108+
"action": "TestSwiftPackage"
3109+
}
3110+
]
3111+
},
29933112
{
29943113
"repository": "Git",
29953114
"url": "https://github.com/SwiftyJSON/SwiftyJSON.git",

0 commit comments

Comments
 (0)