nio4r 2.5.5 → 2.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83e0080af4a88a697820ce40d34e6adbd886c6ebbcf9c75829c04e2febea5058
-  data.tar.gz: 7942b6d643f2dc26d0bb7e2c96deb51b697c13df2c3ccc4f972c09df856e3694
+  metadata.gz: 3f8bda8397f00743e7ca6814df9ae0072197fe4a1c9ba49efa74c8b44148ee71
+  data.tar.gz: c3fb1c470e4d378346f67b0c07fb7ffe4fe5527339097297a3b93ac950202d0b
 SHA512:
-  metadata.gz: 359600dd9ee73684a9b511df14fd5367e92dc0c0845c4195e436cc27fb82474bfd49aee4698e617bb1e0b5d7a9061efa3a10bdd9ec30e2455988376a09e2e49d
-  data.tar.gz: 6ad1095616c63f9763d787ae1bcd724cd08dbf834c4c9feb3a1abb2af75322be1fe3a875481eadd155404d0e34cb3c758ea94fdc2c50ae0136a24a541e68df83
+  metadata.gz: 51c13b6c08c436b692b0e858abc704d1e682667a302c55e43635a043daf2b26b8faff4ad67c1ea02ca2d619efad776903497b15ad67d2dd22894dd82a598cd49
+  data.tar.gz: '08297c9a051369fd39ad02489ddeb35595f1fbba313c3516d24f60e4e4e46db41307da90075a5a3b11ac377ad410bf908719d585ad1e3ba1b7ba867d520e4c0c'

data/.github/workflows/workflow.yml

@@ -19,8 +19,6 @@ jobs:
         include:
           - { os: ubuntu-16.04, ruby: 3.0 }
           - { os: ubuntu-16.04, ruby: 2.4 }
-          - { os: macos-11.0  , ruby: 3.0 }
-          - { os: macos-11.0  , ruby: 2.4 }
         exclude:
           - { os: windows-2019, ruby: head  }
           - { os: windows-2019, ruby: jruby }

data/CHANGES.md

