Fix macOS runner by manually specifying dylib locations (#185)

Author: lopcode

.github/workflows/checks.yml

@@ -18,12 +18,12 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: "corretto"
-          java-version: 25 # run a newer version on macOS to work around libzip linking issues
+          java-version: 23
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
         with:
-          gradle-version: 8.14
+          gradle-version: 9.1.0
 
       - name: Run checks
         run: ./gradlew build check shadowJar
@@ -34,21 +34,21 @@ jobs:
           ./run_samples.sh
 
   macos-sense-check:
-    runs-on: macos-14
+    runs-on: macos-26
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          distribution: "temurin"
+          distribution: "corretto"
           java-version: 23
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
         with:
-          gradle-version: 8.14
+          gradle-version: 9.1.0
 
       - name: Run checks
         run: ./gradlew build check shadowJar
@@ -67,13 +67,13 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          distribution: "temurin"
+          distribution: "corretto"
           java-version: 23
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
         with:
-          gradle-version: 8.14
+          gradle-version: 9.1.0
 
       - name: Run samples
         shell: pwsh
@@ -99,13 +99,13 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          distribution: "temurin"
+          distribution: "corretto"
           java-version: 23
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
         with:
-          gradle-version: 8.14
+          gradle-version: 9.1.0
 
       - name: Run checks
         run: ./run_single_docker_tests.sh ${{ matrix.variant }}

README.md

@@ -23,7 +23,7 @@ repositories {
 }
 
 dependencies {
-    implementation("app.photofox.vips-ffm:vips-ffm-core:1.9.2")
+    implementation("app.photofox.vips-ffm:vips-ffm-core:1.9.3")
 }
 ```
 
@@ -35,7 +35,7 @@ You must add `--enable-native-access=ALL-UNNAMED` to your JVM runtime arguments.
 about "Restricted methods". In the future, the JVM will throw an error if you don't explicitly include this flag.
 
 As the project uses the Java FFM API, and Markdown comments, your target must also be JDK 23+. Bindings are currently
-generated from libvips `8.17.0` (but should be safe to use with different minor or patch versions).
+generated from libvips `8.17.2` (but should be safe to use with different minor or patch versions).
 
 > [!NOTE]
 > This library **does not** include `libvips` in the download, you must add it to the system/container you're building

core/src/main/java/app/photofox/vipsffm/VImage.java

@@ -8452,8 +8452,8 @@ public static VImage sum(Arena arena, List<VImage> in, VipsOption... args) throw
   ///
   /// Rendering uses the librsvg library and should be fast.
   ///
-  /// Use `dpi` to set the rendering resolution. The default is 72. You can also
-  /// scale the rendering by `scale`.
+  /// Use `dpi` to set the rendering resolution. The default is 72. Additionally,
+  /// you can scale by setting `scale`. If you set both, they combine.
   ///
   /// This function only reads the image header and does not render any pixel
   /// data. Rendering occurs when pixels are accessed.
@@ -8882,7 +8882,7 @@ public static VImage thumbnailSource(Arena arena, VSource source, int width, Vip
   /// default, loaders are permissive, that is, [VipsFailOn#FAIL_ON_NONE].
   ///
   /// When using libtiff 4.7.0+, the TIFF loader will limit memory allocation
-  /// for tag processing to 20MB to prevent denial of service attacks.
+  /// for decoding each input file to 50MB to prevent denial of service attacks.
   /// Set `unlimited` to remove this limit.
   ///
   /// Any ICC profile is read and attached to the VIPS image as

core/src/main/java/app/photofox/vipsffm/jextract/VipsRaw.java

@@ -15177,25 +15177,25 @@ public static int VIPS_SBUF_BUFFER_SIZE() {
     }
     /**
      * {@snippet lang=c :
-     * #define VIPS_VERSION "8.17.1"
+     * #define VIPS_VERSION "8.17.2"
      * }
      */
     public static MemorySegment VIPS_VERSION() {
         class Holder {
             static final MemorySegment VIPS_VERSION
-                = VipsRaw.LIBRARY_ARENA.allocateFrom("8.17.1");
+                = VipsRaw.LIBRARY_ARENA.allocateFrom("8.17.2");
         }
         return Holder.VIPS_VERSION;
     }
     /**
      * {@snippet lang=c :
-     * #define VIPS_VERSION_STRING "8.17.1"
+     * #define VIPS_VERSION_STRING "8.17.2"
      * }
      */
     public static MemorySegment VIPS_VERSION_STRING() {
         class Holder {
             static final MemorySegment VIPS_VERSION_STRING
-                = VipsRaw.LIBRARY_ARENA.allocateFrom("8.17.1");
+                = VipsRaw.LIBRARY_ARENA.allocateFrom("8.17.2");
         }
         return Holder.VIPS_VERSION_STRING;
     }
@@ -15217,10 +15217,10 @@ public static int VIPS_MAJOR_VERSION() {
     public static int VIPS_MINOR_VERSION() {
         return VIPS_MINOR_VERSION;
     }
-    private static final int VIPS_MICRO_VERSION = (int)1L;
+    private static final int VIPS_MICRO_VERSION = (int)2L;
     /**
      * {@snippet lang=c :
-     * #define VIPS_MICRO_VERSION 1
+     * #define VIPS_MICRO_VERSION 2
      * }
      */
     public static int VIPS_MICRO_VERSION() {
@@ -15235,10 +15235,10 @@ public static int VIPS_MICRO_VERSION() {
     public static int VIPS_LIBRARY_CURRENT() {
         return VIPS_LIBRARY_CURRENT;
     }
-    private static final int VIPS_LIBRARY_REVISION = (int)1L;
+    private static final int VIPS_LIBRARY_REVISION = (int)2L;
     /**
      * {@snippet lang=c :
-     * #define VIPS_LIBRARY_REVISION 1
+     * #define VIPS_LIBRARY_REVISION 2
      * }
      */
     public static int VIPS_LIBRARY_REVISION() {

core/src/main/java/app/photofox/vipsffm/jextract/_GValue.java

@@ -123,7 +123,7 @@ public static class data {
             VipsRaw.C_FLOAT.withName("v_float"),
             VipsRaw.C_DOUBLE.withName("v_double"),
             VipsRaw.C_POINTER.withName("v_pointer")
-        ).withName("$anon$119:3");
+        ).withName("$anon$137:3");
 
         /**
          * The layout of this union

docs/app.photofox.vipsffm/app/photofox/vipsffm/VImage.html

@@ -11028,8 +11028,8 @@ <h3>svgload</h3>
                       throws <span class="exceptions"><a href="VipsError.html" title="class in app.photofox.vipsffm">VipsError</a></span></div>
 <div class="block"><p>Render a SVG file into a VIPS image.</p>
 <p>Rendering uses the librsvg library and should be fast.</p>
-<p>Use <code>dpi</code> to set the rendering resolution. The default is 72. You can also
-scale the rendering by <code>scale</code>.</p>
+<p>Use <code>dpi</code> to set the rendering resolution. The default is 72. Additionally,
+you can scale by setting <code>scale</code>. If you set both, they combine.</p>
 <p>This function only reads the image header and does not render any pixel
 data. Rendering occurs when pixels are accessed.</p>
 <p>SVGs larger than 10MB are normally blocked for security. Set <code>unlimited</code> to
@@ -11373,7 +11373,7 @@ <h3>tiffload</h3>
 <p>Use <code>fail_on</code> to set the type of error that will cause load to fail. By
 default, loaders are permissive, that is, <a href="enums/VipsFailOn.html#FAIL_ON_NONE"><code>VipsFailOn.FAIL_ON_NONE</code></a>.</p>
 <p>When using libtiff 4.7.0+, the TIFF loader will limit memory allocation
-for tag processing to 20MB to prevent denial of service attacks.
+for decoding each input file to 50MB to prevent denial of service attacks.
 Set <code>unlimited</code> to remove this limit.</p>
 <p>Any ICC profile is read and attached to the VIPS image as
 <code>META_ICC_NAME</code>. Any XMP metadata is read and attached to the image

docs/app.photofox.vipsffm/app/photofox/vipsffm/jextract/VipsRaw.html

@@ -11063,7 +11063,7 @@ <h2>Method Summary</h2>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
 <div class="block">
 <div class="snippet-container"><button class="copy snippet-copy" aria-label="Copy snippet" onclick="copySnippet(this)"><span data-copied="Copied!">Copy</span><img src="../../../../../resource-files/copy.svg" alt="Copy snippet"></button>
-<pre class="snippet" id="snippet-VIPS_LIBRARY_REVISION()1"><code class="language-c">#define VIPS_LIBRARY_REVISION 1
+<pre class="snippet" id="snippet-VIPS_LIBRARY_REVISION()1"><code class="language-c">#define VIPS_LIBRARY_REVISION 2
 </code></pre>
 </div>
 </div>
@@ -11463,7 +11463,7 @@ <h2>Method Summary</h2>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
 <div class="block">
 <div class="snippet-container"><button class="copy snippet-copy" aria-label="Copy snippet" onclick="copySnippet(this)"><span data-copied="Copied!">Copy</span><img src="../../../../../resource-files/copy.svg" alt="Copy snippet"></button>
-<pre class="snippet" id="snippet-VIPS_MICRO_VERSION()1"><code class="language-c">#define VIPS_MICRO_VERSION 1
+<pre class="snippet" id="snippet-VIPS_MICRO_VERSION()1"><code class="language-c">#define VIPS_MICRO_VERSION 2
 </code></pre>
 </div>
 </div>
@@ -14831,7 +14831,7 @@ <h2>Method Summary</h2>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
 <div class="block">
 <div class="snippet-container"><button class="copy snippet-copy" aria-label="Copy snippet" onclick="copySnippet(this)"><span data-copied="Copied!">Copy</span><img src="../../../../../resource-files/copy.svg" alt="Copy snippet"></button>
-<pre class="snippet" id="snippet-VIPS_VERSION()1"><code class="language-c">#define VIPS_VERSION "8.17.1"
+<pre class="snippet" id="snippet-VIPS_VERSION()1"><code class="language-c">#define VIPS_VERSION "8.17.2"
 </code></pre>
 </div>
 </div>
@@ -14851,7 +14851,7 @@ <h2>Method Summary</h2>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
 <div class="block">
 <div class="snippet-container"><button class="copy snippet-copy" aria-label="Copy snippet" onclick="copySnippet(this)"><span data-copied="Copied!">Copy</span><img src="../../../../../resource-files/copy.svg" alt="Copy snippet"></button>
-<pre class="snippet" id="snippet-VIPS_VERSION_STRING()1"><code class="language-c">#define VIPS_VERSION_STRING "8.17.1"
+<pre class="snippet" id="snippet-VIPS_VERSION_STRING()1"><code class="language-c">#define VIPS_VERSION_STRING "8.17.2"
 </code></pre>
 </div>
 </div>
@@ -32228,7 +32228,7 @@ <h3>VIPS_VERSION</h3>
 <div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/23/docs/api/java.base/java/lang/foreign/MemorySegment.html" title="class or interface in java.lang.foreign" class="external-link">MemorySegment</a></span>&nbsp;<span class="element-name">VIPS_VERSION</span>()</div>
 <div class="block">
 <div class="snippet-container"><button class="copy snippet-copy" aria-label="Copy snippet" onclick="copySnippet(this)"><span data-copied="Copied!">Copy</span><img src="../../../../../resource-files/copy.svg" alt="Copy snippet"></button>
-<pre class="snippet" id="snippet-VIPS_VERSION()2"><code class="language-c">#define VIPS_VERSION "8.17.1"
+<pre class="snippet" id="snippet-VIPS_VERSION()2"><code class="language-c">#define VIPS_VERSION "8.17.2"
 </code></pre>
 </div>
 </div>
@@ -32242,7 +32242,7 @@ <h3>VIPS_VERSION_STRING</h3>
 <div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/23/docs/api/java.base/java/lang/foreign/MemorySegment.html" title="class or interface in java.lang.foreign" class="external-link">MemorySegment</a></span>&nbsp;<span class="element-name">VIPS_VERSION_STRING</span>()</div>
 <div class="block">
 <div class="snippet-container"><button class="copy snippet-copy" aria-label="Copy snippet" onclick="copySnippet(this)"><span data-copied="Copied!">Copy</span><img src="../../../../../resource-files/copy.svg" alt="Copy snippet"></button>
-<pre class="snippet" id="snippet-VIPS_VERSION_STRING()2"><code class="language-c">#define VIPS_VERSION_STRING "8.17.1"
+<pre class="snippet" id="snippet-VIPS_VERSION_STRING()2"><code class="language-c">#define VIPS_VERSION_STRING "8.17.2"
 </code></pre>
 </div>
 </div>
@@ -32284,7 +32284,7 @@ <h3>VIPS_MICRO_VERSION</h3>
 <div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">VIPS_MICRO_VERSION</span>()</div>
 <div class="block">
 <div class="snippet-container"><button class="copy snippet-copy" aria-label="Copy snippet" onclick="copySnippet(this)"><span data-copied="Copied!">Copy</span><img src="../../../../../resource-files/copy.svg" alt="Copy snippet"></button>
-<pre class="snippet" id="snippet-VIPS_MICRO_VERSION()2"><code class="language-c">#define VIPS_MICRO_VERSION 1
+<pre class="snippet" id="snippet-VIPS_MICRO_VERSION()2"><code class="language-c">#define VIPS_MICRO_VERSION 2
 </code></pre>
 </div>
 </div>
@@ -32312,7 +32312,7 @@ <h3>VIPS_LIBRARY_REVISION</h3>
 <div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name">VIPS_LIBRARY_REVISION</span>()</div>
 <div class="block">
 <div class="snippet-container"><button class="copy snippet-copy" aria-label="Copy snippet" onclick="copySnippet(this)"><span data-copied="Copied!">Copy</span><img src="../../../../../resource-files/copy.svg" alt="Copy snippet"></button>
-<pre class="snippet" id="snippet-VIPS_LIBRARY_REVISION()2"><code class="language-c">#define VIPS_LIBRARY_REVISION 1
+<pre class="snippet" id="snippet-VIPS_LIBRARY_REVISION()2"><code class="language-c">#define VIPS_LIBRARY_REVISION 2
 </code></pre>
 </div>
 </div>

docs/index-all.html

@@ -18831,7 +18831,7 @@ <h2 class="title" id="I:V">V</h2>
 <dd>
 <div class="block">
 <div class="snippet-container"><button class="copy snippet-copy" aria-label="Copy snippet" onclick="copySnippet(this)"><span data-copied="Copied!">Copy</span><img src="resource-files/copy.svg" alt="Copy snippet"></button>
-<pre class="snippet" id="snippet-VIPS_LIBRARY_REVISION()3"><code class="language-c">#define VIPS_LIBRARY_REVISION 1
+<pre class="snippet" id="snippet-VIPS_LIBRARY_REVISION()3"><code class="language-c">#define VIPS_LIBRARY_REVISION 2
 </code></pre>
 </div>
 </div>
@@ -19191,7 +19191,7 @@ <h2 class="title" id="I:V">V</h2>
 <dd>
 <div class="block">
 <div class="snippet-container"><button class="copy snippet-copy" aria-label="Copy snippet" onclick="copySnippet(this)"><span data-copied="Copied!">Copy</span><img src="resource-files/copy.svg" alt="Copy snippet"></button>
-<pre class="snippet" id="snippet-VIPS_MICRO_VERSION()3"><code class="language-c">#define VIPS_MICRO_VERSION 1
+<pre class="snippet" id="snippet-VIPS_MICRO_VERSION()3"><code class="language-c">#define VIPS_MICRO_VERSION 2
 </code></pre>
 </div>
 </div>
@@ -22194,7 +22194,7 @@ <h2 class="title" id="I:V">V</h2>
 <dd>
 <div class="block">
 <div class="snippet-container"><button class="copy snippet-copy" aria-label="Copy snippet" onclick="copySnippet(this)"><span data-copied="Copied!">Copy</span><img src="resource-files/copy.svg" alt="Copy snippet"></button>
-<pre class="snippet" id="snippet-VIPS_VERSION()3"><code class="language-c">#define VIPS_VERSION "8.17.1"
+<pre class="snippet" id="snippet-VIPS_VERSION()3"><code class="language-c">#define VIPS_VERSION "8.17.2"
 </code></pre>
 </div>
 </div>
@@ -22212,7 +22212,7 @@ <h2 class="title" id="I:V">V</h2>
 <dd>
 <div class="block">
 <div class="snippet-container"><button class="copy snippet-copy" aria-label="Copy snippet" onclick="copySnippet(this)"><span data-copied="Copied!">Copy</span><img src="resource-files/copy.svg" alt="Copy snippet"></button>
-<pre class="snippet" id="snippet-VIPS_VERSION_STRING()3"><code class="language-c">#define VIPS_VERSION_STRING "8.17.1"
+<pre class="snippet" id="snippet-VIPS_VERSION_STRING()3"><code class="language-c">#define VIPS_VERSION_STRING "8.17.2"
 </code></pre>
 </div>
 </div>

docs/index.html

@@ -70,7 +70,7 @@ <h2 id="usage-heading">Usage</h2>
 }
 
 dependencies {
-    implementation(&quot;app.photofox.vips-ffm:vips-ffm-core:1.9.2&quot;)
+    implementation(&quot;app.photofox.vips-ffm:vips-ffm-core:1.9.3&quot;)
 }
 </code></pre>
 <p>Figure out what you're trying to do by looking at the <a href="https://www.libvips.org/API/current/">libvips documentation</a>
@@ -79,7 +79,7 @@ <h2 id="usage-heading">Usage</h2>
 <p>You must add <code>--enable-native-access=ALL-UNNAMED</code> to your JVM runtime arguments. If you don't, you'll get a warning
 about &quot;Restricted methods&quot;. In the future, the JVM will throw an error if you don't explicitly include this flag.</p>
 <p>As the project uses the Java FFM API, and Markdown comments, your target must also be JDK 23+. Bindings are currently
-generated from libvips <code>8.17.0</code> (but should be safe to use with different minor or patch versions).</p>
+generated from libvips <code>8.17.2</code> (but should be safe to use with different minor or patch versions).</p>
 <blockquote>
 <p>[!NOTE]
 This library <strong>does not</strong> include <code>libvips</code> in the download, you must add it to the system/container you're building

generate_ffm_bindings.sh

@@ -83,8 +83,13 @@ set -x
 @includes_filtered.txt \
 "jextract_entry/entrypoint.h"
 
+./gradlew clean generator:run --args="bootstrap"
 ./gradlew clean generator:build generator:shadowJar
 
-DYLD_LIBRARY_PATH=$(readlink -f ./libvips)/release/lib:/opt/homebrew/lib java --enable-native-access=ALL_UNNAMED -jar generator/build/libs/generator-all.jar
+export JAVA_PATH_OPTS="-Dvipsffm.libpath.vips.override=/opt/homebrew/lib/libvips.dylib \
+  -Dvipsffm.libpath.glib.override=/opt/homebrew/lib/libglib-2.0.dylib \
+  -Dvipsffm.libpath.gobject.override=/opt/homebrew/lib/libgobject-2.0.dylib"
+
+java $JAVA_PATH_OPTS --enable-native-access=ALL_UNNAMED -jar generator/build/libs/generator-all.jar
 
 ./build_docs.sh