Merge branch 'main'

Author: mac-cain13

.github/workflows/release.yml

@@ -33,7 +33,7 @@ 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
 
@@ -43,11 +43,13 @@ jobs:
     - name: Import Signing Certificates
       uses: apple-actions/import-codesign-certs@v1
       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@v3
       with:
@@ -60,12 +62,12 @@ jobs:
         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
@@ -89,21 +91,23 @@ jobs:
       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
@@ -117,3 +121,4 @@ jobs:
 
     - name: Publish to Homebrew
       run: brew bump-formula-pr --tag $TAG_NAME --revision $REVISION rswift || exit 0
+

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)
 

Documentation/Ignoring.md

@@ -40,7 +40,7 @@ It is also possible to call the binary with the `--rswiftignore` flag and give a
 
 
 ## Only run specific generators (exclude R.something)
-By default, R.swift runs all generators, for images, nibs, strings and many more. In some situations you may not want to generate R structs for all these types. You can choose to run only certain generators by adding a flag like this: `--generators image,string` to the call to the [Build Phase](https://github.com/mac-cain13/R.swift/blob/master/Documentation/Images/BuildPhaseExample.png)
+By default, R.swift runs all generators, for images, nibs, strings and many more. In some situations you may not want to generate R structs for all these types. You can choose to run only certain generators by adding a flag like this: `--generators image,string` to the call to the [Build Phase](/Documentation/Images/BuildPhaseExample.png)
 
 These are the available generators:
 

README.md

@@ -1,4 +1,4 @@
-# R.swift [![Version](https://img.shields.io/cocoapods/v/R.swift.svg?style=flat)](https://cocoapods.org/pods/R.swift) [![License](https://img.shields.io/cocoapods/l/R.swift.svg?style=flat)](blob/master/License) ![Platform](https://img.shields.io/cocoapods/p/R.swift.svg?style=flat)
+# R.swift [![Version](https://img.shields.io/cocoapods/v/R.swift.svg?style=flat)](https://cocoapods.org/pods/R.swift) [![License](https://img.shields.io/cocoapods/l/R.swift.svg?style=flat)](License) ![Platform](https://img.shields.io/cocoapods/p/R.swift.svg?style=flat)
 
 _Get strong typed, autocompleted resources like images, fonts and segues in Swift projects_
 
@@ -81,7 +81,7 @@ Runtime validation with [`R.validate()`](Documentation/Examples.md#runtime-valid
 - [Can I use R.swift in a library?](Documentation/QandA.md#can-i-use-rswift-in-a-library)
 - [How does R.swift work?](Documentation/QandA.md#how-does-rswift-work)
 - [How to upgrade to a new major version?](Documentation/Migration.md)
-- [How can I only run specific generators?](https://github.com/mac-cain13/R.swift/blob/master/Documentation/Ignoring.md#only-run-specific-generators-exclude-rsomething)
+- [How can I only run specific generators?](Documentation/Ignoring.md#only-run-specific-generators-exclude-rsomething)
 
 ## Installation