Skip to content

Commit

Permalink
Merge pull request jruby#8385 from headius/fiddle_default_gem_9.4
Browse files Browse the repository at this point in the history
Switch 9.4 to ship fiddle as a default gem
  • Loading branch information
headius authored Oct 25, 2024
2 parents 13309db + f82e2b6 commit feb5fb7
Show file tree
Hide file tree
Showing 13 changed files with 18 additions and 1,636 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ lib/ruby/stdlib/English*
lib/ruby/stdlib/erb*
lib/ruby/stdlib/error_highlight*
lib/ruby/stdlib/ffi*
lib/ruby/stdlib/fiddle*
lib/ruby/stdlib/fileutils*
lib/ruby/stdlib/find*
lib/ruby/stdlib/forwardable*
Expand Down
2 changes: 1 addition & 1 deletion lib/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def log(message=nil)
# https://github.com/ruby/fcntl/issues/9
# ['fcntl', '1.0.1'],
['ffi', '1.16.3'],
# ['fiddle', '1.1.0'],
['fiddle', '1.1.4'],
['fileutils', '1.6.0'],
['find', '0.1.1'],
['forwardable', '1.3.2'],
Expand Down
16 changes: 16 additions & 0 deletions lib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,19 @@ DO NOT MODIFY - GENERATED CODE
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>fiddle</artifactId>
<version>1.1.4</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>rubygems</groupId>
<artifactId>jar-dependencies</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>fileutils</artifactId>
Expand Down Expand Up @@ -1097,6 +1110,7 @@ DO NOT MODIFY - GENERATED CODE
<include>specifications/erb-2.2.3*</include>
<include>specifications/error_highlight-0.3.0*</include>
<include>specifications/ffi-1.16.3*</include>
<include>specifications/fiddle-1.1.4*</include>
<include>specifications/fileutils-1.6.0*</include>
<include>specifications/find-0.1.1*</include>
<include>specifications/forwardable-1.3.2*</include>
Expand Down Expand Up @@ -1176,6 +1190,7 @@ DO NOT MODIFY - GENERATED CODE
<include>gems/erb-2.2.3*/**/*</include>
<include>gems/error_highlight-0.3.0*/**/*</include>
<include>gems/ffi-1.16.3*/**/*</include>
<include>gems/fiddle-1.1.4*/**/*</include>
<include>gems/fileutils-1.6.0*/**/*</include>
<include>gems/find-0.1.1*/**/*</include>
<include>gems/forwardable-1.3.2*/**/*</include>
Expand Down Expand Up @@ -1255,6 +1270,7 @@ DO NOT MODIFY - GENERATED CODE
<include>cache/erb-2.2.3*</include>
<include>cache/error_highlight-0.3.0*</include>
<include>cache/ffi-1.16.3*</include>
<include>cache/fiddle-1.1.4*</include>
<include>cache/fileutils-1.6.0*</include>
<include>cache/find-0.1.1*</include>
<include>cache/forwardable-1.3.2*</include>
Expand Down
100 changes: 0 additions & 100 deletions lib/ruby/stdlib/fiddle.rb

This file was deleted.

49 changes: 0 additions & 49 deletions lib/ruby/stdlib/fiddle/closure.rb

This file was deleted.

Loading

0 comments on commit feb5fb7

Please sign in to comment.