Remove the left shift (<<) operator, deprecated from Gradle 3.2 in Gr…

…adle build. ( #548 ) Remove some old comments.
TheCoder4eu · Nov 23, 2016 · 8a38acc · 8a38acc
1 parent 9fdd7c9
commit 8a38acc
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 62 deletions.
diff --git a/build.gradle b/build.gradle
@@ -57,22 +57,27 @@ ext.useBootClasspath= ( ( props['enableBootClasspath']!=null) && props['enableBo
 group = 'net.bootsfaces'
 version = BootsFacesVersion
 
-task showConfig << {
-  println "Main Configurations."
-  println "--------------------"
-  println "BootsFacesVersion="+BootsFacesVersion
-  println "BootstrapVersion="+BootstrapVersion
-  println "BootswatchFullVersion="+BootswatchFullVersion
-  println "allThemes="+allThemes
-  println "jqversion="+jqversion
-  println "buildJava6:"+buildJava6
-  println "buildJava7:"+buildJava7
-  println "buildJava8:"+buildJava8
-  println "buildOptsJava6="+buildOptsJava6
-  println "buildOptsJava7="+buildOptsJava7
-  println "buildOptsJava8="+buildOptsJava8
-  println "useBootClasspath="+useBootClasspath
-  println "--------------------"
+task showConfig {
+    description = 'Prints out the Build configuration.'
+    doLast {
+      println "Main Configurations:"
+      println "--------------------"
+      println "BootsFacesVersion="+BootsFacesVersion
+      println "BootstrapVersion="+BootstrapVersion
+      println "BootswatchFullVersion="+BootswatchFullVersion
+      println "PatternFlyVersion="+PatternFlyVersion
+      println "allThemes="+allThemes
+      println "jqversion="+jqversion
+      println "--------Java--------"
+      println "buildJava6:"+buildJava6
+      println "buildJava7:"+buildJava7
+      println "buildJava8:"+buildJava8
+      println "buildOptsJava6="+buildOptsJava6
+      println "buildOptsJava7="+buildOptsJava7
+      println "buildOptsJava8="+buildOptsJava8
+      println "useBootClasspath="+useBootClasspath
+      println "--------------------"
+    }
 }
 
 defaultTasks 'showConfig', ':java6:defaultJar', ':java7:jar', ':java8:jar'
diff --git a/gradleResources/build.gradle b/gradleResources/build.gradle
@@ -29,31 +29,6 @@
  * Tasks to Copy STATIC files to resources
  */
 
- /*def copySpecCssResources = copySpec {
-     from "staticResources/css/bootstrap-multiselect.css"
-     from 'staticResources/css/bootstrap-switch.css'
-     from 'staticResources/css/bootstrap-tagsinput.css'
-     from 'staticResources/css/bootstrap-slider.min.css'
-     from 'staticResources/css/bootstrap-touchspin.min.css'
-     from 'staticResources/css/jssocials.css'
-     from 'staticResources/css/datatables.min.css'
-     from 'staticResources/css/bootstrap-tree.css'
-     from 'staticResources/css/bootstrap-treeview.min.css'
-     from 'staticResources/css/animate.css'
-     from 'staticResources/css/dropdowns.css'
-     from 'staticResources/css/dropdown-submenu.css'
-     from 'staticResources/css/fullcalendar.min.css'
-     from 'staticResources/css/scrollup.css'
-     from 'staticResources/css/jq.ui.core.css'
-     from 'staticResources/css/jq.ui.datepicker.css'
-     from 'staticResources/css/jq.ui.slider.css'
-     from 'staticResources/css/jq.ui.theme.css'
-     from 'staticResources/css/jquery.minicolors.css'
-     from 'staticResources/css/sticky-footer-navbar.css'
-     from 'staticResources/css/bootstrap-datetimepicker.min.css'
-     from 'staticResources/css/typeahead.css'
- }*/
-
  task copyCssResources(type: Copy) {
      from 'staticResources/css/ext/bootstrap-datetimepicker.min.css'
      from "staticResources/css/ext/bootstrap-multiselect.css"
@@ -81,15 +56,6 @@
 
      into "${buildDir}/resources/META-INF/resources/bsf/css"
  }
- /*task copyCssResources << {
-     allThemes.each { dest ->
-     copy {
-       with copySpecCssResources
-       into "${buildDir}/resources/META-INF/resources/bsf/css/"+dest
-       println 'css2'+dest
-     }
-   }
- }*/
 
  task copyJsResources(type: Copy) {
    	description 'BootsFaces task: copies additional JS files to the target folder (i.e. files that are not part of Bootstrap).'
@@ -182,18 +148,6 @@
      exclude "*.gz"
  }
 
- /*def copySpecBsfCss2Resources = copySpec {
-     from "${assetResources}/bsf.css"
- }
- task copyBsfCss << {
-   allThemes.each { dest ->
-     copy {
-       with copySpecBsfCss2Resources
-       into "${buildDir}/resources/META-INF/resources/bsf/css/"+dest
-       println 'copy bsfcss2 '+dest
-     }
-   }
- }*/
  task copyBsfCss(type: Copy) {
    	description 'BootsFaces task: copies the bsf.css file. bsf.css contains the common non-compiled CSS rules of BootsFaces.'
    	from "${assetResources}/bsf.css"