Merge branch 'develop' into makeinstances-ufoprocessor-update

.github/workflows/asan.yml

@@ -24,7 +24,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: "3.11"
 
     - name: Install multilib packages
       run: sudo apt-get install gcc-multilib g++-multilib

.github/workflows/build_wheels.yml

@@ -38,29 +38,32 @@ jobs:
 
     - name: Build wheel (only macosx_universal2)
       if: matrix.os == 'macos-latest'
-      uses: pypa/cibuildwheel@v2.16.1
+      uses: pypa/cibuildwheel@v2.21.1
       with:
         output-dir: dist
       env:
         CIBW_BUILD: "cp39-*"
         CIBW_ARCHS_MACOS: universal2
-        CIBW_ENVIRONMENT_MACOS: "CFLAGS='-arch arm64 -arch x86_64 -I/usr/include/libxml2' CXXFLAGS='-arch arm64 -arch x86_64' LDFLAGS='-arch arm64 -arch x86_64'"
+        CIBW_ENVIRONMENT_MACOS: "CFLAGS='-arch arm64 -arch x86_64 -I/usr/include/libxml2' CXXFLAGS='-arch arm64 -arch x86_64' LDFLAGS='-arch arm64 -arch x86_64'  MACOSX_DEPLOYMENT_TARGET='10.13'"
 
     - name: Build wheel (except macosx_universal2)
-      uses: pypa/cibuildwheel@v2.16.1
+      uses: pypa/cibuildwheel@v2.21.1
       with:
         output-dir: dist
       env:
         CIBW_BUILD: "cp39-*"
         CIBW_ARCHS_MACOS: x86_64
         CIBW_ARCHS_WINDOWS: AMD64
         CIBW_ARCHS_LINUX: x86_64
-        CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
+        CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
         CIBW_SKIP: "*musllinux*"
         # CIBW_BEFORE_ALL_LINUX: "yum install -y libuuid-devel && yum install -y libxml2-devel"
         # CIBW_ENVIRONMENT_LINUX: "CFLAGS='-I/usr/include/libxml2'"
-        CIBW_BEFORE_ALL_LINUX: "yum install -y libuuid-devel"
-        CIBW_ENVIRONMENT: "FORCE_BUILD_LIBXML2=ON"
+        # CIBW_BEFORE_ALL_LINUX: "yum install -y libuuid-devel"
+        # CIBW_BEFORE_ALL_LINUX: "dnf -y install uuid-devel"
+        CIBW_ENVIRONMENT_MACOS: "CFLAGS='-I/usr/include/libxml2' MACOSX_DEPLOYMENT_TARGET='10.13'"
+        CIBW_ENVIRONMENT_LINUX: "FORCE_BUILD_LIBXML2=ON"
+        CIBW_ENVIRONMENT_WINDOWS: "FORCE_BUILD_LIBXML2=ON"
 
     - name: Build sdist (Ubuntu only)
       if: matrix.os == 'ubuntu-latest'

.github/workflows/run_cvg.yml

@@ -34,10 +34,10 @@ jobs:
       with:
         fetch-depth: 0  # unshallow fetch for setuptools-scm
 
-    - name: Set up Python 3.8
+    - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: "3.8"
+        python-version: "3.11"
 
     - name: Build AFDKO wheel
       env:

.github/workflows/testpythonpackage.yml

@@ -28,20 +28,20 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
         exclude:
-          - os: macos-latest
-            python-version: "3.8"
           - os: macos-latest
             python-version: "3.9"
           - os: macos-latest
             python-version: "3.10"
-          - os: windows-latest
-            python-version: "3.8"
+          - os: macos-latest
+            python-version: "3.11"
           - os: windows-latest
             python-version: "3.9"
           - os: windows-latest
             python-version: "3.10"
+          - os: windows-latest
+            python-version: "3.11"
 
     steps:
 

CMakeLists.txt

@@ -39,7 +39,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 add_definitions(-DANTLR4CPP_STATIC)
 set(ANTLR4_WITH_STATIC_CRT OFF)
 # 4.9.3 is the latest ANTLR4 version
-set(ANTLR4_TAG tags/4.9.3)
+set(ANTLR4_TAG tags/4.13.2)
 include(ExternalAntlr4Cpp)
 
 

NEWS.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+4.0.2 (released 2024-11-05)
+---------------------------
+- [otfautohint] Fix otfautohint bugs ([#1759](https://github.com/adobe-type-tools/afdko/pull/1759), [#1751](https://github.com/adobe-type-tools/afdko/pull/1751), [#1749](https://github.com/adobe-type-tools/afdko/pull/1749), [#1758](https://github.com/adobe-type-tools/afdko/pull/1758))
+- [ANTLR] Upgrade ANTLR to v4.13.2
+- [makeinstancesufo] keep all public lib keys in instances (thank you, @arialcrime!) ([#1747](https://github.com/adobe-type-tools/afdko/pull/1747))
+- [ci] Enable Python v3.12, drop v3.8 ([#1756](https://github.com/adobe-type-tools/afdko/pull/1756))
+
 4.0.1 (released 2024-01-16)
 ---------------------------
 - [tx] Fix build failures discovered by an upcoming gcc-14 release (thanks @trofi!)([#1730](https://github.com/adobe-type-tools/afdko/pull/1730))

README.md

@@ -38,8 +38,8 @@ More information can be found in [docs/otfautohint_Notes.md](docs/otfautohint_No
 Installation
 ------------
 
-The AFDKO requires [Python](http://www.python.org/download) 3.8
-or later. It should work with any Python > 3.8, but occasionally
+The AFDKO requires [Python](http://www.python.org/download) 3.9
+or later. It should work with any Python > 3.9, but occasionally
 tool-chain components and dependencies don't keep pace with major
 Python releases, so there might be some lag time while they catch up.
 
@@ -132,7 +132,7 @@ On macOS, install these with:
 
 On Linux (Ubuntu 17.10 LTS or later), install these with:
 
-    apt-get -y install python3.8
+    apt-get -y install python3.9
     apt-get -y install python-pip
     apt-get -y install python-dev
     apt-get -y install uuid-dev

c/makeotf/lib/hotconv/BuildGrammar.py

@@ -7,7 +7,7 @@
 import os
 
 antlr_program = "antlr4"
-antlr_version = "4.9.3"
+antlr_version = "4.13.2"
 
 antlr_args = ['-no-listener', '-Dlanguage=Cpp']
 

c/makeotf/lib/hotconv/CMakeLists.txt

@@ -68,6 +68,7 @@ add_library(hotconv STATIC
 )
 
 set_property(TARGET hotconv PROPERTY C_STANDARD 99)
+set_property(TARGET hotconv PROPERTY CXX_STANDARD 17)
 target_include_directories(hotconv PRIVATE AFTER $<$<COMPILE_LANGUAGE:CXX>:${ANTLR4_INCLUDE_DIRS}>)
 target_link_libraries(hotconv PUBLIC antlr4_static)