Skip to content

Commit

Permalink
Update LLVM and Swift files for Swift 6 (#64)
Browse files Browse the repository at this point in the history
Pulls in
#62 and
#63

---------

Signed-off-by: JP Simard <jp@jpsim.com>
Signed-off-by: Marcos Griselli <marcosg@lyft.com>
Signed-off-by: Keith Smiley <keithbsmiley@gmail.com>
Co-authored-by: JP Simard <jp@jpsim.com>
Co-authored-by: Marcos Griselli <marcosg@lyft.com>
  • Loading branch information
3 people authored Jan 14, 2025
1 parent 53a322b commit 230c7d8
Show file tree
Hide file tree
Showing 8 changed files with 286 additions and 69 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ on:
- main
jobs:
test-bazel:
runs-on: macos-13
runs-on: macos-14
steps:
- uses: actions/checkout@v3
- run: sudo xcode-select -s /Applications/Xcode_15.0.app
- run: sudo xcode-select -s /Applications/Xcode_16.2.app
- run: bazelisk build //...
- run: bazelisk test //...
test-swiftpm:
runs-on: macos-13
runs-on: macos-14
steps:
- uses: actions/checkout@v3
- run: sudo xcode-select -s /Applications/Xcode_15.0.app
- run: sudo xcode-select -s /Applications/Xcode_16.2.app
- run: swift build
- run: swift test
6 changes: 5 additions & 1 deletion Sources/CIndexStore/include/indexstore.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* INDEXSTORE_VERSION_MAJOR is intended for "major" source/ABI breaking changes.
*/
#define INDEXSTORE_VERSION_MAJOR 0
#define INDEXSTORE_VERSION_MINOR 13
#define INDEXSTORE_VERSION_MINOR 15 /* added Swift init accessor sub-symbol */

#define INDEXSTORE_VERSION_ENCODE(major, minor) ( \
((major) * 10000) \
Expand Down Expand Up @@ -128,6 +128,8 @@ typedef struct {
INDEXSTORE_PUBLIC unsigned
indexstore_format_version(void);

INDEXSTORE_PUBLIC unsigned indexstore_version(void);

typedef void *indexstore_t;
typedef void *indexstore_creation_options_t;

Expand Down Expand Up @@ -280,6 +282,7 @@ typedef enum {
INDEXSTORE_SYMBOL_KIND_CONVERSIONFUNCTION = 24,
INDEXSTORE_SYMBOL_KIND_PARAMETER = 25,
INDEXSTORE_SYMBOL_KIND_USING = 26,
INDEXSTORE_SYMBOL_KIND_CONCEPT = 27,

INDEXSTORE_SYMBOL_KIND_COMMENTTAG = 1000,
} indexstore_symbol_kind_t;
Expand Down Expand Up @@ -310,6 +313,7 @@ typedef enum {
INDEXSTORE_SYMBOL_SUBKIND_SWIFTGENERICTYPEPARAM = 1013,
INDEXSTORE_SYMBOL_SUBKIND_SWIFTACCESSORREAD = 1014,
INDEXSTORE_SYMBOL_SUBKIND_SWIFTACCESSORMODIFY = 1015,
INDEXSTORE_SYMBOL_SUBKIND_SWIFTACCESSORINIT = 1016,
} indexstore_symbol_subkind_t;

INDEXSTORE_OPTIONS(uint64_t, indexstore_symbol_property_t) {
Expand Down
Loading

0 comments on commit 230c7d8

Please sign in to comment.