Skip to content
This repository has been archived by the owner on Jun 18, 2022. It is now read-only.

Commit

Permalink
Merge pull request #14 from yakworks/shipyak-upgrade
Browse files Browse the repository at this point in the history
Shipyak upgrade
  • Loading branch information
basejump authored May 8, 2019
2 parents 31110b7 + 6400a98 commit 40ccc4d
Show file tree
Hide file tree
Showing 82 changed files with 4,002 additions and 758 deletions.
69 changes: 29 additions & 40 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,85 +1,74 @@

# circleCI build file
version: 2
jobs:
build:
docker:
# docker image with python and mkdocs on it already as well, based on gradle:4.6-alpine
- image: dock9/gradle:4.6

# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
# documented at https://circleci.com/docs/2.0/circleci-images/
# - image: circleci/postgres:9.4

# branches:
# only:
# - master
- image: yakworks/alpine-java:gradle-4.10.3
# branches:
# only:
# - master

# working_directory: ~/repo

environment:
# Customize the JVM maximum heap limit
# JVM_OPTS: -Xmx3200m
MALLOC_ARENA_MAX: 2
GRADLE_OPTS: "-Xmx3200m -Dorg.gradle.daemon=false" #daemon false doesn't seem to get picked up by fork
GRADLE_OPTS: "-Xmx3048m -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Dorg.gradle.daemon=false" #daemon false doesn't seem to get picked up by fork
TERM: dumb

parallelism: 1
# resource_class: large

steps:
- checkout

# Download and cache dependencies
- run:
name: cat build.gradle files for cache key
command: cat gradle.properties build.gradle plugin/build.gradle examples/app/build.gradle > cache-checksum.tmp
- restore_cache:
keys:
- v3-gradle-{{ checksum "build.gradle" }}
- gradle-{{ checksum "cache-checksum.tmp" }}

# see https://github.com/palantir/gradle-configuration-resolver-plugin
- run: ./gradlew resolveConfigurations
#- run: ./gradlew test-app:dependencies
# this also kind of helps with the memory issue we keep running into by breaking it up
- run:
name: ✔︎ -- Downloads Dependencies [gradle resolveConfigurations]
command: gradle resolveConfigurations --no-daemon

# compiling as a seperate step before running check helps with the "finished with non-zero exit value 137" error
- run:
name: ✔︎ -- Compile [gradle classes]
command: gradle classes --no-daemon

- save_cache:
paths:
- /home/gradle # the https://hub.docker.com/_/gradle/ containter does wierd stuff for cache
- ~/.m2
- ~/.gradle
key: v3-gradle-{{ checksum "build.gradle" }}

# - add_ssh_keys:
# fingerprints:
# - "32:15:5c:47:98:e9:3f:09:f9:32:c9:22:00:cc:15:9a"
key: gradle-{{ checksum "cache-checksum.tmp" }}

#- run: gradle build -s && gradle ciPublish
- run:
name: gradle check tests. skips if only docs were changed
command: |
commitRange=$(echo "$CIRCLE_COMPARE_URL" | rev | cut -d/ -f1 | rev)
if [[ -z "$commitRange" || $(git diff --name-only $commitRange | grep --invert-match -E "(README\.md|mkdocs\.yml|docs/)") ]]; then
./gradlew check
fi
- run: ./gradlew ciPublish

name: ✔︎ -- Checks Linter and Tests [gradle check]
command: gradle check --no-daemon
- store_artifacts:
path: plugin/build/reports/tests/test/
destination: test-reports/unit/

- store_artifacts:
path: plugin/build/reports/codenarc/
destination: codenarc/

- store_test_results:
path: plugin/build/test-results

# - run: gradle test-app:check --no-daemon --max-workers 2

- store_artifacts:
path: examples/test-app/build/reports/tests
path: examples/app/build/reports/tests
destination: test-reports/integration

- store_test_results:
path: examples/test-app/build/test-results
path: examples/app/build/test-results

### Finally do the build and publish. ciPublish will check if this is a PR or on a branch that should not be published
- run:
name: ✔︎ -- Publish Library if needed [gradle ciPublish]
command: gradle ciPublish --no-daemon


# - run: ./.circleci/publish.sh
65 changes: 31 additions & 34 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,54 +1,51 @@
#################
# Common Settings
#################

# This file is the top-most EditorConfig file
root = true

# All Files
[*]
charset = utf-8
end_of_line = lf
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
max_line_length=100

[*.coffee]
indent_style = space
indent_size = 2

[*.js]
indent_style = space
indent_size = 2
max_line_length = 120
insert_final_newline = true
trim_trailing_whitespace = true

[{*.yml,*.yaml}]
indent_style = space
indent_size = 2
#########################
# File Extension Settings
#########################

[*.css]
indent_style = space
indent_size = 2
# Various XML/json Configuration Files
[*.{xml,json,json5,yml,yaml,ruleset}]
max_line_length = off

[*.styl]
indent_style = space
indent_size = 2
# Markdown Files
[*.md]
trim_trailing_whitespace = false

[*.html]
indent_style = space
indent_size = 4
[*.properties]
trim_trailing_whitespace = false
max_line_length = off

[*.groovy]
indent_style = space
indent_size = 4
# Web Files
[*.{htm,html,js,ts,tsx,css,sass,scss,less,svg,vue,coffee,stylintrc}]
indent_size = 2

