From 6dfe0787df1c186ddaa9781c20232b7d40fe8a30 Mon Sep 17 00:00:00 2001
From: Mirko Galimberti <me@mirkogalimberti.com>
Date: Sun, 26 Nov 2023 16:07:35 +0100
Subject: [PATCH] Update sdl2 version and add Python 3.12 to supported matrix

---
 .github/workflows/windows_sdl2_wheels.yml | 16 ++++++++--------
 ci/windows_ci.ps1                         |  2 +-
 win/sdl2.py                               |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/windows_sdl2_wheels.yml b/.github/workflows/windows_sdl2_wheels.yml
index fb43ca2..9c27f93 100644
--- a/.github/workflows/windows_sdl2_wheels.yml
+++ b/.github/workflows/windows_sdl2_wheels.yml
@@ -26,14 +26,14 @@ jobs:
     env:
       PACKAGE_ARCH: ${{ matrix.arch }}
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.x
       - name: Cache deps
         id: cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: kivy_build_cache
           key: cache-packages-sdl2-${{ matrix.arch }}-${{ hashFiles('win/sdl2.py') }}
@@ -52,19 +52,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: [ '3.7', '3.8', '3.9', '3.10', '3.11' ]
+        python: [ '3.7', '3.8', '3.9', '3.10', '3.11' , '3.12' ]
         arch: ['x64', 'x86']
     env:
       PACKAGE_ARCH: ${{ matrix.arch }}
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python }}
         architecture: ${{ matrix.arch }}
     - name: Cache deps
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: kivy_build_cache
         key: cache-packages-sdl2-${{ matrix.arch }}-${{ hashFiles('win/sdl2.py') }}
@@ -77,7 +77,7 @@ jobs:
         . .\ci\windows_ci.ps1
         Create-Packages
     - name: Upload wheels as artifact
-      uses: actions/upload-artifact@master
+      uses: actions/upload-artifact@v3
       with:
         name: sdl2_wheels
         path: dist
diff --git a/ci/windows_ci.ps1 b/ci/windows_ci.ps1
index 66fba40..c87f7fa 100644
--- a/ci/windows_ci.ps1
+++ b/ci/windows_ci.ps1
@@ -30,7 +30,7 @@ function Download-Packages() {
 
 
 function Create-Packages() {
-    python -m pip install pip wheel<0.38.0 setuptools --upgrade
+    python -m pip install pip wheel setuptools --upgrade
     python -m "win.$env:PACKAGE_TARGET" build_path "$(pwd)\$env:KIVY_BUILD_DIR" arch $env:PACKAGE_ARCH package $env:PACKAGE_TARGET output "$(pwd)\dist" cache "$(pwd)\$env:KIVY_BUILD_CACHE"
     dir "$(pwd)\dist"
     rm "$(pwd)\dist\*tar.gz"
diff --git a/win/sdl2.py b/win/sdl2.py
index 14950cb..47d0169 100644
--- a/win/sdl2.py
+++ b/win/sdl2.py
@@ -1,9 +1,9 @@
 from os import walk
 from .common import *
 
-__version__ = '0.6.0'
+__version__ = '0.7.0'
 
-sdl2_ver = '2.26.4'
+sdl2_ver = '2.28.5'
 sdl2_mixer_ver = '2.6.3'
 sdl2_ttf_ver = '2.20.2'
 sdl2_image_ver = '2.6.3'