Merge branch 'main' into 3.12

Author: freakboy3742

.github/workflows/ci.yaml

@@ -109,7 +109,7 @@ jobs:
     - uses: actions/[email protected]
 
     - name: Set up Python
-      uses: actions/setup-python@v5.1.1
+      uses: actions/setup-python@v5.2.0
       with:
         # Appending -dev ensures that we can always build the dev release.
         # It's a no-op for versions that have been published.
@@ -121,7 +121,7 @@ jobs:
         make ${{ matrix.target }} BUILD_NUMBER=${{ needs.config.outputs.BUILD_NUMBER }}
 
     - name: Upload build artefacts
-      uses: actions/upload-artifact@v4.3.5
+      uses: actions/upload-artifact@v4.4.0
       with:
         name: Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
         path: dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz
@@ -131,20 +131,15 @@ jobs:
       with:
         repository: beeware/Python-support-testbed
         path: Python-support-testbed
-        # TODO - remove the py3.13 reference option.
-        ref: py3.13-support
 
     - name: Install dependencies
       if: matrix.run-tests
       run: |
-        # TODO - Revert to the development version of Briefcase
         # Use the development version of Briefcase
-        # python -m pip install git+https://github.com/beeware/briefcase.git
-        python -m pip install git+https://github.com/freakboy3742/briefcase.git@version-bumps
+        python -m pip install git+https://github.com/beeware/briefcase.git
 
     - name: Run support testbed check
       if: matrix.run-tests
       timeout-minutes: 10
       working-directory: Python-support-testbed
-      # TODO - remove the template_branch option.
-      run: briefcase run ${{ matrix.target }} Xcode --test ${{ matrix.briefcase-run-args }} -C support_package=\'../dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz\' -C template_branch=\'framework-lib\'
+      run: briefcase run ${{ matrix.target }} Xcode --test ${{ matrix.briefcase-run-args }} -C support_package=\'../dist/Python-${{ needs.config.outputs.PYTHON_VER }}-${{ matrix.target }}-support.${{ needs.config.outputs.BUILD_NUMBER }}.tar.gz\'

.github/workflows/publish.yaml

@@ -11,7 +11,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up Python environment
-      uses: actions/setup-python@v5.1.1
+      uses: actions/setup-python@v5.2.0
       with:
         python-version: "3.X"
 

Makefile

@@ -29,8 +29,8 @@ PYTHON_VER=$(basename $(PYTHON_VERSION))
 BZIP2_VERSION=1.0.8-1
 LIBFFI_VERSION=3.4.6-1
 MPDECIMAL_VERSION=4.0.0-1
-OPENSSL_VERSION=3.0.14-1
-XZ_VERSION=5.4.7-1
+OPENSSL_VERSION=3.0.15-1
+XZ_VERSION=5.6.2-1
 
 # Supported OS
 OS_LIST=macOS iOS tvOS watchOS
@@ -152,7 +152,7 @@ downloads/bzip2-$(BZIP2_VERSION)-$(target).tar.gz:
 $$(BZIP2_LIB-$(target)): downloads/bzip2-$(BZIP2_VERSION)-$(target).tar.gz
 	@echo ">>> Install BZip2 for $(target)"
 	mkdir -p $$(BZIP2_INSTALL-$(target))
-	cd $$(BZIP2_INSTALL-$(target)) && tar zxvf $(PROJECT_DIR)/downloads/bzip2-$(BZIP2_VERSION)-$(target).tar.gz
+	cd $$(BZIP2_INSTALL-$(target)) && tar zxvf $(PROJECT_DIR)/downloads/bzip2-$(BZIP2_VERSION)-$(target).tar.gz --exclude="*.dylib"
 	# Ensure the target is marked as clean.
 	touch $$(BZIP2_LIB-$(target))
 
@@ -172,7 +172,7 @@ downloads/xz-$(XZ_VERSION)-$(target).tar.gz:
 $$(XZ_LIB-$(target)): downloads/xz-$(XZ_VERSION)-$(target).tar.gz
 	@echo ">>> Install XZ for $(target)"
 	mkdir -p $$(XZ_INSTALL-$(target))
-	cd $$(XZ_INSTALL-$(target)) && tar zxvf $(PROJECT_DIR)/downloads/xz-$(XZ_VERSION)-$(target).tar.gz
+	cd $$(XZ_INSTALL-$(target)) && tar zxvf $(PROJECT_DIR)/downloads/xz-$(XZ_VERSION)-$(target).tar.gz --exclude="*.dylib"
 	# Ensure the target is marked as clean.
 	touch $$(XZ_LIB-$(target))
 
@@ -192,7 +192,7 @@ downloads/mpdecimal-$(MPDECIMAL_VERSION)-$(target).tar.gz:
 $$(MPDECIMAL_LIB-$(target)): downloads/mpdecimal-$(MPDECIMAL_VERSION)-$(target).tar.gz
 	@echo ">>> Install mpdecimal for $(target)"
 	mkdir -p $$(MPDECIMAL_INSTALL-$(target))
-	cd $$(MPDECIMAL_INSTALL-$(target)) && tar zxvf $(PROJECT_DIR)/downloads/mpdecimal-$(MPDECIMAL_VERSION)-$(target).tar.gz
+	cd $$(MPDECIMAL_INSTALL-$(target)) && tar zxvf $(PROJECT_DIR)/downloads/mpdecimal-$(MPDECIMAL_VERSION)-$(target).tar.gz --exclude="*.dylib"
 	# Ensure the target is marked as clean.
 	touch $$(MPDECIMAL_LIB-$(target))
 
@@ -212,7 +212,7 @@ downloads/openssl-$(OPENSSL_VERSION)-$(target).tar.gz:
 $$(OPENSSL_SSL_LIB-$(target)): downloads/openssl-$(OPENSSL_VERSION)-$(target).tar.gz
 	@echo ">>> Install OpenSSL for $(target)"
 	mkdir -p $$(OPENSSL_INSTALL-$(target))
-	cd $$(OPENSSL_INSTALL-$(target)) && tar zxvf $(PROJECT_DIR)/downloads/openssl-$(OPENSSL_VERSION)-$(target).tar.gz
+	cd $$(OPENSSL_INSTALL-$(target)) && tar zxvf $(PROJECT_DIR)/downloads/openssl-$(OPENSSL_VERSION)-$(target).tar.gz --exclude="*.dylib"
 	# Ensure the target is marked as clean.
 	touch $$(OPENSSL_SSL_LIB-$(target))
 
@@ -237,7 +237,7 @@ downloads/libffi-$(LIBFFI_VERSION)-$(target).tar.gz:
 $$(LIBFFI_LIB-$(target)): downloads/libffi-$(LIBFFI_VERSION)-$(target).tar.gz
 	@echo ">>> Install libFFI for $(target)"
 	mkdir -p $$(LIBFFI_INSTALL-$(target))
-	cd $$(LIBFFI_INSTALL-$(target)) && tar zxvf $(PROJECT_DIR)/downloads/libffi-$(LIBFFI_VERSION)-$(target).tar.gz
+	cd $$(LIBFFI_INSTALL-$(target)) && tar zxvf $(PROJECT_DIR)/downloads/libffi-$(LIBFFI_VERSION)-$(target).tar.gz --exclude="*.dylib"
 	# Ensure the target is marked as clean.
 	touch $$(LIBFFI_LIB-$(target))