Author: donaldp
Date: Fri Jan 11 04:46:30 2013
New Revision: 1431877
URL: http://svn.apache.org/viewvc?rev=1431877&view=rev
Log:
Observer the per-project source version when generating IDEA module files.
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/lib/buildr/ide/idea.rb
Modified: buildr/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1431877&r1=1431876&r2=1431877&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Fri Jan 11 04:46:30 2013
@@ -1,4 +1,6 @@
1.4.10 (Pending)
+* Fixed: Observer the per-project source version when generating
+ IDEA module files.
* Change: Sort the components in IDEA project files in the same
order the idea sorts them.
* Fixed: Findbugs addon correctly handles String dependencies
Modified: buildr/trunk/lib/buildr/ide/idea.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/ide/idea.rb?rev=1431877&r1=1431876&r2=1431877&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/ide/idea.rb (original)
+++ buildr/trunk/lib/buildr/ide/idea.rb Fri Jan 11 04:46:30 2013
@@ -169,6 +169,7 @@ module Buildr
attr_accessor :type
attr_accessor :group
attr_reader :facets
+ attr_writer :jdk_version
def initialize
super()
@@ -182,6 +183,10 @@ module Buildr
@buildr_project = buildr_project
end
+ def jdk_version
+ @jdk_version || buildr_project.compile.options.source || "1.6"
+ end
+
def extension
"iml"
end
@@ -482,7 +487,7 @@ module Buildr
def generate_initial_order_entries(xml)
xml.orderEntry :type => "sourceFolder", :forTests => "false"
- xml.orderEntry :type => "inheritedJdk"
+ xml.orderEntry :type => "jdk", :jdkName => jdk_version, :jdkType =>
"JavaSDK"
end
def generate_project_dependency(xml, other_project, export, test = false)
