Migrate to newest version

.github/workflows/checks.yml

@@ -2,21 +2,21 @@ name: Checks
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
     branches: '*'
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_13.0.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode-16.0.0.app/Contents/Developer
 
 jobs:
   unit-tests:
-    runs-on: macos-11
+    runs-on: self-hosted
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Pull cache
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: .build
         key: ${{ runner.os }}spm${{ hashFiles('**/Package.resolved') }}
@@ -25,83 +25,115 @@ jobs:
     - name: Test
       run: swift test -v
 
-  test-iOS:
-    runs-on: macos-11
-    needs: build
+  test-iOS-ResourceApp:
+    runs-on: self-hosted
+    needs: build-rswift
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Download build
-      uses: actions/download-artifact@v1
+      uses: actions/download-artifact@v4.1.7
       with:
         name: rswift-dev
+        path: rswift-dev
     - name: Put build into place
       run: |
-        mkdir -p build/Debug
-        mv rswift-dev/rswift build/Debug/rswift
-        chmod +x build/Debug/rswift
+        mkdir -p .build/release
+        mv rswift-dev/rswift .build/release/rswift
+        chmod +x .build/release/rswift
     - name: Pull cache
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       id: podcache-ios
       with:
-        path: Examples/Pods
+        path: Examples/ResourceApp/Pods
         key: ${{ runner.os }}pods${{ hashFiles('**/Podfile.lock') }}
         restore-keys: |
           ${{ runner.os }}pods
     - name: Install pods
       if: steps.podcache-ios.outputs.cache-hit != 'true'
-      run: pod install --project-directory=Examples
+      run: pod install --project-directory=Examples/ResourceApp
     - name: Test
-      run: fastlane scan --workspace "Examples/RswiftExamples.xcworkspace" --scheme "ResourceApp"
+      #run: fastlane scan --workspace "Examples/ResourceApp/ResourceApp.xcworkspace" --scheme "ResourceApp"
+      run: xcodebuild -workspace Examples/ResourceApp/ResourceApp.xcworkspace -scheme ResourceApp -destination 'platform=iOS Simulator,name=iPhone 16,OS=18.0' test
 
-  test-tvOS:
-    runs-on: macos-11
-    needs: build
+  test-iOS-StaticFrameworks:
+    runs-on: self-hosted
+    needs: build-rswift
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Download build
-      uses: actions/download-artifact@v1
+      uses: actions/download-artifact@v4.1.7
       with:
         name: rswift-dev
+        path: rswift-dev
     - name: Put build into place
       run: |
-        mkdir -p build/Debug
-        mv rswift-dev/rswift build/Debug/rswift
-        chmod +x build/Debug/rswift
-    - name: Pull cache
-      uses: actions/cache@v2
-      id: podcache-tvos
+        mkdir -p .build/release
+        mv rswift-dev/rswift .build/release/rswift
+        chmod +x .build/release/rswift
+    - name: Test
+      #run: fastlane scan --project "Examples/RswiftAppWithStaticFrameworks/RswiftAppWithStaticFrameworks.xcodeproj" --scheme "App"
+      run: xcodebuild -project Examples/RswiftAppWithStaticFrameworks/RswiftAppWithStaticFrameworks.xcodeproj -scheme App -destination 'platform=iOS Simulator,name=iPhone 16,OS=18.0' test
+
+  test-iOS-LocalizedStringApp:
+    runs-on: self-hosted
+    needs: build-rswift
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Download build
+      uses: actions/download-artifact@v4.1.7
       with:
