Skip to content

Commit

Permalink
Getting ready for release
Browse files Browse the repository at this point in the history
  • Loading branch information
aalmiray committed Jul 18, 2016
1 parent bb285eb commit 82f72fc
Show file tree
Hide file tree
Showing 17 changed files with 390 additions and 89 deletions.
12 changes: 12 additions & 0 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,12 @@ $ gradle run
* btn-default, btn-primary, btn-success, btn-info, btn-warning, btn-danger
* btn-lg, btn-sm, btn-xs

=== SplitMenu Buttons

* split-menu-btn
* split-menu-btn-default, split-menu-btn-primary, split-menu-btn-success, split-menu-btn-info, split-menu-btn-warning, split-menu-btn-danger
* split-menu-btn-lg, split-menu-btn-sm, split-menu-btn-xs

=== Labels

* lbl
Expand Down Expand Up @@ -154,6 +160,12 @@ $ gradle run

== Changelog

.0.2.0

* SplitMenu Button support
* Button group support
* `lead` on Text

.0.1.0

* First release
31 changes: 3 additions & 28 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ buildscript {
dependencies {
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3'
classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.1'
classpath 'org.ajoberstar:gradle-git:1.3.2'
classpath 'org.kordamp.gradle:stats-gradle-plugin:0.1.5'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
classpath 'org.kordamp.gradle:stats-gradle-plugin:0.2.0'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0'
}
}

Expand Down Expand Up @@ -37,11 +37,6 @@ subprojects { subproj ->
apply from: rootProject.file('gradle/code-quality.gradle')
apply from: rootProject.file('gradle/javafx.gradle')

configurations {
compileOnly
testCompileOnly
}

subproj.tasks.withType(JavaCompile) {
sourceCompatibility = subproj.sourceCompatibility
targetCompatibility = subproj.targetCompatibility
Expand All @@ -59,24 +54,4 @@ subprojects { subproj ->
dependencies {
compileOnly project.files(project.jfxrtLocation)
}

sourceSets {
main {
compileClasspath += [configurations.compileOnly]
}
test {
compileClasspath += [configurations.testCompileOnly]
}
}

javadoc {
classpath += [configurations.compileOnly]
}

idea {
module {
scopes.PROVIDED.plus += [configurations.compileOnly]
scopes.PROVIDED.plus += [configurations.testCompileOnly]
}
}
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=0.2.0-SNAPSHOT
version=0.2.0
group=org.kordamp.bootstrapfx
sourceCompatibility=1.8
targetCompatibility=1.8
Expand Down
2 changes: 1 addition & 1 deletion gradle/code-coverage.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply plugin: 'jacoco'

jacoco {
toolVersion = '0.7.4.201502262128'
toolVersion = '0.7.7.201606060606'
}

jacocoTestReport {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Nov 24 11:15:19 CET 2015
#Fri Jul 01 14:10:28 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
46 changes: 25 additions & 21 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,30 @@
##
##############################################################################

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

Expand All @@ -30,6 +48,7 @@ die ( ) {
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
Expand All @@ -40,26 +59,11 @@ case "`uname`" in
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

# Determine the Java command to use to start the JVM.
Expand All @@ -85,7 +89,7 @@ location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
Expand Down
8 changes: 4 additions & 4 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

Expand Down Expand Up @@ -46,7 +46,7 @@ echo location of your Java installation.
goto fail

:init
@rem Get command-line arguments, handling Windowz variants
@rem Get command-line arguments, handling Windows variants

if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args
Expand Down
4 changes: 2 additions & 2 deletions subprojects/bootstrapfx-core/bootstrapfx-core.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ task sourcesJar(type: Jar) {
dependencies {
// upgraded dependencies for compass-gradle
jrubyExec 'org.bouncycastle:bcprov-jdk15on:1.54'
jrubyExec 'org.jruby:jruby-complete:9.0.5.0'
jrubyExec 'org.jruby:jruby-complete:9.1.2.0'
}

javadoc {
Expand Down Expand Up @@ -68,4 +68,4 @@ compass {
debugInfo = false
}

classes.dependsOn compassCompile
classes.dependsOn compassCompile
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,39 @@
// --------------------------------------------------
//
.btn-group-horizontal {
-fx-spacing: 0;
> .first {
-fx-border-radius: 4 0 0 4;
-fx-background-radius: 4 0 0 4;
-fx-border-radius: $border-radius-base 0 0 $border-radius-base;
-fx-background-radius: $border-radius-base 0 0 $border-radius-base;
}
> .middle {
-fx-border-radius: 0;
-fx-background-radius: 0;
}
> .last {
-fx-border-radius: 0 4 4 0;
-fx-background-radius: 0 4 4 0;
-fx-border-radius: 0 $border-radius-base $border-radius-base 0;
-fx-background-radius: 0 $border-radius-base $border-radius-base 0;
}
}

.btn-group-vertical {
-fx-spacing: 0;
-fx-alignment: center;
-fx-fill-width: true;
> .first {
-fx-border-radius: 4 4 0 0;
-fx-background-radius: 4 4 0 0;
-fx-border-radius: $border-radius-base $border-radius-base 0 0;
-fx-background-radius: $border-radius-base $border-radius-base 0 0;
}
> .middle {
-fx-border-radius: 0;
-fx-background-radius: 0;
}
> .last {
-fx-border-radius: 0 0 4 4;
-fx-background-radius: 0 0 4 4;
-fx-border-radius: 0 0 $border-radius-base $border-radius-base;
-fx-background-radius: 0 0 $border-radius-base $border-radius-base;
}
}


//// Make the div behave like a button
//.btn-group,
//.btn-group-vertical {
Expand Down
Loading

0 comments on commit 82f72fc

Please sign in to comment.