Merge branch 'main' into roger/fix-require-relative

# Conflicts:
#	.github/workflows/kotlin-tests.yml
#	.github/workflows/swift-tests.yml
#	.ruby-version
#	Gemfile.lock

.github/workflows/kotlin-tests.yml

@@ -1,5 +1,9 @@
 name: Kotlin Tests
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
 jobs:
   test:
     runs-on: ubuntu-latest # Assuming Kotlin projects can be built on Linux
@@ -21,7 +25,6 @@ jobs:
           ${{ runner.os }}-gradle-
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.3'
         bundler-cache: true # Runs 'bundle install' and caches installed gems automatically
     - name: Generate Kotlin Code & Run Tests
       run: bundle exec rake test_kotlin

.github/workflows/push.yml → .github/workflows/run-tests.yml

@@ -3,10 +3,9 @@ on:
   push:
     branches:
       - main
+  pull_request:
 jobs:
   test:
-    env:
-      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
     strategy:
       fail-fast: false
       matrix:
@@ -20,5 +19,5 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - name: Run tests
+    - name: Run tests and linter
       run: bundle exec rake

.github/workflows/swift-tests.yml

@@ -1,5 +1,9 @@
 name: Swift Tests
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
 jobs:
   test:
     runs-on: macos-latest
@@ -8,7 +12,6 @@ jobs:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.3'
         bundler-cache: true # Runs 'bundle install' and caches installed gems automatically
     - name: Generate Swift Code & Run Tests
       run: bundle exec rake test_swift

.ruby-version

@@ -1 +1 @@
-3.3.1
+3.3.3

Gemfile.lock

@@ -80,10 +80,10 @@ GEM
     yaml (0.3.0)
 
 PLATFORMS
+  arm64-darwin-23
   ruby
   x86_64-darwin-19
   x86_64-linux
-  arm64-darwin-23
 
 DEPENDENCIES
   arkana!