-        path: Examples/Pods
-        key: ${{ runner.os }}pods${{ hashFiles('**/Podfile.lock') }}
-        restore-keys: |
-          ${{ runner.os }}pods
-    - name: Install pods
-      if: steps.podcache-tvos.outputs.cache-hit != 'true'
-      run: pod install --project-directory=Examples
+        name: rswift-dev
+        path: rswift-dev
+    - name: Put build into place
+      run: |
+        mkdir -p .build/release
+        mv rswift-dev/rswift .build/release/rswift
+        chmod +x .build/release/rswift
+    - name: Test
+      run: xcodebuild -project Examples/LocalizedStringApp/LocalizedStringApp.xcodeproj -scheme LocalizedStringApp -destination 'platform=iOS Simulator,name=iPhone 16,OS=18.0' test
+
+  test-tvOS:
+    runs-on: self-hosted
+    needs: build-rswift
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Download build
+      uses: actions/download-artifact@v4.1.7
+      with:
+        name: rswift-dev
+        path: rswift-dev
+    - name: Put build into place
+      run: |
+        mkdir -p .build/release
+        mv rswift-dev/rswift .build/release/rswift
+        chmod +x .build/release/rswift
     - name: Test
-      run: fastlane scan --workspace "Examples/RswiftExamples.xcworkspace" --scheme "ResourceApp-tvOS"
+      #run: fastlane scan --project "Examples/RtvApp/RtvApp.xcodeproj" --scheme "ResourceApp-tvOS"
+      run: xcodebuild -project Examples/RtvApp/RtvApp.xcodeproj -scheme ResourceApp-tvOS -destination 'platform=tvOS Simulator,name=Apple TV,OS=18.0' test
 
-  build:
-    runs-on: macos-11
+  build-rswift:
+    runs-on: self-hosted
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Pull cache
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: .build
         key: ${{ runner.os }}spm${{ hashFiles('**/Package.resolved') }}
         restore-keys: |
           ${{ runner.os }}spm
     - name: Set version
       run: |
-        sed -i "" "s/\(static let version = \"\)Unknown\(\"\)/\1Development build: ${GITHUB_SHA}\2/" Sources/rswift/Rswift.swift
+        sed -i "" "s/\(static let version = \"\)Unknown\(\"\)/\1Development build: ${GITHUB_SHA}\2/" Sources/rswift/Config.swift
     - name: Build
       run: swift build -v -c release
     - name: Store artifact
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: rswift-dev
         path: .build/release/rswift

.github/workflows/release.yml

@@ -5,17 +5,17 @@ on:
     types: created
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_12.5.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode-16.0.0.app/Contents/Developer
 
 jobs:
   release-build:
-    runs-on: macos-11
+    runs-on: self-hosted
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Set version
       run: |
-        sed -i "" "s/\(static let version = \"\).*\(\"\)/\1${TAG}\2/" Sources/rswift/Rswift.swift
+        sed -i "" "s/\(static let version = \"\).*\(\"\)/\1${TAG}\2/" Sources/rswift/Config.swift
       env:
         TAG: ${{ github.event.release.tag_name }}
     - name: Tarball source
@@ -33,34 +33,41 @@ jobs:
         asset_name: rswift-${{ github.event.release.tag_name }}-source.tar.gz
         asset_content_type: application/tar+gzip
 
-    - name: Build fat binary
+    - name: Build universal binary
       run: |
         swift build -c release --arch x86_64 --arch arm64
 
+    - name: Delete temp keychain from previous run
+      run: |
+        /usr/bin/security delete-keychain signing_temp.keychain || true
     - name: Import Signing Certificates
-      uses: apple-actions/import-codesign-certs@v1
+      uses: apple-actions/import-codesign-certs@v3
       with:
-        p12-file-base64: ${{ secrets.APPLE_CERTS }}
-        p12-password: ${{ secrets.APPLE_CERTS_PASSWORD }}
+        p12-file-base64: ${{ secrets.APPLE_CERTIFICATES }}
+        p12-password: ${{ secrets.APPLE_CERTIFICATES_PASSWORD }}
     - name: Code Sign
       run: |
-        codesign --force --options runtime --sign 'Developer ID Application: Mathijs Kadijk (5Z49PA849J)' .build/apple/Products/Release/rswift
+        codesign --force --options runtime --sign "$IDENTITY" .build/apple/Products/Release/rswift
+      env:
+        IDENTITY: 'Developer ID Application: Nonstrict B.V. (WT5N9FK54M)'
     - name: Store build artifact
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: rswift-${{ github.event.release.tag_name }}
         path: .build/apple/Products/Release/rswift
 
     - name: Archive ZIP
