Upgradle Gradle 2.14 complete

Cdevon2 · Jul 14, 2016 · 931b2c0 · 931b2c0
2 parents 59f4d3d + 892e05a
commit 931b2c0
Show file tree

Hide file tree

Showing 27 changed files with 153 additions and 122 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -1,5 +1,11 @@
 = CHANGELOG
 
+== Version 1.1 Roadmap
+
+* https://github.com/ysb33r/gnumake-gradle-plugin/issues/5[#5] - Gradle upgrade to v 2.12
+* Upgradle plugin to be built by Gradle 2.14
+* Add compatibility testing with GradleTest 1.0-beta3
+
 == Version 1.0.2
 
 === Bugs

diff --git a/README.adoc b/README.adoc
@@ -3,17 +3,19 @@
 Provides a wrapper for calling GNU Make from Gradle. This is especially useful
 for projects migrating to Gradle or when constructing complex build systems of which
 some components utilise GNU make as it build tool. Most common command-line switches
-are supported, but for full flexibiliy it is possible to add any additional switch via 
+are supported, but for full flexibility it is possible to add any additional switch via
 the *switches* property.
 
 == Previous versions of this document
 
+* 1.0 - https://github.com/ysb33r/gnumake-gradle-plugin/blob/GNUMAKE_RELEASE_1_0/README.adoc
 * 0.3 - https://github.com/ysb33r/gnumake-gradle-plugin/blob/GNUMAKE_RELEASE_0_3/README.md
 * 0.2 - https://github.com/ysb33r/gnumake-gradle-plugin/blob/GNUMAKE_RELEASE_0_2/README.md
 * 0.0.9 - https://github.com/ysb33r/gnumake-gradle-plugin/blob/0.0.9_RELEASE/README.md
 
 == Known compatibility
 
+* 1.1 - Gradle 2.0 - 2.14
 * 1.0 - Gradle 2.0
 * 0.3 - Gradle 2.0
 * 0.2 - Gradle 2.0
@@ -33,7 +35,7 @@ buildscript {
       }
   }
   dependencies {
-    classpath 'org.ysb33r.gradle:gnumake:1.0'
+    classpath 'org.ysb33r.gradle:gnumake:1.1'
   }
 }
 
