Skip to content

Commit

Permalink
Update to Xcode 15.3, prep for Swift concurrency checking (#46)
Browse files Browse the repository at this point in the history
* Start modernization and concurrency work
* Concurrency warnings in testsuite
* Update CI and misc Xcode settings
* Add locked dictionaries
* Update concurrency discussion
  • Loading branch information
johnfairh authored Apr 16, 2024
1 parent a20885b commit 5e06842
Show file tree
Hide file tree
Showing 29 changed files with 234 additions and 1,238 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ jobs:
strategy:
fail-fast: false
matrix:
xcode: ['15.2']
env:
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
xcode: ['15.3']
steps:
- uses: actions/checkout@v2
- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: ${{ matrix.xcode }}
- uses: actions/checkout@v4
- name: Ruby
run: |
gem install rouge
Expand Down Expand Up @@ -65,7 +66,7 @@ jobs:
- short: '3.3'
extra_args: '-Xcc -fdeclspec'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.rby.short }}
Expand Down
14 changes: 14 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
.PHONY: all build test

swift_flags := -Xcc -fdeclspec

pwd := $(shell pwd)

all: build

build:
PKG_CONFIG_PATH=${pwd}/Packages/CRuby swift build ${swift_flags}

test:
PKG_CONFIG_PATH=${pwd}/Packages/CRuby swift test ${swift_flags}

9 changes: 7 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.4.0
// swift-tools-version:5.9

// Package.swift
// RubyGateway
Expand All @@ -20,7 +20,12 @@ let package = Package(
targets: [
.target(
name: "RubyGateway",
dependencies: ["RubyGatewayHelpers", "CRuby"]),
dependencies: ["RubyGatewayHelpers", "CRuby"],
swiftSettings: [
.enableExperimentalFeature("AccessLevelOnImport"),
.enableExperimentalFeature("StrictConcurrency")
]
),
.target(
name: "RubyGatewayHelpers",
dependencies: ["CRuby"]),
Expand Down
25 changes: 0 additions & 25 deletions RubyGateway-Ruby3.xcodeproj/RubyGatewayTests_Info.plist

This file was deleted.

25 changes: 0 additions & 25 deletions RubyGateway-Ruby3.xcodeproj/RubyGateway_info.plist

This file was deleted.

939 changes: 0 additions & 939 deletions RubyGateway-Ruby3.xcodeproj/project.pbxproj

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 5e06842

Please sign in to comment.