You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by jw...@apache.org on 2017/04/22 15:55:15 UTC

[1/2] groovy git commit: refactor(idea): do not add blank line after Copyright

Repository: groovy
Updated Branches:
  refs/heads/master 3b77da355 -> beaa5a950


refactor(idea): do not add blank line after Copyright


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/2313e144
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/2313e144
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/2313e144

Branch: refs/heads/master
Commit: 2313e144b31191ad1c72d4229e93ed05f9ed18a5
Parents: 3b77da3
Author: John Wagenleitner <jw...@apache.org>
Authored: Sat Apr 22 08:22:30 2017 -0700
Committer: John Wagenleitner <jw...@apache.org>
Committed: Sat Apr 22 08:51:24 2017 -0700

----------------------------------------------------------------------
 gradle/idea.gradle | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/2313e144/gradle/idea.gradle
----------------------------------------------------------------------
diff --git a/gradle/idea.gradle b/gradle/idea.gradle
index 510a9cc..21af30f 100644
--- a/gradle/idea.gradle
+++ b/gradle/idea.gradle
@@ -68,7 +68,12 @@ idea {
                           <option name="myName" value="ASL2" />
                           <option name="myLocal" value="true" />
                       </copyright>
-                ''')
+                    ''')
+                    appendNode(copyrightManager, '''
+                        <LanguageOptions name="__TEMPLATE__">
+                            <option name="addBlankAfter" value="false" />
+                        </LanguageOptions>
+                    ''')
                 }
 
                 def compilerConfig = node.component.find { it.@name == 'CompilerConfiguration' }


[2/2] groovy git commit: refactor(idea): set language level to 1.8

Posted by jw...@apache.org.
refactor(idea): set language level to 1.8


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

Branch: refs/heads/master
Commit: beaa5a9502a9d13d0ce2ea08c0ece950147ed160
Parents: 2313e14
Author: John Wagenleitner <jw...@apache.org>
Authored: Sat Apr 22 08:31:50 2017 -0700
Committer: John Wagenleitner <jw...@apache.org>
Committed: Sat Apr 22 08:51:56 2017 -0700

----------------------------------------------------------------------
 gradle/idea.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/beaa5a95/gradle/idea.gradle
----------------------------------------------------------------------
diff --git a/gradle/idea.gradle b/gradle/idea.gradle
index 21af30f..f8fa6ea 100644
--- a/gradle/idea.gradle
+++ b/gradle/idea.gradle
@@ -48,7 +48,7 @@ idea {
 
                 // jdk, language level fix
                 def pRoot = node.component.find { it.'@name' == 'ProjectRootManager' }
-                pRoot.'@languageLevel' = 'JDK_1_7'
+                pRoot.'@languageLevel' = 'JDK_1_8'
                 pRoot.'@project-jdk-name' = '1.8'
 
                 // Use git