Skip to content

Commit

Permalink
build: Update build settings
Browse files Browse the repository at this point in the history
  • Loading branch information
aalmiray committed Feb 22, 2024
1 parent e7cd80b commit e24fee3
Show file tree
Hide file tree
Showing 511 changed files with 614 additions and 601 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
if: startsWith(github.event.head_commit.message, 'Releasing version') != true

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Java
uses: actions/setup-java@v4
Expand All @@ -24,4 +24,4 @@ jobs:
cache: gradle

- name: Build
run: ./gradlew build -S
run: ./gradlew build -S
29 changes: 17 additions & 12 deletions .github/workflows/early-access.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,18 @@ jobs:
VERSION: ${{ steps.vars.outputs.VERSION }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: n1hility/cancel-previous-runs@v2
- name: Cancel previous run
uses: styfle/[email protected]
with:
token: ${{ secrets.GITHUB_TOKEN }}
access_token: ${{ secrets.GITHUB_TOKEN }}

- name: Version
id: vars
shell: bash
run: |
echo ::set-output name=VERSION::$(cat VERSION)
echo "VERSION=$(cat VERSION)" >> $GITHUB_OUTPUT
build:
name: Build
Expand All @@ -35,7 +36,7 @@ jobs:
os: [ ubuntu-latest, macos-latest, windows-latest ]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Java
uses: actions/setup-java@v4
Expand All @@ -45,15 +46,15 @@ jobs:
cache: gradle

- name: Build
run: ./gradlew -Prelease=true build
run: ./gradlew -PreproducibleBuild=true build

- name: Assemble
run: ./gradlew -Prelease=true :ikonli-browser:jlinkZip :ikonli-browser:jpackage
run: ./gradlew -PreproducibleBuild=true :ikonli-browser:jlinkZip :ikonli-browser:jpackage

- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: artifacts
name: artifacts-${{ runner.os }}-${{ runner.arch }}
if-no-files-found: ignore
retention-days: 1
path: |
Expand All @@ -71,12 +72,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Download build artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
pattern: jpackage-*
merge-multiple: true
path: artifacts

- name: Release
uses: jreleaser/release-action@v2
Expand All @@ -92,7 +97,7 @@ jobs:

- name: JReleaser output
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: jreleaser-release
path: |
Expand Down
31 changes: 18 additions & 13 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,18 @@ jobs:
VERSION: ${{ steps.vars.outputs.VERSION }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: n1hility/cancel-previous-runs@v2
- name: Cancel previous run
uses: styfle/[email protected]
with:
token: ${{ secrets.GITHUB_TOKEN }}
access_token: ${{ secrets.GITHUB_TOKEN }}

- name: Version
id: vars
shell: bash
run: |
echo ::set-output name=VERSION::${{ github.event.inputs.version }}
echo "VERSION=${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
build:
name: Build
Expand All @@ -38,7 +39,7 @@ jobs:

steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Java
uses: actions/setup-java@v4
Expand All @@ -52,15 +53,15 @@ jobs:
echo ${{ needs.precheck.outputs.VERSION }} > VERSION
- name: Build
run: ./gradlew -Prelease=true build
run: ./gradlew -PreproducibleBuild=true build

- name: Assemble
run: ./gradlew -Prelease=true :ikonli-browser:jlinkZip :ikonli-browser:jpackage
run: ./gradlew -PreproducibleBuild=true :ikonli-browser:jlinkZip :ikonli-browser:jpackage

- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: artifacts
name: artifacts-${{ runner.os }}-${{ runner.arch }}
if-no-files-found: ignore
retention-days: 1
path: |
Expand All @@ -78,12 +79,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Download build artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
pattern: jpackage-*
merge-multiple: true
path: artifacts

- name: Setup Java
uses: actions/setup-java@v4
Expand All @@ -107,7 +112,7 @@ jobs:
./gradlew -Pprofile=release -PreproducibleBuild=true publish -S
- name: Upload deploy artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
retention-days: 7
name: deploy
Expand All @@ -134,7 +139,7 @@ jobs:

- name: JReleaser release output
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: jreleaser-release
path: |
Expand Down
12 changes: 1 addition & 11 deletions apps/ikonli-browser/ikonli-browser.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* Copyright 2015-2023 Andres Almiray
* Copyright 2015-2024 Andres Almiray
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -109,16 +109,6 @@ config {
description = 'Ikonli icon browser'
}

docs {
sourceHtml {
enabled = false
}

sourceXref {
enabled = false
}
}

publishing {
enabled = false
}
Expand Down
2 changes: 1 addition & 1 deletion apps/ikonli-browser/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* Copyright 2015-2023 Andres Almiray
* Copyright 2015-2024 Andres Almiray
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* Copyright 2015-2023 Andres Almiray
* Copyright 2015-2024 Andres Almiray
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* Copyright 2015-2023 Andres Almiray
* Copyright 2015-2024 Andres Almiray
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* Copyright 2015-2023 Andres Almiray
* Copyright 2015-2024 Andres Almiray
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* Copyright 2015-2023 Andres Almiray
* Copyright 2015-2024 Andres Almiray
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* Copyright 2015-2023 Andres Almiray
* Copyright 2015-2024 Andres Almiray
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* Copyright 2015-2023 Andres Almiray
* Copyright 2015-2024 Andres Almiray
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* Copyright 2015-2023 Andres Almiray
* Copyright 2015-2024 Andres Almiray
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* Copyright 2015-2023 Andres Almiray
* Copyright 2015-2024 Andres Almiray
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# SPDX-License-Identifier: Apache-2.0
#
# Copyright 2015-2023 Andres Almiray
# Copyright 2015-2024 Andres Almiray
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
14 changes: 2 additions & 12 deletions apps/sampler-javafx/sampler-javafx.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* Copyright 2015-2023 Andres Almiray
* Copyright 2015-2024 Andres Almiray
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -21,7 +21,7 @@ plugins {

application {
mainModule = 'org.kordamp.ikonli.sampler.javafx'
mainClass = 'org.kordamp.ikonli.sampler.javafx.Sampler'
mainClass = 'org.kordamp.ikonli.sampler.javafx.Sample'
}

dependencies {
Expand Down Expand Up @@ -93,16 +93,6 @@ dependencies {
}

config {
docs {
sourceHtml {
enabled = false
}

sourceXref {
enabled = false
}
}

publishing {
enabled = false
}
Expand Down
2 changes: 1 addition & 1 deletion apps/sampler-javafx/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* Copyright 2015-2023 Andres Almiray
* Copyright 2015-2024 Andres Almiray
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* Copyright 2015-2023 Andres Almiray
* Copyright 2015-2024 Andres Almiray
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
SPDX-License-Identifier: Apache-2.0
Copyright 2015-2023 Andres Almiray
Copyright 2015-2024 Andres Almiray
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
11 changes: 1 addition & 10 deletions apps/sampler-swing/sampler-swing.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* Copyright 2015-2023 Andres Almiray
* Copyright 2015-2024 Andres Almiray
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -85,15 +85,6 @@ dependencies {
}

config {
docs {
sourceHtml {
enabled = false
}
sourceXref {
enabled = false
}
}

publishing {
enabled = false
}
Expand Down
2 changes: 1 addition & 1 deletion apps/sampler-swing/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* Copyright 2015-2023 Andres Almiray
* Copyright 2015-2024 Andres Almiray
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Loading

0 comments on commit e24fee3

Please sign in to comment.