diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 000000000..d6a1b30fc --- /dev/null +++ b/.github/workflows/gradle.yml @@ -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 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + - 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 diff --git a/README.adoc b/README.adoc index 9a10be268..e34932a72 100644 --- a/README.adoc +++ b/README.adoc @@ -7,6 +7,7 @@ :project-version: 11.4.0 image:https://img.shields.io/travis/{project-owner}/{project-name}/master.svg?logo=travis["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:https://img.shields.io/badge/license-ASL2-blue.svg?logo=apache["ASL2 Licensed", link="http://opensource.org/licenses/ASL2"] 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}-core.svg?label=maven[link="https://search.maven.org/#search|ga|1|{project-group}"] diff --git a/build.gradle b/build.gradle index 48100227a..61e6cc79b 100644 --- a/build.gradle +++ b/build.gradle @@ -16,10 +16,9 @@ * limitations under the License. */ plugins { - id 'org.kordamp.gradle.kordamp-parentpom' id 'com.google.osdetector' - id 'org.jonnyzzz.java9c' version '0.2.3' apply false - id 'org.javamodularity.moduleplugin' version '1.6.0' apply false + id 'org.jonnyzzz.java9c' apply false + id 'org.javamodularity.moduleplugin' apply false } ext.platform = osdetector.os == 'osx' ? 'mac' : osdetector.os == 'windows' ? 'win' : osdetector.os diff --git a/gradle.properties b/gradle.properties index 7a40c667d..91ba2b48b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,17 +16,18 @@ # limitations under the License. # -version = 11.4.0 +version = 11.5.0-SNAPSHOT group = org.kordamp.ikonli +sourceCompatibility = 11 javafxVersion = 11 jipsyVersion = 0.6.0 jacocoVersion = 0.8.5 osPluginVersion = 1.6.2 -kordampPluginVersion = 0.33.0 -kordampPomVersion = 1.12.0 -gitPluginVersion = 0.3.2 +kordampPluginVersion = 0.34.0 +kordampBuildVersion = 1.0.0 +gitPluginVersion = 2.1.3 deviconsVersion = 1.8.0 dashiconsVersion = 20171213 diff --git a/settings.gradle b/settings.gradle index 75dd42cd2..36ee8d047 100644 --- a/settings.gradle +++ b/settings.gradle @@ -22,23 +22,25 @@ pluginManagement { mavenLocal() } plugins { - id 'org.kordamp.gradle.kordamp-parentpom' version kordampPomVersion - id 'org.kordamp.gradle.guide' version kordampPluginVersion - id 'org.ajoberstar.git-publish' version gitPluginVersion - id 'com.google.osdetector' version osPluginVersion + id 'org.kordamp.gradle.guide' version kordampPluginVersion + id 'org.ajoberstar.git-publish' version gitPluginVersion + id 'com.google.osdetector' version osPluginVersion + id 'org.jonnyzzz.java9c' version '0.2.3' + id 'org.javamodularity.moduleplugin' version '1.6.0' } } buildscript { repositories { gradlePluginPortal() + jcenter() mavenLocal() } dependencies { - classpath "org.kordamp.gradle:settings-gradle-plugin:$kordampPluginVersion" + classpath "org.kordamp.gradle:kordamp-parentbuild:$kordampBuildVersion" } } -apply plugin: 'org.kordamp.gradle.settings' +apply plugin: 'org.kordamp.gradle.kordamp-parentbuild' rootProject.name = 'ikonli'