[*.gsp]
# java groovy
[*.{groovy,java,gsp,jsp,kt,kts}]
indent_style = space
indent_size = 4
continuation_indent_size = 8

[*.gradle]

# python
[*.py]
indent_style = space
indent_size = 4

[*.md]
trim_trailing_whitespace = false

# Stylint - https://rosspatton.github.io/stylint/
[{package.json,.stylintrc}]
indent_size = 2

[*.json]
indent_size = 2
89 changes: 62 additions & 27 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
build

# web application files
/web-app
/web-app/WEB-INF/classes

# default HSQL database files for production mode
/prodDb.*
Expand Down Expand Up @@ -43,37 +43,75 @@ logs
/web-app/plugins

# "temporary" build files
**/target
/out
#**/target
**/out

### Java template
*.class
*.asscache
# Mobile Tools for Java (J2ME)
.mtj.tmp/

### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
*.iml
## Directory-based project format:
# .idea/
# if you remove the above rule, at least ignore the following:

# JetBrains User-specific stuff:
.idea/workspace.xml
.idea/tasks.xml
.idea/dictionaries
.idea/dataSources.ids
.idea/dataSources.xml
.idea/dynamic.xml
.idea/uiDesigner.xml
.idea/gradle.xml
.idea/libraries

# from https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore
#### IDEA
.idea/artifacts
.idea/modules.xml
.idea/vcs.xml
.idea/modules
.idea/**/mongoSettings.xmlout/
.idea/.name
.idea/encodings.xml
.idea/misc.xml
.idea/compiler.xml
.idea/**/workspace.xml
.idea/inspectionProfiles/Project_Default.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf
# Generated files
.idea/**/contentModel.xml
# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml
# Gradle
.idea/**/gradle.xml
.idea/**/libraries
# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# CMake
cmake-build-*/
# Mongo Explorer plugin
.idea/**/mongoSettings.xml
# File-based project format
*.iws
# IntelliJ
out/
# mpeltonen/sbt-idea plugin
.idea_modules/
# JIRA plugin
atlassian-ide-plugin.xml
# Cursive Clojure plugin
.idea/replstate.xml
# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties
# Editor-based Rest Client
.idea/httpRequests
# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

### Eclipse template
*.pydevproject
Expand All @@ -88,8 +126,6 @@ tmp/
local.properties
.settings/
.loadpath
.grails/*
build/*

# Eclipse Core
.project
Expand All @@ -100,7 +136,6 @@ build/*
# Locally stored "Eclipse launch configurations"
*.launch


# JDT-specific (Eclipse Java Development Tools)
.classpath

Expand Down Expand Up @@ -142,6 +177,6 @@ sftp-config.json
Session.vim
.netrwhist

.idea/misc.xml
.idea/modules.xml
.idea/vcs.xml

/web-app/
/site/*
Empty file added CHANGELOG.md
Empty file.
17 changes: 11 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
![CircleCI](https://img.shields.io/circleci/project/github/yakworks/grails-jasper-reports.svg?longCache=true&style=for-the-badge)
[![CircleCI](https://img.shields.io/circleci/project/github/yakworks/grails-jasper-reports/master.svg?longCache=true&style=for-the-badge&logo=circleci)](https://circleci.com/gh/yakworks/grails-jasper-reports)
[![9ci](https://img.shields.io/badge/BUILT%20BY-9ci%20Inc-blue.svg?longCache=true&style=for-the-badge)](http://9ci.com)

see branch and versions 3.0.x - Works with Grails 3.2.x

version 3.0.x - Works with Grails 3.2.x
version 3.1.x - is for grails 3.3.x
Install for grails 3.3.x

```
compile "org.grails.plugins:jasper-reports:3.1.2"
```


## Table of Contents
Expand Down Expand Up @@ -63,9 +68,9 @@ It is also possible to render reports programmatically using ```JasperService```
class ReportController {
import nine.jasper.JasperService
import nine.jasper.spring.JasperReportDef
import nine.reports.ReportFormat
import yakworks.jasper.JasperService
import yakworks.jasper.spring.JasperReportDef
import yakworks.reports.ReportFormat
def generate(String name) {
Expand Down
14 changes: 2 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,11 @@ buildscript {
}
dependencies {
classpath "org.grails:grails-gradle-plugin:$grailsVersion"
classpath "org.yakworks:gradle-plugins:0.1.45"
classpath "org.yakworks:gradle-plugins:1.1.3"
}
}

apply plugin: 'yakworks.shipkit'

repositories {
mavenLocal()
maven { url "https://repo.grails.org/grails/core" }
maven { url "http://repo.9ci.com/oss-snapshots" }
}
apply plugin: 'yakworks.shipyak'

subprojects {
apply plugin: 'groovy'
Expand All @@ -40,10 +34,6 @@ subprojects {

runtime "com.h2database:h2"

compile "org.grails.plugins:hibernate5"
compile "org.hibernate:hibernate-core:$versionHibernate"
compile "org.hibernate:hibernate-ehcache:$versionHibernate"

testCompile "org.grails:grails-plugin-testing"

testCompile "org.grails:grails-gorm-testing-support"
Expand Down
Loading

0 comments on commit 40ccc4d

Please sign in to comment.