Merge pull request #7 from progress/develop

Merge dev changes with Master branch

.gitlab-ci.yml

@@ -31,7 +31,7 @@ apidocs:
     paths:
       - build/docs/
   only:
-    - master@grabl/grabl
+    - master@latte/latte
 
 # Use the generated build output to run the tests.
 test:
@@ -58,4 +58,4 @@ pages:
     paths:
       - public
   only:
-    - master@grabl/grabl
+    - master@latte/latte

CHANGELOG.md

@@ -4,43 +4,48 @@ All notable changes to this project will be documented in this file.
 
 The format is inspired by
 [git changelog](https://github.com/tj/git-extras/blob/master/Commands.md#git-changelog)
-and [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).  This project
+and [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). This project
 adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## v0.2.1 / 2019-11-04
+
+- Peformance enhancements
+- README updates
+
 ## v0.2.0 / 2019-08-20
 
-Created a Progress fork of [grabl"](https://gitlab.com/grabl/) called latte.
+Created a Progress fork of [grabl](https://gitlab.com/grabl/) called [latte](https://github.com/progress/latte/).
 
 ## v0.1.0 / 2017-12-29
 
-See [grabl/grabl%"v0.1.0"](https://gitlab.com/grabl/grabl/milestones/2).
+See [grabl/grabl"v0.1.0"](https://gitlab.com/grabl/grabl/milestones/2).
 
 ### Added
 
-  * Add support for build scans
+- Add support for build scans
 
 ### Changed
 
-  * Split plugin into base and convention
-  * Upgrade gradle wrapper to 4.4.1
+- Split plugin into base and convention
+- Upgrade gradle wrapper to 4.4.1
 
 ### Fixed
 
-  * Make sure release runs before publishing
-  * Configure nebula.release to produce versions compatible with Gradle
-    Plugin Portal
-  * Avoid eagerly resolving `pct` configuration
+- Make sure release runs before publishing
+- Configure nebula.release to produce versions compatible with Gradle
+  Plugin Portal
+- Avoid eagerly resolving `pct` configuration
 
 ## v0.0.0 / 2017-11-22
 
-See [grabl/grabl%"v0.0.0"](https://gitlab.com/grabl/grabl/milestones/1).
+See [grabl/grabl"v0.0.0"](https://gitlab.com/grabl/grabl/milestones/1).
 
 ### Added
 
-  * Add release management using nebula.release plugin
-  * Publish plugin to the Gradle Plugins Portal as
-    [latte](https://plugins.gradle.org/plugin/oe.espresso.latte.latte)
-  * Build in GitLab-CI so bad commits / MRs are spotted early
-  * Provide CompileAblTask, grabl extension (configuration point)
-  * Add PCT tasks and types to project it's applied to
-  * Initial release of Gradle plugin
+- Add release management using nebula.release plugin
+- Publish plugin to the Gradle Plugins Portal as
+  [latte](https://plugins.gradle.org/plugin/oe.espresso.latte.latte)
+- Build in GitLab-CI so bad commits / MRs are spotted early
+- Provide CompileAblTask, grabl extension (configuration point)
+- Add PCT tasks and types to project it's applied to
+- Initial release of Gradle plugin

HACKING.md

@@ -25,4 +25,4 @@ so publishing is as simple as:
 See also [Plugin Publishing Guide](https://guides.gradle.org/publishing-plugins-to-gradle-plugin-portal/)
 
 
-[issues]: https://gitlab.com/grabl/grabl/issues
+[issues]: https://github.com/progress/latte/issues

README.md

@@ -1,73 +1,70 @@
 [![pipeline status][pipeline-img]][pipeline-target] [![coverage report][coverage-img]][coverage-target]
 
-# Latte #
+# Latte
 
-Progress fork of this project to enhance and support package updates - May2019
-
-[Latte] = Progress fork of [Grabl][]
-[Gradle] + [(OpenEdge) ABL][OpenEdge] = [grabl][] (powered-by
-[Riverside-Software PCT][PCT])
+This is a Progress fork of the [Grabl](https://gitlab.com/grabl) project to enhance and support package updates.
 
 [Latte] is a plugin for [Gradle] providing language support for
-[OpenEdge ABL][OpenEdge].  It provides gradle tasks to compile ABL code
-and run unit tests using ABLUnit.  All the hard work is done by [PCT],
+[OpenEdge ABL][openedge]. It provides gradle tasks to compile ABL code
+and run unit tests using ABLUnit. All the hard work is done by [PCT],
 thanks to gradle's fantastic integration with [Ant].
 
-## Usage ##
+## Usage
 
 [Latte] is hosted in the [Gradle Plugin Portal][grportal-grabl] so you
 can use it by just adding this to your `build.gradle`:
 
-
-``` groovy
+```groovy
 plugins {
-  id "oe.espresso.latte.latte" version "0.2.0"
+  id "oe.espresso.latte.latte" version "0.2.1"
 }
 ```
 
 This will add [PCT][] tasks and types to your project and integrate
 [PCT] with [Gradle] lifecycle tasks. It does this by modifying the
-[Gradle] project model.  
+[Gradle] project model.
 
 The following are a list of enhancements beyond the original [grabl] plugin
 
- - adds a dependency on [PCT] 211
- - adds a dependency on Google gson 2.8.0 which is required by PCT
-   ABLUnit task
- - adds a backup database task
- - adds the ability to run ABL code as a task
- - adds ability to create a database
+- adds a dependency on [PCT] 211
+- adds a dependency on Google gson 2.8.0 which is required by PCT ABLUnit task
+- adds a backup database task
+- adds the ability to run ABL code as a task
+- adds the ability to create a database
+- adds the ability to create procedure libraries
+- adds the ability to create .oear's
+
+## Links
 
-## Links ##
+# NEEDS TO BE UPDATED WHEN
 
 - [Home Page, Docs, Guides][grabl]
 - [Plugin Portal][grportal-grabl]
 - [Plugin Portal (base)][grportal-grabl-base]
 - [Examples Repo](https://gitlab.com/grabl/grabl-samples)
 
-## Contributing ##
+## Contributing
 
 Want to suggest a feature or report a bug? Head to [issue tracker][issues].
 
 Code contributions are very welcome, please check out [hacking][] notes.
 
-## License ##
-
-grabl is free and open-source software licensed under the
-[Apache License 2.0](https://github.com/dambenso/Progress-Grabl/LICENSE)
-
+## License
 
+latte and grabl are free and open-source software licensed under the
+[Apache License 2.0](https://github.com/progress/latte/LICENSE)
 
-[Gradle]: https://gradle.org/
-[OpenEdge]: https://www.progress.com/openedge
+[gradle]: https://gradle.org/
+[openedge]: https://www.progress.com/openedge
+[latte]: https://github.com/progress/latte
 [grabl]: https://grabl.gitlab.io/
-[PCT]: https://github.com/Riverside-Software/pct
-[Ant]: http://ant.apache.org/
-[issues]: https://gitlab.com/grabl/grabl/issues
+[pct]: https://github.com/Riverside-Software/pct
+[ant]: http://ant.apache.org/
+[issues]: https://github.com/progress/latte/issues
 [hacking]: HACKING.md
 [pipeline-img]: https://gitlab.com/grabl/grabl/badges/master/pipeline.svg
 [pipeline-target]: https://gitlab.com/grabl/grabl/commits/master
 [coverage-img]: https://gitlab.com/grabl/grabl/badges/master/coverage.svg
 [coverage-target]: https://grabl.gitlab.io/grabl/reports/clover/html/
-[grportal-grabl]: https://plugins.gradle.org/plugin/oe.espresso.latte.grabl
-[grportal-grabl-base]: https://plugins.gradle.org/plugin/oe.espresso.latte.grabl-base
+[grportal-grabl]: https://plugins.gradle.org/plugin/oe.espresso.latte
+[grportal-grabl-base]: https://plugins.gradle.org/plugin/oe.espresso.latte-base

build.gradle

@@ -19,11 +19,11 @@ plugins {
     id "groovy"
 }
 
-version = "0.2.0"
+version = "0.2.1"
 group = 'oe.espresso.latte'
 
 ext {
-    vcsBaseUrl = 'https://github.com/dambenso/Progress-Grabl'
+    vcsBaseUrl = 'https://github.com/progress/latte'
 }
 
 repositories {
@@ -98,7 +98,7 @@ def pluginList = [
 ]
 
 pluginBundle {
-    website = 'https://github.com/dambenso/Progress-Grabl'
+    website = 'https://github.com/progress/latte'
     vcsUrl = vcsBaseUrl
     tags = ['abl', 'pct']
 }

src/main/groovy/oe/espresso/latte/BaseLatteSourceTask.groovy

@@ -4,7 +4,7 @@
 
 package oe.espresso.latte
 
-import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.SourceTask
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.Internal
@@ -23,7 +23,7 @@ abstract class BaseLatteSourceTask extends SourceTask {
         defaults to using dlcHome value of extension
         if not specified
     */
-    @InputDirectory @Optional
+    @Input @Optional
     File dlcHome = ext.dlcHome
 
     /**

src/main/groovy/oe/espresso/latte/BaseLatteTask.groovy

@@ -3,7 +3,7 @@
 */
 package oe.espresso.latte
 
-import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.Input
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.Internal
@@ -26,7 +26,7 @@ abstract class BaseLatteTask extends DefaultTask {
         defaults to using dlcHome value of extension
         if not specified
     */
-    @InputDirectory @Optional
+    @Input @Optional
     File dlcHome = ext.dlcHome
 
     /**