emf2svg 1.2.0-x64-mingw32 → 1.3.1-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cbe3b2fb66e6d2ebb284d0c94d8298a25fe3a15ca1e66b7bdeea28e4b6d5f3d
-  data.tar.gz: be56fe68cffcefde90853f67aaa496f1023bfd3c3f3248bef5bad7fc102e726c
+  metadata.gz: ea870f86411d9da5d33dee42f01599fbf4fac40d71494d9666df318a6194644c
+  data.tar.gz: 55e5e250fba4a2ec4764ab340e76de30ea919c0687d276f2e0e884bd7c96c334
 SHA512:
-  metadata.gz: 8c0919d55f0c6c494c0b6cf48d5e44ba2698b70749e0df19eaf1ec27e206c0f112b103cf055a67da4872e0eee35fcbfc385638d483550ec12afa12ab4bbbc968
-  data.tar.gz: 29e3b6143f77e5193e61b22faa95e39d392c0a85cd893ea006269bf4d448a055984bb915ed5756b5987c1de7e78b0c08dcce67789e89b2fe7b37a7931ff6c13b
+  metadata.gz: 03d17a33f36c7f8359c4fff5eb8ccc503fefe0fcd810a40d8aafcf116c606029ceae64ae9be7e9ace589595c610b4c5b270e326a17511d5b70caeb2035124291
+  data.tar.gz: a3d0bf572181b01c53f6a65883862e2641ae0b06b117d7a54b2d6eac41bdae1854d4948b46b14342fbc57cd9d01a9edb6e321abf0681a2832ed818f44623b252

data/.github/workflows/main.yml

@@ -10,7 +10,7 @@ jobs:
   test:
     runs-on: ${{ matrix.os }}
     strategy:
-      max-parallel: 3
+      max-parallel: 4
       fail-fast: false
       matrix:
         os: [ ubuntu-18.04, ubuntu-latest, windows-latest, macos-latest ]
@@ -31,7 +31,7 @@ jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
-      max-parallel: 3
+      max-parallel: 4
       fail-fast: false
       matrix:
         include:
@@ -76,7 +76,7 @@ jobs:
     needs: build
     runs-on: ${{ matrix.os }}
     strategy:
-      max-parallel: 3
+      max-parallel: 4
       fail-fast: false
       matrix:
         include:
@@ -132,17 +132,21 @@ jobs:
   cross:
     runs-on: ${{ matrix.os }}
     strategy:
-      max-parallel: 3
+      max-parallel: 4
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-18.04
-            platform: arm64-linux
+          - os: ubuntu-latest
+            platform: aarch64-linux
+            ruby-version: '2.7'
+          - os: macos-latest
+            platform: arm64-darwin
             ruby-version: '2.7'
     steps:
       - uses: actions/checkout@v2
 
       - name: Install packages
+        if: matrix.os == 'ubuntu-latest'
         run: |
           sudo apt-get update
           sudo apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu gperf

data/.github/workflows/release.yml

@@ -57,13 +57,17 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-18.04
-            platform: arm64-linux
+          - os: ubuntu-latest
+            platform: aarch64-linux
+            ruby-version: '2.7'
+          - os: macos-latest
+            platform: arm64-darwin
             ruby-version: '2.7'
     steps:
       - uses: actions/checkout@v2
 
       - name: Install packages
+        if: matrix.os == 'ubuntu-latest'
         run: |
           sudo apt-get update
           sudo apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu gperf

data/.rubocop.yml

@@ -2,7 +2,7 @@ inherit_from:
   - 'https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml'
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 2.5
   SuggestExtensions: false
 
 Gemspec/RequireMFA:

data/Rakefile

@@ -34,8 +34,9 @@ platforms = [
   "x64-mingw32",
   "x64-mingw-ucrt",
   "x86_64-linux",
-  "arm64-linux",
+  "aarch64-linux",
   "x86_64-darwin",
+  "arm64-darwin",
 ]
 
 platforms.each do |platform|

data/emf2svg.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "Ruby interface to libemf2svg."
   spec.homepage      = "https://github.com/metanorma/emf2svg-ruby"
   spec.license       = "BSD-2-Clause"
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 2.5.0"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/metanorma/emf2svg-ruby"

data/lib/emf2svg/recipe.rb

@@ -8,11 +8,11 @@ module Emf2svg
     ROOT = Pathname.new(File.expand_path("../..", __dir__))
 
     def initialize
-      super("libemf2svg", "1.4.0")
+      super("libemf2svg", "1.6.0")
 
       @files << {
-        url: "https://github.com/metanorma/libemf2svg/releases/download/v1.4.0/libemf2svg.tar.gz",
-        sha256: "e05081986a0ec6c5bd494068825c7b55dd21fa1814942a61293b225af2d957d2", # rubocop:disable Layout/LineLength
+        url: "https://github.com/metanorma/libemf2svg/releases/download/v1.6.0/libemf2svg.tar.gz",
+        sha256: "0f186f40b98c06acdec1278a314cEc1f093e7504d34f7a15b697ebfe6c4d3097", # rubocop:disable Layout/LineLength
       }
 
       @target = ROOT.join(@target).to_s
@@ -40,25 +40,48 @@ module Emf2svg
           "x86-mingw32"
         when /\Ax86_64.*linux/
           "x86_64-linux"
-        when /\Aarm64.*linux/
-          "xarm64-linux"
+        when /\A(arm64|aarch64).*linux/
+          "arm64-linux"
         when /\Ai[3-6]86.*linux/
           "x86-linux"
-        when /\Ax86_64.*darwin/
+        when /\Ax86_64.*(darwin|macos|osx)/
           "x86_64-darwin"
-        when /\Aarm64.*darwin/
+        when /\A(arm64|aarch64).*(darwin|macos|osx)/
           "arm64-darwin"
         else
-          raise "CrossRuby.platform: unsupported host: #{@host}"
+          @host
         end
     end
-    # rubocop:enable Metrics/CyclomaticComplexity
-    # rubocop:enable Metrics/MethodLength
 
     def target_platform
-      @target_platform = ENV["target_platform"] || host_platform
+      @target_platform ||=
+        case ENV["target_platform"]
+        when /\A(arm64|aarch64).*(darwin|macos|osx)/
+          "arm64-darwin"
+        when /\Ac86_64.*(darwin|macos|osx)/
+          "x86_64-darwin"
+        when /\A(arm64|aarch64).*linux/
+          "arm64-linux"
+        else
+          ENV["target_platform"] || host_platform
+        end
     end
 
+    def target_triplet
+      @target_triplet ||=
+        case target_platform
+        when "arm64-darwin"
+          "arm64-osx"
+        when "x86_64-darwin"
+          "x86_64-osx"
+        else
+          target_platform
+        end
+    end
+
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/MethodLength
+
     def cross_compiling?
       not host_platform.eql? target_platform
     end
@@ -78,7 +101,7 @@ module Emf2svg
 
       if cross_compiling? && (not MiniPortile.windows?)
         message("Cross-compiling on #{host_platform} for #{target_platform}\n")
-        opts << "-DVCPKG_TARGET_TRIPLET=#{target_platform}"
+        opts << "-DVCPKG_TARGET_TRIPLET=#{target_triplet}"
       end
 
       opts

data/lib/emf2svg/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Emf2svg
-  VERSION = "1.2.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emf2svg
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: x64-mingw32
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -118,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="