Skip to content

Commit

Permalink
Prepare for release
Browse files Browse the repository at this point in the history
  • Loading branch information
aalmiray committed Oct 31, 2020
1 parent dbe1913 commit 3b1d031
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 12 deletions.
24 changes: 24 additions & 0 deletions .github/workflows/gradle.yml
@@ -1,3 +1,27 @@
#
# SPDX-License-Identifier: MIT
#
# Copyright (c) 2015-2020 Andres Almiray.
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
#

name: Build

on: [push, pull_request]
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -8,3 +8,4 @@ out
target
.classpath
.project
.DS_Store
2 changes: 1 addition & 1 deletion README.adoc
Expand Up @@ -4,7 +4,7 @@
:project-repo: maven
:project-name: bootstrapfx
:project-group: org.kordamp.bootstrapfx
:project-version: 0.2.4
:project-version: 0.3.0

image:https://github.com/{project-owner}/{project-name}/workflows/Build/badge.svg["Build Status", link="https://github.com/{project-owner}/{project-name}/actions"]
image:https://api.bintray.com/packages/{project-owner}/{project-repo}/{project-name}-core/images/download.svg[link="https://bintray.com/{project-owner}/{project-repo}/{project-name}-core/_latestVersion"]
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Expand Up @@ -32,8 +32,8 @@ config {
}

licensing {
//mergeStrategy = 'overwrite'
licenses {
inherits = false
license {
id = 'MIT'
primary = true
Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Expand Up @@ -22,14 +22,14 @@
# THE SOFTWARE.
#

version = 0.3.0-SNAPSHOT
version = 0.3.0
group = org.kordamp.bootstrapfx
sourceCompatibility = 1.8
targetCompatibility = 1.8

kordampPluginVersion = 0.40.0
kordampBuildVersion = 1.5.0
kordampPluginVersion = 0.41.0
kordampBuildVersion = 2.0.0

org.gradle.daemon = true
org.gradle.caching = true
org.gradle.parallel = false
org.gradle.parallel = false
4 changes: 2 additions & 2 deletions subprojects/bootstrapfx-core/bootstrapfx-core.gradle
Expand Up @@ -24,11 +24,11 @@

plugins {
id 'java-library'
id 'io.freefair.jsass-java' version '5.2.1'
id 'io.freefair.jsass-java' version '5.3.0'
}

processResources {
// jsass-java includes all *.scsss files in the final JAR
// jsass-java includes all *.scss files in the final JAR
exclude('**/*.scss')
}

Expand Down
4 changes: 2 additions & 2 deletions subprojects/sampler-jpro/sampler-jpro.gradle
Expand Up @@ -37,9 +37,9 @@ config {
}

application {
mainClassName = 'org.kordamp.bootstrapfx.SamplerJPro'
mainClass = 'org.kordamp.bootstrapfx.SamplerJPro'
}

dependencies {
compile project(':sampler')
api project(':sampler')
}
4 changes: 2 additions & 2 deletions subprojects/sampler/sampler.gradle
Expand Up @@ -36,11 +36,11 @@ config {
}

application {
mainClassName = 'org.kordamp.bootstrapfx.Sampler'
mainClass = 'org.kordamp.bootstrapfx.Sampler'
}

dependencies {
api project(':bootstrapfx-core')
api 'org.fxmisc.richtext:richtextfx:0.10.3'
api 'org.fxmisc.richtext:richtextfx:0.10.5'
api 'org.apache.commons:commons-io:1.3.2'
}

0 comments on commit 3b1d031

Please sign in to comment.