buildr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject [1/2] buildr git commit: IDEA: Correctly configure the IDE module if the language level differs from the root project language level.
Date Tue, 21 Feb 2017 22:39:13 GMT
Repository: buildr
Updated Branches:
  refs/heads/master e4a98ae56 -> 88f32b3d2


IDEA: Correctly configure the IDE module if the language level differs from the root project
language level.


Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/1f8f167a
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/1f8f167a
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/1f8f167a

Branch: refs/heads/master
Commit: 1f8f167a0e69948c804b522956a2d5369b503c88
Parents: e4a98ae
Author: Peter Donald <peter@realityforge.org>
Authored: Wed Feb 22 09:36:25 2017 +1100
Committer: Peter Donald <peter@realityforge.org>
Committed: Wed Feb 22 09:36:25 2017 +1100

----------------------------------------------------------------------
 CHANGELOG              | 1 +
 lib/buildr/ide/idea.rb | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/buildr/blob/1f8f167a/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 6badc42..33d8582 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
 1.5.1 (Pending)
+* Fixed:  IDEA: Correctly configure the IDE module if the language level differs from the
root project language level.
 * Change: Add css2gss task to gwt addon to support conveting from deprecated css syntax to
modern gss syntax.
 * Change: Add support for gwt 2.8.0 to gwt addon.
 * Change: Remove orderedhash gem.

http://git-wip-us.apache.org/repos/asf/buildr/blob/1f8f167a/lib/buildr/ide/idea.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/ide/idea.rb b/lib/buildr/ide/idea.rb
index 48522fc..f6f372e 100644
--- a/lib/buildr/ide/idea.rb
+++ b/lib/buildr/ide/idea.rb
@@ -530,7 +530,9 @@ module Buildr #:nodoc:
       end
 
       def module_root_component
-        create_component('NewModuleRootManager', 'inherit-compiler-output' => 'false')
do |xml|
+        options = { 'inherit-compiler-output' => 'false' }
+        options['LANGUAGE_LEVEL'] = "JDK_#{jdk_version.gsub(/\./, '_')}" unless jdk_version
== buildr_project.root_project.compile.options.source
+        create_component('NewModuleRootManager', options) do |xml|
           generate_compile_output(xml)
           generate_content(xml) unless skip_content?
           generate_initial_order_entries(xml)


Mime
View raw message