@@ -1,3 +1,17 @@
+## 2.5.5 (2021-02-05)
+
+* [#256](https://github.com/socketry/nio4r/pull/256)
+  Use libev 4.33, featuring experimental `io_uring` support.
+  ([@jcmfernandes])
+
+* [#260](https://github.com/socketry/nio4r/pull/260)
+  Workaround for ARM-based macOS Ruby: Use pure Ruby for M1, since the native extension is crashing on M1 (arm64).
+  ([@jasl])
+
+* [#252](https://github.com/socketry/nio4r/pull/252)
+  JRuby: Fix javac -Xlint warnings
+  ([@headius])
+
 ## 2.5.4 (2020-09-16)
 
 * [#251](https://github.com/socketry/nio4r/issues/251)
@@ -265,3 +279,6 @@ Possible bug with Ruby >= 2.7.0 and `GC.compact`
 [@eregon]: https://github.com/eregon
 [@olleolleolle]: https://github.com/olleolleolle
 [@boazsegev]: https://github.com/boazsegev
+[@headius]: https://github.com/headius
+[@jasl]: https://github.com/jasl
+[@jcmfernandes]: https://github.com/jcmfernandes

data/Gemfile

@@ -7,7 +7,6 @@ gemspec
 gem "jruby-openssl" if defined? JRUBY_VERSION
 
 group :development do
-  gem "guard-rspec", require: false
   gem "pry", require: false
 end
 

data/ext/libev/ev.c

@@ -354,19 +354,11 @@
 #endif
 
 #ifndef EV_USE_LINUXAIO
-# if __linux /* libev currently assumes linux/aio_abi.h is always available on linux */
-#  define EV_USE_LINUXAIO 0 /* was: 1, always off by default */
-# else
 #  define EV_USE_LINUXAIO 0
-# endif
 #endif
 
 #ifndef EV_USE_IOURING
-# if __linux /* later checks might disable again */
-#  define EV_USE_IOURING 1
-# else
 #  define EV_USE_IOURING 0
-# endif
 #endif
 
 #ifndef EV_USE_INOTIFY
@@ -475,14 +467,6 @@
 # define EV_USE_INOTIFY 0
 #endif
 
-#if __linux && EV_USE_IOURING
-# include <linux/version.h>
-# if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
-#  undef EV_USE_IOURING
-#  define EV_USE_IOURING 0
-# endif
-#endif
-
 #if !EV_USE_NANOSLEEP
 /* hp-ux has it in sys/time.h, which we unconditionally include above */
 # if !defined _WIN32 && !defined __hpux
@@ -3163,8 +3147,10 @@ ev_recommended_backends (void) EV_NOEXCEPT
   /* only select works correctly on that "unix-certified" platform */
   flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
   flags &= ~EVBACKEND_POLL;   /* poll is based on kqueue from 10.5 onwards */
-#elif !defined(__NetBSD__)
-  /* kqueue is borked on everything but netbsd apparently */
+#endif
+
+#if !defined(__NetBSD__) && !defined(__APPLE__)
+  /* kqueue is borked on everything but netbsd and osx >= 10.12.2 apparently */
   /* it usually doesn't work correctly on anything but sockets and pipes */
   flags &= ~EVBACKEND_KQUEUE;
 #endif

data/ext/libev/ev_iouring.c

@@ -287,7 +287,7 @@ iouring_sqe_get (EV_P)
 }
 
 inline_size
-struct io_uring_sqe *
+void
 iouring_sqe_submit (EV_P_ struct io_uring_sqe *sqe)
 {
   unsigned idx = sqe - EV_SQES;
@@ -313,7 +313,7 @@ iouring_tfd_cb (EV_P_ struct ev_io *w, int revents)
 
 /* called for full and partial cleanup */
 ecb_cold
-static int
+static void
 iouring_internal_destroy (EV_P)
 {
   close (iouring_tfd);

data/ext/nio4r/extconf.rb

@@ -27,5 +27,9 @@ $defs << "-DEV_STANDALONE" # prevent libev from assuming "config.h" exists
 
 CONFIG["optflags"] << " -fno-strict-aliasing" unless RUBY_PLATFORM =~ /mswin/
 
+if RUBY_PLATFORM =~ /darwin/
+  $DLDFLAGS.gsub!(/\-arch\s+[^\s]+/, "")
+end
+
 dir_config "nio4r_ext"
 create_makefile "nio4r_ext"

data/lib/nio/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NIO
-  VERSION = "2.5.5"
+  VERSION = "2.5.8"
 end

data/lib/nio.rb

@@ -25,9 +25,9 @@ module NIO
     end
 
     # M1 native extension is crashing on M1 (arm64):
-    if RUBY_PLATFORM =~ /darwin/ && RUBY_PLATFORM =~ /arm64/
-      return true
-    end
+    # if RUBY_PLATFORM =~ /darwin/ && RUBY_PLATFORM =~ /arm64/
+    #   return true
+    # end
 
     return false
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nio4r
 version: !ruby/object:Gem::Version
-  version: 2.5.5
+  version: 2.5.8
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-05 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,8 +109,8 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/socketry/nio4r/issues
   changelog_uri: https://github.com/socketry/nio4r/blob/master/CHANGES.md
-  documentation_uri: https://www.rubydoc.info/gems/nio4r/2.5.5
-  source_code_uri: https://github.com/socketry/nio4r/tree/v2.5.5
+  documentation_uri: https://www.rubydoc.info/gems/nio4r/2.5.8
+  source_code_uri: https://github.com/socketry/nio4r/tree/v2.5.8
   wiki_uri: https://github.com/socketry/nio4r/wiki
 post_install_message:
 rdoc_options: []
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: New IO for Ruby