rake-compiler 1.1.7 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02cad822f10b4321127ce0c91ecb9ce1b7465897be75cb63864598f67a0862f9
-  data.tar.gz: e892ced800adc8b779b7a248f726590d2a9967c6efb95817778af4b51f650d4a
+  metadata.gz: 168f62a83a0e87ed5dd8ddc21151082d826a18af8baa3319be221704fd559e1b
+  data.tar.gz: 62247a212ea5dce5803ef33d4490d3a6a982e5bf78716a5da0339e1c980b467a
 SHA512:
-  metadata.gz: b773ca5038495c9301561f7f093dd292a90c8987d71964234359e742e159e3dcceba66762a12c161a79b60c0d8eb55b2fc1d65dfb186a64b8905ea75148090f5
-  data.tar.gz: 281a93c3f8e00a01ede2150bff92f8898406fef693192d1a83710eb7e40c07e53229f91aeee8c661489a4901e81c702e8d55f667858f59ddeb47f8f93da75ab3
+  metadata.gz: 5857be6b32518649261bb405df56b6986083e019f38621801323aea374544a9771c30bca2f7cc539c7fc8cd4f0cc44b8861f93bab4877ff4bfc45aecbb6e5d44
+  data.tar.gz: 61c4b8db10ff10e4b8ec45a7688241689981bc3c70f2a2b7eb2eebf877e9ca623844f70e70858daf899812a7ef8deb7c13c77b9fc0570d3bdcff7d367b445e07

data/History.md

