Skip to content

Commit 5a44cbe

Browse files
committed
Move fiddle back to default temporarily for resolv
The resolv library in JRuby still uses fiddle to bind registry logic on Windows, but because resolv is default and fiddle is not, bundle exec calls using resolv will fail to load that registry binding. This moves fiddle back to default gems temporarily until we can replace the fiddle win32 wrapper with something that works out of default stdlib. See jruby#9278
1 parent 39af780 commit 5a44cbe

2 files changed

Lines changed: 18 additions & 17 deletions

File tree

lib/pom.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ def log(message = nil)
3838
# https://github.com/ruby/fcntl/issues/9
3939
# ['fcntl', '1.3.0'],
4040
['ffi', '1.17.0'],
41+
# Temporarily moved back to default gems, see https://github.com/jruby/jruby/issues/9278
42+
['fiddle', '1.1.8'],
4143
['fileutils', '1.8.0'],
4244
['find', '0.2.0'],
4345
['forwardable', '1.4.0'],
@@ -105,7 +107,6 @@ def log(message = nil)
105107
# ['debug', '1.11.1'],
106108
['debug', '0.2.1'],
107109
['drb', '2.2.3'],
108-
['fiddle', '1.1.8'],
109110
['getoptlong', '0.2.1'],
110111
['irb', '1.16.0'],
111112
['logger', '1.7.0'],

lib/pom.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,19 @@ DO NOT MODIFY - GENERATED CODE
161161
</exclusion>
162162
</exclusions>
163163
</dependency>
164+
<dependency>
165+
<groupId>rubygems</groupId>
166+
<artifactId>fiddle</artifactId>
167+
<version>1.1.8</version>
168+
<type>gem</type>
169+
<scope>provided</scope>
170+
<exclusions>
171+
<exclusion>
172+
<groupId>rubygems</groupId>
173+
<artifactId>jar-dependencies</artifactId>
174+
</exclusion>
175+
</exclusions>
176+
</dependency>
164177
<dependency>
165178
<groupId>rubygems</groupId>
166179
<artifactId>fileutils</artifactId>
@@ -772,19 +785,6 @@ DO NOT MODIFY - GENERATED CODE
772785
</exclusion>
773786
</exclusions>
774787
</dependency>
775-
<dependency>
776-
<groupId>rubygems</groupId>
777-
<artifactId>fiddle</artifactId>
778-
<version>1.1.8</version>
779-
<type>gem</type>
780-
<scope>provided</scope>
781-
<exclusions>
782-
<exclusion>
783-
<groupId>rubygems</groupId>
784-
<artifactId>jar-dependencies</artifactId>
785-
</exclusion>
786-
</exclusions>
787-
</dependency>
788788
<dependency>
789789
<groupId>rubygems</groupId>
790790
<artifactId>getoptlong</artifactId>
@@ -1154,6 +1154,7 @@ DO NOT MODIFY - GENERATED CODE
11541154
<include>specifications/erb-6.0.1*</include>
11551155
<include>specifications/error_highlight-0.7.1*</include>
11561156
<include>specifications/ffi-1.17.0*</include>
1157+
<include>specifications/fiddle-1.1.8*</include>
11571158
<include>specifications/fileutils-1.8.0*</include>
11581159
<include>specifications/find-0.2.0*</include>
11591160
<include>specifications/forwardable-1.4.0*</include>
@@ -1201,7 +1202,6 @@ DO NOT MODIFY - GENERATED CODE
12011202
<include>specifications/csv-3.3.5*</include>
12021203
<include>specifications/debug-0.2.1*</include>
12031204
<include>specifications/drb-2.2.3*</include>
1204-
<include>specifications/fiddle-1.1.8*</include>
12051205
<include>specifications/getoptlong-0.2.1*</include>
12061206
<include>specifications/irb-1.16.0*</include>
12071207
<include>specifications/logger-1.7.0*</include>
@@ -1238,6 +1238,7 @@ DO NOT MODIFY - GENERATED CODE
12381238
<include>gems/erb-6.0.1*/**/*</include>
12391239
<include>gems/error_highlight-0.7.1*/**/*</include>
12401240
<include>gems/ffi-1.17.0*/**/*</include>
1241+
<include>gems/fiddle-1.1.8*/**/*</include>
12411242
<include>gems/fileutils-1.8.0*/**/*</include>
12421243
<include>gems/find-0.2.0*/**/*</include>
12431244
<include>gems/forwardable-1.4.0*/**/*</include>
@@ -1285,7 +1286,6 @@ DO NOT MODIFY - GENERATED CODE
12851286
<include>gems/csv-3.3.5*/**/*</include>
12861287
<include>gems/debug-0.2.1*/**/*</include>
12871288
<include>gems/drb-2.2.3*/**/*</include>
1288-
<include>gems/fiddle-1.1.8*/**/*</include>
12891289
<include>gems/getoptlong-0.2.1*/**/*</include>
12901290
<include>gems/irb-1.16.0*/**/*</include>
12911291
<include>gems/logger-1.7.0*/**/*</include>
@@ -1322,6 +1322,7 @@ DO NOT MODIFY - GENERATED CODE
13221322
<include>cache/erb-6.0.1*</include>
13231323
<include>cache/error_highlight-0.7.1*</include>
13241324
<include>cache/ffi-1.17.0*</include>
1325+
<include>cache/fiddle-1.1.8*</include>
13251326
<include>cache/fileutils-1.8.0*</include>
13261327
<include>cache/find-0.2.0*</include>
13271328
<include>cache/forwardable-1.4.0*</include>
@@ -1369,7 +1370,6 @@ DO NOT MODIFY - GENERATED CODE
13691370
<include>cache/csv-3.3.5*</include>
13701371
<include>cache/debug-0.2.1*</include>
13711372
<include>cache/drb-2.2.3*</include>
1372-
<include>cache/fiddle-1.1.8*</include>
13731373
<include>cache/getoptlong-0.2.1*</include>
13741374
<include>cache/irb-1.16.0*</include>
13751375
<include>cache/logger-1.7.0*</include>

0 commit comments

Comments
 (0)