Skip to content

Commit

Permalink
Update build settings
Browse files Browse the repository at this point in the history
  • Loading branch information
Andres Almiray committed Apr 26, 2020
1 parent f44ce6d commit db59ba7
Show file tree
Hide file tree
Showing 29 changed files with 138 additions and 142 deletions.
31 changes: 31 additions & 0 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Build

on: [push, pull_request]

jobs:
build:
name: Build
runs-on: ubuntu-latest
env:
CI: true
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- uses: actions/cache@v1
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle.properties') }}
restore-keys: |
${{ runner.os }}-gradle-
- uses: actions/cache@v1
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradlew') }}
restore-keys: |
${{ runner.os }}-gradlew-
- uses: eskatos/gradle-command-action@v1
with:
arguments: build -S
17 changes: 9 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
language: java
jdk: openjdk8
services:
- xvfb
before_install:
- sudo apt update
- sudo apt install openjfx
- chmod +x ./gradlew
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
install: true
before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
cache:
directories:
- $HOME/.m2/
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
- $HOME/.sonar/cache/
before_script:
- ./gradlew --version
script: ./gradlew clean build -S
jdk:
- openjdk8
script: ./gradlew build -S
env: TERM=dumb
# after_success:
#  - ./gradlew coveralls
#  - bash <(curl -s https://codecov.io/bash)
11 changes: 6 additions & 5 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
:linkattrs:
:project-owner: kordamp
:project-repo: maven
:project-name: bootstrapfx-core
:project-name: bootstrapfx
:project-group: org.kordamp.bootstrapfx
:project-version: 0.2.4

image:http://img.shields.io/travis/{project-owner}/bootstrapfx/master.svg["Build Status (travis)", link="https://travis-ci.org/{project-owner}/bootstrapfx"]
image:http://img.shields.io/travis/{project-owner}/{project-name}/master.svg["Build Status (travis)", link="https://travis-ci.org/{project-owner}/{project-name}"]
image:https://github.com/{project-owner}/{project-name}/workflows/Build/badge.svg["Build Status", link="https://github.com/{project-owner}/{project-name}/actions"]
image:http://img.shields.io/badge/license-MIT-blue.svg["MIT Licensed", link="http://opensource.org/licenses/MIT"]
image:https://api.bintray.com/packages/{project-owner}/{project-repo}/{project-name}/images/download.svg[link="https://bintray.com/{project-owner}/{project-repo}/{project-name}/_latestVersion"]
image:https://img.shields.io/maven-central/v/{project-group}/{project-name}.svg?label=maven[link="https://search.maven.org/#search|ga|1|{project-group}"]
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"]
image:https://img.shields.io/maven-central/v/{project-group}/{project-name}-core.svg?label=maven[link="https://search.maven.org/#search|ga|1|{project-group}"]
image:https://img.shields.io/badge/donations-Patreon-orange.svg[link="https://www.patreon.com/user?u=6609318"]

---
Expand Down Expand Up @@ -109,7 +110,7 @@ BootstrapFX can be used in a modular fashion when running in Java9+. It's module
You must meet the following requirements:

* JDK8u60 as a minimum
* Gradle 4.10
* Gradle 5.2

You may used the included gradle wrapper script if you don't have `gradle` installed.

Expand Down
42 changes: 35 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: MIT
*
* Copyright (c) 2015-2019 Andres Almiray.
* 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
Expand Down Expand Up @@ -36,6 +36,7 @@ config {
}