@@ -1,3 +1,22 @@
+### 1.2.0 / 2022-04-15
+
+* Enhancements:
+  * Defer requiring `yaml`.
+    [ruby/stringio#21](https://github.com/ruby/stringio/issues/21)
+
+### 1.1.9 / 2022-01-22
+
+* Enhancements:
+  * Add support for `--release` option to build JRuby extension.
+    [#200](https://github.com/rake-compiler/rake-compiler/issues/200) [Reported by Pavel Rosický]
+    [#201](https://github.com/rake-compiler/rake-compiler/issues/201) [Patch by Satoshi Tagomori]
+
+### 1.1.8 / 2022-01-18
+
+* Fixes:
+  * Fix wrong `required_ruby_version` when some `RUBY_CC_VERSION`s are missing.
+    [#198](https://github.com/rake-compiler/rake-compiler/issues/198) [Patch by Lars Kanis]
+
 ### 1.1.7 / 2022-01-04
 
 * Fixes:

data/lib/rake/baseextensiontask.rb

@@ -3,12 +3,6 @@ require 'rake/clean'
 require 'rake/tasklib'
 require 'rbconfig'
 
-begin
-  require 'psych'
-rescue LoadError
-end
-
-require 'yaml'
 require 'pathname'
 
 module Rake

data/lib/rake/extensiontask.rb

@@ -377,9 +377,6 @@ Java extension should be preferred.
           @lib_dir = "#{@lib_dir}/#{$1}"
         end
 
-        # Update cross compiled platform/version combinations
-        @ruby_versions_per_platform[for_platform] << version
-
         define_cross_platform_tasks_with_version(for_platform, version)
 
         # restore lib_dir
@@ -396,6 +393,7 @@ Java extension should be preferred.
         return
       end
 
+      require "yaml"
       config_file = YAML.load_file(config_path)
 
       # tmp_path

data/lib/rake/javaextensiontask.rb

@@ -17,6 +17,9 @@ module Rake
     # Generate class files for specific VM version
     attr_accessor :target_version
 
+    # Compile for oldeer platform version
+    attr_accessor :release
+
     attr_accessor :encoding
 
     # Specify lint option
@@ -37,6 +40,7 @@ module Rake
       @debug          = false
       @source_version = '1.7'
       @target_version = '1.7'
+      @release        = nil
       @encoding       = nil
       @java_compiling = nil
       @lint_option    = nil
@@ -106,8 +110,7 @@ execute the Rake compilation task using the JRuby interpreter.
 
         javac_command_line = [
           "javac",
-          "-target", @target_version,
-          "-source", @source_version,
+          *java_target_args,
           java_lint_arg,
           "-d", tmp_path,
         ]
@@ -208,6 +211,14 @@ execute the Rake compilation task using the JRuby interpreter.
       end
     end
 
+    def java_target_args
+      if @release
+        ["--release=#{@release}"]
+      else
+        ["-target", @target_version, "-source", @source_version]
+      end
+    end
+
     #
     # Discover Java Extension Directories and build an extdirs arguments
     #

data/spec/lib/rake/extensiontask_spec.rb

@@ -2,6 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 require 'rake/extensiontask'
 require 'rbconfig'
+require 'yaml'
 
 describe Rake::ExtensionTask do
   context '#new' do
@@ -456,14 +457,17 @@ describe Rake::ExtensionTask do
 
       it "should set required_ruby_version from RUBY_CC_VERSION, set platform, clear extensions but keep metadata" do
         platforms = ["x86-mingw32", "x64-mingw32"]
-        ruby_cc_versions = ["1.8.6", "2.1.10", "2.2.6", "2.3.3", "2.10.1"]
+        ruby_cc_versions = ["1.8.6", "2.1.10", "2.2.6", "2.3.3", "2.10.1", "2.11.0"]
         ENV["RUBY_CC_VERSION"] = ruby_cc_versions.join(":")
         config = Hash.new
         ruby_cc_versions.each do |ruby_cc_version|
           platforms.each do |platform|
+            unless platform == "x64-mingw32" && ruby_cc_version == "2.11.0"
+              rbconf = "/rubies/#{ruby_cc_version}/rbconfig.rb"
+            end
             allow(config).to receive(:[]).
               with("rbconfig-#{platform}-#{ruby_cc_version}").
-              and_return("/rubies/#{ruby_cc_version}/rbconfig.rb")
+              and_return(rbconf)
           end
         end
         allow(YAML).to receive(:load_file).and_return(config)
@@ -490,7 +494,7 @@ describe Rake::ExtensionTask do
         end
 
         expected_required_ruby_versions = [
-          Gem::Requirement.new([">= 1.8", "< 2.11.dev"]),
+          Gem::Requirement.new([">= 1.8", "< 2.12.dev"]),
           Gem::Requirement.new([">= 1.8", "< 2.11.dev"]),
         ]
         cross_specs.collect(&:required_ruby_version).should == expected_required_ruby_versions

data/spec/lib/rake/javaextensiontask_spec.rb

@@ -175,11 +175,13 @@ describe Rake::JavaExtensionTask do
       let(:extension) do
         Rake::JavaExtensionTask.new('extension_two') do |ext|
           ext.lint_option = lint_option if lint_option
+          ext.release = release if release
         end
       end
 
       context 'without a specified lint option' do
         let(:lint_option) { nil }
+        let(:release) { nil }
 
         it 'should honor the lint option' do
           (extension.lint_option).should be_falsey
@@ -189,12 +191,35 @@ describe Rake::JavaExtensionTask do
 
       context "with a specified lint option of 'deprecated'" do
         let(:lint_option) { 'deprecated'.freeze }
+        let(:release) { nil }
 
         it 'should honor the lint option' do
           (extension.lint_option).should eq lint_option
           (extension.send :java_lint_arg).should eq '-Xlint:deprecated'
         end
       end
+
+      context "without release option" do
+        let(:lint_option) { nil }
+        let(:release) { nil }
+
+        it 'should generate -target and -source build options' do
+          extension.target_version = "1.8"
+          extension.source_version = "1.8"
+          (extension.send :java_target_args).should eq ["-target", "1.8", "-source", "1.8"]
+        end
+      end
+
+      context "with release option" do
+        let(:lint_option) { nil }
+        let(:release) { '8' }
+
+        it 'should generate --release option even with target_version/source_version' do
+          extension.target_version = "1.8"
+          extension.source_version = "1.8"
+          (extension.send :java_target_args).should eq ["--release=8"]
+        end
+      end
     end
   end
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.2.0
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-03 00:00:00.000000000 Z
+date: 2022-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake