Skip to content

Commit 1d5eee4

Browse files
author
Zachary 'Clack' Cole
authored
Merge branch 'main' into add-swift-numerics
2 parents ccfde81 + 5cb8d1d commit 1d5eee4

File tree

2 files changed

+203
-17
lines changed

2 files changed

+203
-17
lines changed

‎common.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,21 @@
4646
'yams': '3.0.1',
4747
'swift-tools-support-core': 'main',
4848
},
49+
'release/5.4': {
50+
'llvm-project': 'swift/release/5.4',
51+
'swift': 'release/5.4',
52+
'cmark': 'release/5.4',
53+
'ninja': 'release',
54+
'llbuild': 'release/5.4',
55+
'swiftpm': 'main',
56+
'swift-corelibs-libdispatch': 'release/5.4',
57+
'swift-corelibs-foundation': 'release/5.4',
58+
'swift-corelibs-xctest': 'release/5.4',
59+
'swift-argument-parser': '0.3.0',
60+
'swift-driver': 'main',
61+
'yams': '3.0.1',
62+
'swift-tools-support-core': 'main',
63+
},
4964
'release/5.3': {
5065
'llvm-project': 'swift/release/5.3',
5166
'swift': 'release/5.3',

‎projects.json

Lines changed: 188 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2055,7 +2055,7 @@
20552055
{
20562056
"issue": "rdar://problem/68590422",
20572057
"compatibility": ["4.0", "5.1"],
2058-
"branch": "main",
2058+
"branch": ["main", "release/5.4"],
20592059
"configuration": "debug"
20602060
}
20612061
]
@@ -2070,7 +2070,7 @@
20702070
{
20712071
"issue": "rdar://problem/68590422",
20722072
"compatibility": ["4.0", "5.1"],
2073-
"branch": "main",
2073+
"branch": ["main", "release/5.4"],
20742074
"configuration": "debug"
20752075
}
20762076
]
@@ -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
},
@@ -2350,7 +2355,7 @@
23502355
"xfail": {
23512356
"issue": "https://bugs.swift.org/browse/SR-11141",
23522357
"compatibility": "5.1",
2353-
"branch": ["main", "release/5.3"]
2358+
"branch": ["main", "release/5.3", "release/5.4"]
23542359
}
23552360
},
23562361
{
@@ -2455,7 +2460,7 @@
24552460
{
24562461
"issue": "https://bugs.swift.org/browse/SR-13190",
24572462
"compatibility": ["4.0", "5.1"],
2458-
"branch": "main"
2463+
"branch": ["main", "release/5.4"]
24592464
}
24602465
]
24612466
},
@@ -2621,6 +2626,58 @@
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+
},
2655+
{
2656+
"repository": "Git",
2657+
"url": "https://github.com/apple/swift-argument-parser",
2658+
"path": "swift-argument-parser",
2659+
"branch": "main",
2660+
"maintainer": "[email protected]",
2661+
"compatibility": [
2662+
{
2663+
"version": "5.2",
2664+
"commit": "41f5fe52a34b2c7b9938996387fabfaca21918bd"
2665+
}
2666+
],
2667+
"platforms": [
2668+
"Darwin"
2669+
],
2670+
"actions": [
2671+
{
2672+
"action": "BuildSwiftPackage",
2673+
"configuration": "release",
2674+
"tags": "swiftpm"
2675+
},
2676+
{
2677+
"action": "TestSwiftPackage"
2678+
}
2679+
]
2680+
},
26242681
{
26252682
"repository": "Git",
26262683
"url": "https://github.com/malcommac/SwiftDate",
@@ -2672,6 +2729,32 @@
26722729
}
26732730
]
26742731
},
2732+
{
2733+
"repository": "Git",
2734+
"url": "https://github.com/nicklockwood/SwiftFormat.git",
2735+
"path": "SwiftFormat",
2736+
"branch": "master",
2737+
"compatibility": [
2738+
{
2739+
"version": "4.2",
2740+
"commit": "d42194f66bfb0e721037a2fac28cd2402bb68f68"
2741+
}
2742+
],
2743+
"maintainer": "[email protected]",
2744+
"platforms": [
2745+
"Darwin",
2746+
"Linux"
2747+
],
2748+
"actions": [
2749+
{
2750+
"action": "BuildSwiftPackage",
2751+
"configuration": "release"
2752+
},
2753+
{
2754+
"action": "TestSwiftPackage"
2755+
}
2756+
]
2757+
},
26752758
{
26762759
"repository": "Git",
26772760
"url": "https://github.com/davecom/SwiftGraph.git",
@@ -2878,6 +2961,37 @@
28782961
}
28792962
]
28802963
},
2964+
{
2965+
"repository": "Git",
2966+
"url": "https://github.com/apple/swift-log",
2967+
"path": "swift-log",
2968+
"branch": "main",
2969+
"maintainer": "[email protected]",
2970+
"compatibility": [
2971+
{
2972+
"version": "5.0",
2973+
"commit": "16cfcc60e49d940c93367e5fe0e0533bd27e9733"
2974+
},
2975+
{
2976+
"version": "5.2",
2977+
"commit": "16cfcc60e49d940c93367e5fe0e0533bd27e9733"
2978+
}
2979+
],
2980+
"platforms": [
2981+
"Darwin",
2982+
"Linux"
2983+
],
2984+
"actions": [
2985+
{
2986+
"action": "BuildSwiftPackage",
2987+
"configuration": "release",
2988+
"tags": "sourcekit-disabled swiftpm"
2989+
},
2990+
{
2991+
"action": "TestSwiftPackage"
2992+
}
2993+
]
2994+
},
28812995
{
28822996
"repository": "Git",
28832997
"url": "https://github.com/apple/swift-nio-http2",
@@ -2905,6 +3019,37 @@
29053019
}
29063020
]
29073021
},
3022+
{
3023+
"repository": "Git",
3024+
"url": "https://github.com/apple/swift-metrics",
3025+
"path": "swift-metrics",
3026+
"branch": "main",
3027+
"maintainer": "[email protected]",
3028+
"compatibility": [
3029+
{
3030+
"version": "5.0",
3031+
"commit": "68e6cb29387754df21d96cb35d09b6ad0f59300f"
3032+
},
3033+
{
3034+
"version": "5.2",
3035+
"commit": "68e6cb29387754df21d96cb35d09b6ad0f59300f"
3036+
}
3037+
],
3038+
"platforms": [
3039+
"Darwin",
3040+
"Linux"
3041+
],
3042+
"actions": [
3043+
{
3044+
"action": "BuildSwiftPackage",
3045+
"configuration": "release",
3046+
"tags": "sourcekit-disabled swiftpm"
3047+
},
3048+
{
3049+
"action": "TestSwiftPackage"
3050+
}
3051+
]
3052+
},
29083053
{
29093054
"repository": "Git",
29103055
"url": "https://github.com/apple/swift-nio-extras",
@@ -2989,6 +3134,32 @@
29893134
}
29903135
]
29913136
},
3137+
{
3138+
"repository": "Git",
3139+
"url": "https://github.com/apple/swift-system",
3140+
"path": "swift-system",
3141+
"branch": "main",
3142+
"maintainer": "[email protected]",
3143+
"compatibility": [
3144+
{
3145+
"version": "5.2",
3146+
"commit": "0627d28e6ae514940c6ee061acfd36a3c231b87f"
3147+
}
3148+
],
3149+
"platforms": [
3150+
"Darwin"
3151+
],
3152+
"actions": [
3153+
{
3154+
"action": "BuildSwiftPackage",
3155+
"configuration": "release",
3156+
"tags": "swiftpm"
3157+
},
3158+
{
3159+
"action": "TestSwiftPackage"
3160+
}
3161+
]
3162+
},
29923163
{
29933164
"repository": "Git",
29943165
"url": "https://github.com/SwiftyJSON/SwiftyJSON.git",

0 commit comments

Comments
 (0)