-      run: zip --junk-paths ${{ runner.temp }}/rswift-${{ github.event.release.tag_name }}.zip .build/apple/Products/Release/rswift License
+      run: zip --junk-paths $FILENAME .build/apple/Products/Release/rswift License && zip --recurse-paths $FILENAME Sources/RswiftResources
+      env:
+        FILENAME: ${{ runner.temp }}/rswift-${{ github.event.release.tag_name }}.zip
     - name: Notarize ZIP
       run: |
-        sh notarize.sh
+        xcrun notarytool submit $FILENAME --apple-id $APPLE_ID --password $APP_PASSWORD --team-id $TEAM_ID --wait
       env:
-        BUNDLE_ID: nl.mathijskadijk.rswift
-        DEV_ACCOUNT: ${{ secrets.APPLE_ID_EMAIL }}
-        PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-        DEV_TEAM: 5Z49PA849J
+        BUNDLE_ID: com.nonstrict.rswift
+        APPLE_ID: ${{ secrets.APPLE_IDENTIFIER }}
+        APP_PASSWORD: ${{ secrets.APPLE_IDENTIFIER_PASSWORD }}
+        TEAM_ID: WT5N9FK54M
         FILENAME: ${{ runner.temp }}/rswift-${{ github.event.release.tag_name }}.zip
     - name: Attach ZIP to release
       uses: actions/upload-release-asset@v1
@@ -71,34 +78,80 @@ jobs:
         asset_path: ${{ runner.temp }}/rswift-${{ github.event.release.tag_name }}.zip
         asset_name: rswift-${{ github.event.release.tag_name }}.zip
         asset_content_type: application/zip
+
+    - name: Make artifact bundle
+      run: |
+        set -ex
+
+        mkdir -p $ARTIFACT_BUNDLE_DIR/rswift/bin
+        cp .build/apple/Products/Release/rswift $ARTIFACT_BUNDLE_DIR/rswift/bin
+        cp License $ARTIFACT_BUNDLE_DIR/rswift
+
+        cat <<EOF > $ARTIFACT_BUNDLE_DIR/info.json
+        {
+            "schemaVersion": "1.0",
+            "artifacts": {
+                "rswift": {
+                    "type": "executable",
+                    "version": "$VERSION",
+                    "variants": [
+                        {
+                            "path": "rswift/bin/rswift",
+                            "supportedTriples": ["x86_64-apple-macosx", "arm64-apple-macosx"]
+                        },
+                    ]
+                }
+            }
+        }
+        EOF
 
-    - name: Publish to Cocoapods
+        pushd $ARTIFACT_BUNDLE_DIR
+        zip -r $FILENAME .
+        popd
+      env:
+        VERSION: ${{ github.event.release.tag_name }}
+        ARTIFACT_BUNDLE_DIR: ${{ runner.temp }}/rswift.artifactbundle
+        FILENAME: ${{ runner.temp }}/rswift-${{ github.event.release.tag_name }}.artifactbundle.zip
+    - name: Notarize artifact bundle
       run: |
-        export POD_VERSION=$(echo $TAG_NAME | cut -c2-)
-        pod trunk push
+        xcrun notarytool submit $FILENAME --apple-id $APPLE_ID --password $APP_PASSWORD --team-id $TEAM_ID --wait
       env:
