Merge remote-tracking branch 'upstream/master' into sync-upstream

.gitattributes

@@ -0,0 +1,4 @@
+* linguist-vendored
+*.ex linguist-vendored=false
+*.exs linguist-vendored=false
+

.github/FUNDING.yml

@@ -1,12 +1,13 @@
 # These are supported funding model platforms
 
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: aesmail
 patreon: # Replace with a single Patreon username
-open_collective: kaffy
+open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
 custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Kaffy CI (Elixir 1.10)
+name: Kaffy CI (Elixir)
 
 on:
   push:
@@ -9,26 +9,32 @@ on:
 jobs:
   test:
     name: Test ${{matrix.otp}} / Elixir  ${{matrix.elixir}}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
-        otp: ['21', '22', '23', '24']
-        elixir: ['1.10.3', '1.11.4', '1.12']
+        otp: ['22', '23', '24', '25']
+        elixir: ['1.12.3', '1.13.4', '1.14.5', '1.15.5']
         # Exclude invalid combinations of Elixir and OTP
         exclude:
-          - otp: '21'
-            elixir: '1.12'
-          - otp: '24'
-            elixir: '1.10.3'
-        # Include the release candidate for the next Elixir, but don't 
+          - otp: '22'
+            elixir: '1.14.5'
+          - otp: '22'
+            elixir: '1.15.5'
+          - otp: '23'
+            elixir: '1.15.5'
+          - otp: '25'
+            elixir: '1.12.3'
+          - otp: '25'
+            elixir: '1.13.4'
+        # Include the release candidate for the next Elixir, but don't
         # fail CI.
-        include:
-          - elixir: '1.13'
-            otp: '24'
-            experimental: true
+        # include:
+        #   - elixir: '1.13'
+        #     otp: '24'
+        #     experimental: true
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Elixir
       uses: erlef/setup-beam@v1
       with:

.gitignore

@@ -22,9 +22,12 @@ erl_crash.dump
 # Ignore package tarball (built via "mix hex.build").
 kaffy-*.tar
 
-# Ignore local node_modules
+# Temporary files, for example, from tests.
+/tmp/
+
+# Ignore local node_modules.
 /node_modules/
 
-.elixir_ls
+# Misc.
 .DS_Store
 .tool-versions