licensing {
//mergeStrategy = 'overwrite'
licenses {
license {
id = 'MIT'
Expand All @@ -44,12 +45,14 @@ config {
}
}

javadoc {
options {
links('http://docs.oracle.com/javase/8/docs/api/',
'http://docs.oracle.com/javase/8/javafx/api/')
//docs {
javadoc {
options {
addBooleanOption('javafx', true)
links('http://docs.oracle.com/javase/8/javafx/api/')
}
}
}
//}
}

allprojects {
Expand All @@ -64,5 +67,30 @@ allprojects {
}

subprojects { subproj ->
apply plugin: 'java'
apply plugin: 'java-library'

configurations.all {
resolutionStrategy.force 'com.typesafe.play:twirl-api_2.12:1.3.15',
'commons-codec:commons-codec:1.10',
'org.apache.commons:commons-lang3:3.6',
'org.scala-lang:scala-library:2.12.6',
'org.scala-lang:scala-reflect:2.12.6',
'org.scala-lang.modules:scala-parser-combinators_2.12:1.1.1',
'com.fasterxml.jackson.core:jackson-core:2.8.11',
'com.fasterxml.jackson.core:jackson-annotations:2.8.11',
'com.fasterxml.jackson.core:jackson-databind:2.8.11.1',
'junit:junit:4.12',
'com.google.code.findbugs:jsr305:3.0.2',
'org.seleniumhq.selenium:selenium-api:3.5.3',
'org.seleniumhq.selenium:selenium-support:3.5.3',
'org.seleniumhq.selenium:selenium-remote-driver:3.5.3',
'com.google.guava:guava:23.0',
'com.typesafe.akka:akka-actor_2.12:2.5.17',
'com.typesafe.akka:akka-stream_2.12:2.5.17',
'com.typesafe:config:1.3.3',
'org.slf4j:slf4j-api:1.7.25',
'org.slf4j:jul-to-slf4j:1.7.25',
'org.bouncycastle:bcprov-jdk15on:1.60',
'org.jruby:jruby-complete:9.2.0.0'
}
}
87 changes: 0 additions & 87 deletions config/checkstyle/checkstyle.xml

This file was deleted.

32 changes: 28 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,28 @@
version = 0.2.4
group = org.kordamp.bootstrapfx
sourceCompatibility = 1.8
targetCompatibility = 1.8
#
# SPDX-License-Identifier: MIT
#
# Copyright (c) 2015-2019 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.
#

version = 0.3.0-SNAPSHOT
group = org.kordamp.bootstrapfx
sourceCompatibility = 1.8
targetCompatibility = 1.8
8 changes: 3 additions & 5 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: MIT
*
* Copyright (c) 2015-2019 Andres Almiray.
* 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
Expand All @@ -26,12 +26,14 @@ pluginManagement {
jcenter()
gradlePluginPortal()
maven { url 'https://sandec.bintray.com/repo' }
mavenLocal()
}
}

buildscript {
repositories {
gradlePluginPortal()
jcenter()
mavenLocal()
}
dependencies {
Expand All @@ -41,7 +43,3 @@ buildscript {
apply plugin: 'org.kordamp.gradle.settings'

rootProject.name = 'bootstrapfx'

projects {
directories = ['subprojects']
}
2 changes: 1 addition & 1 deletion subprojects/bootstrapfx-core/bootstrapfx-core.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: MIT
*
* Copyright (c) 2015-2019 Andres Almiray.
* 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: MIT
*
* Copyright (c) 2015-2019 Andres Almiray.
* 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
Expand Down
2 changes: 1 addition & 1 deletion subprojects/sampler-jpro/sampler-jpro.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: MIT
*
* Copyright (c) 2015-2019 Andres Almiray.
* 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: MIT
*
* Copyright (c) 2015-2019 Andres Almiray.
* 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
Expand Down
10 changes: 5 additions & 5 deletions subprojects/sampler/sampler.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: MIT
*
* Copyright (c) 2015-2019 Andres Almiray.
* 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
Expand Down Expand Up @@ -34,7 +34,7 @@ config {
mainClassName = 'org.kordamp.bootstrapfx.Sampler'

dependencies {
compile project(':bootstrapfx-core')
compile 'org.fxmisc.richtext:richtextfx:0.9.2'
compile group: 'org.apache.commons', name: 'commons-io', version: '1.3.2'
}
api project(':bootstrapfx-core')
api 'org.fxmisc.richtext:richtextfx:0.10.3'
api 'org.apache.commons:commons-io:1.3.2'
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: MIT
*
* Copyright (c) 2015-2019 Andres Almiray.
* 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: MIT
*
* Copyright (c) 2015-2019 Andres Almiray.
* 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: MIT
*
* Copyright (c) 2015-2019 Andres Almiray.
* 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
Expand Down
Loading

0 comments on commit db59ba7

Please sign in to comment.