emf2svg 1.2.0-x64-mingw-ucrt → 1.3.1-x64-mingw-ucrt

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d598b1fa7f9bbac8474862bc7c1377e74b15f6a41282b28a1a625779e3be189
-  data.tar.gz: 942f5044ca1cc3215223bbb2a32bbd0326a59fb9aeade8f316314e15febd0a7e
+  metadata.gz: c5425cd63fa1c3f2343c886afde8a1f7018f3c317575a58dc26641c23a7ef5e6
+  data.tar.gz: 57b57a7d9f8f29f99234c1b7c5d1ea176122bba1d8915a6fa56a644bf09805cd
 SHA512:
-  metadata.gz: c182260cdc411c087a657aebfa087ed7fc553c5b3a844f6f7cfdf4895059797f4384b6042bd4016d84fa1b400f7ab292ffcb163b1ab8ed1ea7640d1664ced188
-  data.tar.gz: 29fe9231ee07ea8db0c4fe24f27e1e20fa12bd4183ec66ecc75e164bcf76c367723a44d27c7862de53a2c9210583cb16e17efe5babb2ab7d7004d7c0e983aca0
+  metadata.gz: 6a8d067d5e83a48b590b15c2b9a618ac46b71e2714cefdeddd5276e28c747f3f256b81eb9d231640ca559a6ada38a10e8cf0c87880cc870d0182d88579135922
+  data.tar.gz: 6fb1f885d5f5a7353482c4529e7b9a3fb013bd8c062d0b196b90dcfdb6a41cf175113bac3b5bfa58936e0a2899a0fd0e7b8c23fb7ad07d919be8ea7fe526c45d

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-mingw-ucrt
 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:
   - - ">="