@@ -51,7 +53,7 @@ plugins {
 
 == Global configuration
 
-With the release of 1.0 there is a project extension `gnumake`, which allows defaults to be set
+Sinc the release of 1.0 there is a project extension `gnumake`, which allows defaults to be set
 for all `GnuMakeBuild` tasks
 
 [source,groovy]

diff --git a/build.gradle b/build.gradle
@@ -10,36 +10,49 @@
 //
 // ============================================================================
 
-buildscript {
-    repositories {
-        jcenter()
-	    mavenLocal()
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-    }
-    dependencies {
-        classpath 'org.ysb33r.gradle:bintray:1.5'
-        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.1.0'
-        classpath "com.gradle.publish:plugin-publish-plugin:0.9.0"
-        classpath 'org.ysb33r.gradle:gradletest:0.5.5'
-        classpath 'gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.12.1'
-    }
+//buildscript {
+//    repositories {
+//        jcenter()
+//	    mavenLocal()
+//        maven {
+//            url "https://plugins.gradle.org/m2/"
+//        }
+//    }
+//    dependencies {
+//        classpath 'org.ysb33r.gradle:bintray:1.5'
+//        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.1.0'
+//        classpath "com.gradle.publish:plugin-publish-plugin:0.9.0"
+//
+//        // See: https://github.com/hierynomus/license-gradle-plugin/issues/67
+//        classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0', {
+//            exclude module : 'guava'
+//        }
+//    }
+//}
+
+//apply plugin : 'org.ysb33r.bintray'
+//apply plugin : 'org.ysb33r.gradletest'
+//apply plugin : 'groovy'
+//apply plugin : 'maven'
+//apply plugin : 'com.jfrog.artifactory'
+//apply plugin : 'com.gradle.plugin-publish'
+//apply plugin : 'com.github.hierynomus.license'
+
+
+plugins {
+    id 'com.gradle.build-scan' version '1.0'
+    id 'groovy'
+    id 'maven'
+    id 'org.ysb33r.bintray' version '1.5'
+    id 'org.ysb33r.gradletest' version '1.0-beta3'
+    id 'com.jfrog.artifactory' version '3.1.0'
+    id 'com.gradle.plugin-publish' version '0.9.4'
+    id 'com.github.hierynomus.license' version '0.13.1'
 }
 
-
-
-apply plugin : 'org.ysb33r.bintray'
-apply plugin : 'groovy'
-apply plugin : 'maven'
-apply plugin : 'com.jfrog.artifactory'
-apply plugin : 'com.gradle.plugin-publish'
-apply plugin : 'com.github.hierynomus.license'
-apply plugin : 'org.ysb33r.gradletest'
-
 group = 'org.ysb33r.gradle'
 archivesBaseName = 'gnumake'
-version = '1.0.3-SNAPSHOT'
+version = '1.1'
 
 sourceCompatibility = 1.6
 targetCompatibility = 1.6
@@ -57,7 +70,7 @@ repositories {
 dependencies {
     compile gradleApi()
     compile localGroovy()
-    testCompile ('org.spockframework:spock-core:1.0-groovy-2.3') {
+    testCompile ("org.spockframework:spock-core:1.0-groovy-${GroovySystem.version.replaceAll(/\.\d+$/, '')}") {
         exclude module : 'groovy-all'
     }
 }
@@ -84,6 +97,12 @@ jar {
     }
 }
 
+
+gradleTest {
+    versions '2.0','2.2','2.3','2.4','2.5','2.6','2.8','2.12','2.13'
+    dependsOn jar
+}
+
 artifactory {
     publish {
         contextUrl = 'http://oss.jfrog.org'
@@ -152,15 +171,7 @@ license {
     mapping {
         groovy ='DOUBLESLASH_STYLE'
     }
-    ext.year = '2013-2015'
+    ext.year = '2013-2016'
     excludes(['**/*.ad', '**/*.asciidoc', '**/*.adoc', '**/*.md','**/*.properties'])
-}
-
-gradleLocations {
-    downloadToGradleUserHome = true
-}
-
-gradleTest {
-    versions '2.0','2.2','2.4','2.8','2.10','2.12'
-    dependsOn jar
+    exclude '**/*CompatibilitySpec.groovy'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-2.0-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-2.14-all.zip
diff --git a/src/gradleTest/basicTest/build.gradle b/src/gradleTest/basicTest/build.gradle
diff --git a/src/gradleTest/basicTest/make.bat b/src/gradleTest/basicTest/make.bat
diff --git a/src/gradleTest/basicTest/make.sh b/src/gradleTest/basicTest/make.sh
diff --git a/src/gradleTest/canWeMakeItRun/build.gradle b/src/gradleTest/canWeMakeItRun/build.gradle
@@ -0,0 +1,24 @@
+import org.gradle.internal.os.OperatingSystem
+
+apply plugin : 'org.ysb33r.gnumake'
+
+
+gnumake {
+    if(OperatingSystem.current().isWindows()) {
+        executable  "cmd.exe"
+        execArgs    '/c', file("${projectDir}/fake-make.bat").absolutePath
+    } else {
+        executable  "sh"
+        execArgs    "${projectDir}/fake-make.sh"
+    }
+}
+
+make {
+    flags DESTDIR : 'foo/bar'
+    targets 'build','install'
+    environment foo : 'bar'
+}
+
+task runGradleTest {
+    dependsOn 'make'
+}
diff --git a/src/gradleTest/canWeMakeItRun/fake-make.bat b/src/gradleTest/canWeMakeItRun/fake-make.bat
@@ -0,0 +1,16 @@
+@REM
+@REM ============================================================================
+@REM (C) Copyright Schalk W. Cronje 2013-2015
+@REM
+@REM This software is licensed under the Apache License 2.0
+@REM See http://www.apache.org/licenses/LICENSE-2.0 for license details
+@REM
+@REM Unless required by applicable law or agreed to in writing, software distributed under the License is
+@REM distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM See the License for the specific language governing permissions and limitations under the License.
+@REM
+@REM ============================================================================
+@REM
+
+@echo off
+echo fake-make  %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/src/gradleTest/canWeMakeItRun/fake-make.sh b/src/gradleTest/canWeMakeItRun/fake-make.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+#
+# ============================================================================
+# (C) Copyright Schalk W. Cronje 2013-2015
+#
+# This software is licensed under the Apache License 2.0
+# See http://www.apache.org/licenses/LICENSE-2.0 for license details
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and limitations under the License.
+#
+# ============================================================================
+#
+
+echo fake-make $@
diff --git a/src/main/groovy/org/ysb33r/gradle/gnumake/GnuMakeBuild.groovy b/src/main/groovy/org/ysb33r/gradle/gnumake/GnuMakeBuild.groovy
@@ -1,6 +1,6 @@
 //
 // ============================================================================
-// (C) Copyright Schalk W. Cronje 2013-2015
+// (C) Copyright Schalk W. Cronje 2013-2016
 //
 // This software is licensed under the Apache License 2.0
 // See http://www.apache.org/licenses/LICENSE-2.0 for license details
@@ -19,6 +19,7 @@ package org.ysb33r.gradle.gnumake
 import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
 import groovy.transform.PackageScope
+import groovy.transform.TypeChecked
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.FileCollection
 import org.gradle.api.tasks.TaskAction
@@ -97,6 +98,7 @@ class GnuMakeBuild extends DefaultTask {
      */
     @Input
     @Optional
+    @TypeChecked
     @CompileDynamic
     List<String> getTargets() {
         CollectionUtils.stringize(this.targets)
@@ -203,8 +205,9 @@ class GnuMakeBuild extends DefaultTask {
      * on the GnuMake class.
      */
     @Input
-    @CompileDynamic
     @Optional
+    @TypeChecked
+    @CompileDynamic
     List<String> getSwitches() {
         CollectionUtils.stringize(this.switches)
     }

diff --git a/src/main/groovy/org/ysb33r/gradle/gnumake/GnuMakeExtension.groovy b/src/main/groovy/org/ysb33r/gradle/gnumake/GnuMakeExtension.groovy
@@ -1,6 +1,6 @@
 //
 // ============================================================================
-// (C) Copyright Schalk W. Cronje 2013-2015
+// (C) Copyright Schalk W. Cronje 2013-2016
 //
 // This software is licensed under the Apache License 2.0
 // See http://www.apache.org/licenses/LICENSE-2.0 for license details

diff --git a/src/main/groovy/org/ysb33r/gradle/gnumake/GnuMakePlugin.groovy b/src/main/groovy/org/ysb33r/gradle/gnumake/GnuMakePlugin.groovy
@@ -1,6 +1,6 @@
 //
 // ============================================================================
-// (C) Copyright Schalk W. Cronje 2013-2015
+// (C) Copyright Schalk W. Cronje 2013-2016
 //
 // This software is licensed under the Apache License 2.0
 // See http://www.apache.org/licenses/LICENSE-2.0 for license details

diff --git a/src/main/groovy/org/ysb33r/gradle/gnumake/internal/Executor.groovy b/src/main/groovy/org/ysb33r/gradle/gnumake/internal/Executor.groovy
@@ -1,6 +1,6 @@
 //
 // ============================================================================
-// (C) Copyright Schalk W. Cronje 2013-2015
+// (C) Copyright Schalk W. Cronje 2013-2016
 //
 // This software is licensed under the Apache License 2.0
 // See http://www.apache.org/licenses/LICENSE-2.0 for license details

diff --git a/src/main/groovy/org/ysb33r/gradle/gnumake/internal/InputOutputMonitor.groovy b/src/main/groovy/org/ysb33r/gradle/gnumake/internal/InputOutputMonitor.groovy
@@ -1,6 +1,6 @@
 //
 // ============================================================================
-// (C) Copyright Schalk W. Cronje 2013-2015
+// (C) Copyright Schalk W. Cronje 2013-2016
 //
 // This software is licensed under the Apache License 2.0
 // See http://www.apache.org/licenses/LICENSE-2.0 for license details

diff --git a/src/main/groovy/org/ysb33r/gradle/gnumake/internal/MakeExecutor.groovy b/src/main/groovy/org/ysb33r/gradle/gnumake/internal/MakeExecutor.groovy
@@ -1,6 +1,6 @@
 //
 // ============================================================================
-// (C) Copyright Schalk W. Cronje 2013-2015
+// (C) Copyright Schalk W. Cronje 2013-2016
 //
 // This software is licensed under the Apache License 2.0
 // See http://www.apache.org/licenses/LICENSE-2.0 for license details

diff --git a/src/main/groovy/org/ysb33r/gradle/gnumake/internal/Rules.groovy b/src/main/groovy/org/ysb33r/gradle/gnumake/internal/Rules.groovy
@@ -1,6 +1,6 @@
 //
 // ============================================================================
-// (C) Copyright Schalk W. Cronje 2013-2015
+// (C) Copyright Schalk W. Cronje 2013-2016
 //
 // This software is licensed under the Apache License 2.0
 // See http://www.apache.org/licenses/LICENSE-2.0 for license details

diff --git a/src/main/groovy/org/ysb33r/gradle/gnumake/internal/TaskUtils.groovy b/src/main/groovy/org/ysb33r/gradle/gnumake/internal/TaskUtils.groovy
@@ -1,6 +1,6 @@
 //
 // ============================================================================
-// (C) Copyright Schalk W. Cronje 2013-2015
+// (C) Copyright Schalk W. Cronje 2013-2016
 //
 // This software is licensed under the Apache License 2.0
 // See http://www.apache.org/licenses/LICENSE-2.0 for license details

diff --git a/src/main/groovy/org/ysb33r/gradle/gnumake/internal/TrackerTask.groovy b/src/main/groovy/org/ysb33r/gradle/gnumake/internal/TrackerTask.groovy
@@ -1,6 +1,6 @@
 //
 // ============================================================================
-// (C) Copyright Schalk W. Cronje 2013-2015
+// (C) Copyright Schalk W. Cronje 2013-2016
 //
 // This software is licensed under the Apache License 2.0
 // See http://www.apache.org/licenses/LICENSE-2.0 for license details