diff --git a/CHANGELOG.md b/CHANGELOG.md index ce6fd80..3c5e968 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,14 +4,19 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [0.1.0] - 2017-09-29 +## [0.2.0] - 2018-05-09 ### Added -- execution of health checks on a regular basis -- health check configurations -- custom health checks with groovy scripts -- initial checks for first time installation things +- configurable timers for refresh period of unread messages +- mark messages as read once they are opened + +## [0.1.0] - 2018-02-07 + +### Added +- user messages +- programmatic access to user messages +- messages with entity references ### Dependencies -- CUBA 6.6.x +- CUBA 6.8.x diff --git a/README.md b/README.md index 5f67a40..5cd2056 100644 --- a/README.md +++ b/README.md @@ -12,27 +12,21 @@ This CUBA component gives users a mailbox for user to user and system to user me 1. Add the following maven repository `https://dl.bintray.com/mariodavid/cuba-components` to the build.gradle of your CUBA application: - buildscript { - - //... - - repositories { - - // ... - + + buildscript { + repositories { maven { - url "https://dl.bintray.com/mariodavid/cuba-components" + url "https://dl.bintray.com/mariodavid/cuba-components" } - } - - // ... - } + } + } + 2. Select a version of the add-on which is compatible with the platform version used in your project: | Platform Version | Add-on Version | | ---------------- | -------------- | -| 6.8.x | 0.1.x | +| 6.8.x | 0.1.x - 0.2.x | The latest version is: [ ![Download](https://api.bintray.com/packages/mariodavid/cuba-components/cuba-component-user-inbox/images/download.svg) ](https://bintray.com/mariodavid/cuba-components/cuba-component-user-inbox/_latestVersion) @@ -42,6 +36,11 @@ Add custom application component to your project: * Artifact name: `user-inbox-global` * Version: *add-on version* +```groovy +dependencies { + appComponent("de.diedavids.cuba.userinbox:user-inbox-global:*addon-version*") +} +``` ## Using the inbox as a user diff --git a/build.gradle b/build.gradle index aabad67..7ea76e4 100644 --- a/build.gradle +++ b/build.gradle @@ -13,6 +13,7 @@ buildscript { dependencies { classpath "com.haulmont.gradle:cuba-plugin:$cubaVersion" + classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0" classpath 'net.saliman:gradle-cobertura-plugin:2.5.0' classpath "org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2" @@ -41,7 +42,7 @@ cuba { artifact { group = 'de.diedavids.cuba.userinbox' version = '0.2.0' - isSnapshot = true + isSnapshot = false } tomcat { dir = "$project.rootDir/deploy/tomcat" @@ -61,6 +62,48 @@ cuba { } } + +subprojects { + apply plugin: 'com.jfrog.bintray' + + bintray { + user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('UPLOAD_REPOSITORY_USERNAME') + key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('UPLOAD_REPOSITORY_PASSWORD') + + configurations = ['archives'] + + publish = true + + override = false + + // metadata + pkg { + repo = 'cuba-components' + name = 'cuba-component-user-inbox' + desc = 'CUBA component that gives users a mailbox for user2user and system2user messages' + userOrg = 'mariodavid' + + websiteUrl = 'https://github.com/mariodavid/cuba-component-user-inbox' + issueTrackerUrl = 'https://github.com/mariodavid/cuba-component-user-inbox/issues' + vcsUrl = 'https://github.com/mariodavid/cuba-component-user-inbox.git' + + licenses = ["Apache-2.0"] + + labels = ['user-inbox', 'user-messaging', 'cuba-patform', 'cuba-component'] + githubRepo = 'mariodavid/cuba-component-user-inbox' + githubReleaseNotesFile = 'CHANGELOG.md' + + version { + name = "${cuba.artifact.version}" + desc = '' + released = new Date() + vcsTag = "${cuba.artifact.version}" + } + } + } +} + + dependencies { appComponent("com.haulmont.cuba:cuba-global:$cubaVersion") diff --git a/upload-to-repository.sh b/upload-to-repository.sh index 4e59b74..414ad9c 100755 --- a/upload-to-repository.sh +++ b/upload-to-repository.sh @@ -1,16 +1,5 @@ #!/usr/bin/env bash -if [[ -z "$1" || -z "$2" ]] - then - echo "Define username, password and repository URL as parameters. Usage: ./upload-to-repository.sh myUser myPassword https://api.bintray.com/maven/balvi/..." - else - if [[ -z "$3" ]] - then - ./gradlew -DuploadRepositoryUsername=$1 -DuploadRepositoryPassword=$2 uploadArchives - else - ./gradlew -DuploadRepositoryUsername=$1 -DuploadRepositoryPassword=$2 -DuploadRepositoryRelease=$3 uploadArchives +./gradlew clean assemble bintrayUpload - fi - -fi