-        TAG_NAME: ${{ github.event.release.tag_name }}
-        COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
+        BUNDLE_ID: com.nonstrict.rswift
+        APPLE_ID: ${{ secrets.APPLE_IDENTIFIER }}
+        APP_PASSWORD: ${{ secrets.APPLE_IDENTIFIER_PASSWORD }}
+        TEAM_ID: WT5N9FK54M
+        FILENAME: ${{ runner.temp }}/rswift-${{ github.event.release.tag_name }}.artifactbundle.zip
+    - name: Attach artifact bundle to release
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: ${{ runner.temp }}/rswift-${{ github.event.release.tag_name }}.artifactbundle.zip
+        asset_name: rswift-${{ github.event.release.tag_name }}.artifactbundle.zip
+        asset_content_type: application/zip
 
     - name: Archive PKG
       run: |
         mkdir -p $PKG_ROOT/$BINARY_ROOT
         cp .build/apple/Products/Release/rswift $PKG_ROOT/$BINARY_ROOT
-        pkgbuild --root $PKG_ROOT --identifier "nl.mathijskadijk.rswift" --version $TAG_NAME --install-location "/" --sign "Developer ID Installer: Mathijs Kadijk (5Z49PA849J)" $FILENAME
+        pkgbuild --root $PKG_ROOT --identifier $BUNDLE_ID --version $TAG_NAME --install-location "/" --sign "$IDENTITY" $FILENAME
       env:
         TAG_NAME: ${{ github.event.release.tag_name }}
         FILENAME: ${{ runner.temp }}/rswift-${{ github.event.release.tag_name }}.pkg
-        BUNDLE_ID: nl.mathijskadijk.rswift
+        BUNDLE_ID: com.nonstrict.rswift
+        IDENTITY: 'Developer ID Installer: Nonstrict B.V. (WT5N9FK54M)'
         PKG_ROOT: ${{ runner.temp }}/pkgroot
         BINARY_ROOT: /usr/local/bin
     - name: Notarize PKG
       run: |
-        sh notarize.sh && xcrun stapler staple "$FILENAME"
+        xcrun notarytool submit $FILENAME --apple-id $APPLE_ID --password $APP_PASSWORD --team-id $TEAM_ID --wait
+        xcrun stapler staple $FILENAME
       env:
-        BUNDLE_ID: nl.mathijskadijk.rswift
-        DEV_ACCOUNT: ${{ secrets.APPLE_ID_EMAIL }}
-        PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-        DEV_TEAM: 5Z49PA849J
+        BUNDLE_ID: com.nonstrict.rswift
+        APPLE_ID: ${{ secrets.APPLE_IDENTIFIER }}
+        APP_PASSWORD: ${{ secrets.APPLE_IDENTIFIER_PASSWORD }}
+        TEAM_ID: WT5N9FK54M
         FILENAME: ${{ runner.temp }}/rswift-${{ github.event.release.tag_name }}.pkg
     - name: Attach PKG to release
       uses: actions/upload-release-asset@v1
@@ -110,5 +163,15 @@ jobs:
         asset_name: rswift-${{ github.event.release.tag_name }}.pkg
         asset_content_type: application/pkg
 
-    - name: Publish to Homebrew
-      run: brew bump-formula-pr --tag $TAG_NAME --revision $REVISION rswift || exit 0
+    - name: Delete temp keychain from this run
+      if: always()
+      run: |
+        /usr/bin/security delete-keychain signing_temp.keychain || true
+
+    - name: Publish to Cocoapods
+      run: |
+        export POD_VERSION=$TAG_NAME
+        pod trunk push --allow-warnings
+      env:
+        TAG_NAME: ${{ github.event.release.tag_name }}
+        COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}

Documentation/Contribute.md

@@ -8,8 +8,8 @@ Thank you for taking some of your precious time helping this project move forwar
 
 Most important is to read the docs and scan the issue tracker before so you're sure your question/idea/bugreport isn't already answered/in the make/being fixed:
 
-- [Read the Readme](https://github.com/mac-cain13/R.swift/blob/master/Readme.md)
-- [Read the other documentation](https://github.com/mac-cain13/R.swift/tree/master/Documentation)
+- [Read the Readme](/README.md)
+- [Read the other documentation](/Documentation)
 - [Check open pull requests](https://github.com/mac-cain13/R.swift/pulls)
 - [Search the issue tracker](https://github.com/mac-cain13/R.swift/issues)