diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d8d6fc39..041eec92 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,7 +78,7 @@ jobs: cache: gradle - name: Publish snapshot to oss.sonatype.org - run: ./gradlew publish :flatlaf-theme-editor:build -Dorg.gradle.internal.publish.checksums.insecure=true + run: ./gradlew publish :flatlaf-theme-editor:build -PskipFonts -Dorg.gradle.internal.publish.checksums.insecure=true env: OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} @@ -114,7 +114,7 @@ jobs: cache: gradle - name: Release a new stable version to Maven Central - run: ./gradlew publish :flatlaf-demo:build :flatlaf-theme-editor:build -Drelease=true + run: ./gradlew publish :flatlaf-demo:build :flatlaf-theme-editor:build -PskipFonts -Prelease env: OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} diff --git a/.github/workflows/fonts.yml b/.github/workflows/fonts.yml index f48e27a1..0302f0a3 100644 --- a/.github/workflows/fonts.yml +++ b/.github/workflows/fonts.yml @@ -1,4 +1,5 @@ -# https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle +# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions +# https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle name: Fonts @@ -11,23 +12,23 @@ on: paths: - 'flatlaf-fonts/**' - '.github/workflows/fonts.yml' + - 'gradle/wrapper/gradle-wrapper.properties' jobs: - Release: - runs-on: ubuntu-latest - if: | - github.event_name == 'push' && - github.repository == 'JFormDesigner/FlatLaf' - + Fonts: strategy: matrix: font: - inter - jetbrains-mono + runs-on: ubuntu-latest + if: | + github.event_name == 'push' && + github.repository == 'JFormDesigner/FlatLaf' + steps: - uses: actions/checkout@v3 - if: startsWith( github.ref, format( 'refs/tags/fonts/{0}-', matrix.font ) ) - name: Setup Java 11 uses: actions/setup-java@v3 @@ -35,10 +36,20 @@ jobs: java-version: 11 distribution: adopt # pre-installed on ubuntu-latest cache: gradle - if: startsWith( github.ref, format( 'refs/tags/fonts/{0}-', matrix.font ) ) + + - name: Build with Gradle + run: ./gradlew :flatlaf-fonts-${{ matrix.font }}:build + if: startsWith( github.ref, format( 'refs/tags/fonts/{0}-', matrix.font ) ) != true + + - name: Publish snapshot to oss.sonatype.org + run: ./gradlew :flatlaf-fonts-${{ matrix.font }}:publish -Dorg.gradle.internal.publish.checksums.insecure=true + env: + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + if: github.ref == 'refs/heads/main' || startsWith( github.ref, 'refs/heads/develop-' ) - name: Release a new stable version to Maven Central - run: ./gradlew :flatlaf-fonts-${{ matrix.font }}:build :flatlaf-fonts-${{ matrix.font }}:publish -Drelease=true + run: ./gradlew :flatlaf-fonts-${{ matrix.font }}:build :flatlaf-fonts-${{ matrix.font }}:publish -Prelease env: OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} diff --git a/build.gradle.kts b/build.gradle.kts index 4db85c98..7089c20c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,7 +17,7 @@ val releaseVersion = "2.6" val developmentVersion = "3.0-SNAPSHOT" -version = if( java.lang.Boolean.getBoolean( "release" ) ) releaseVersion else developmentVersion +version = if( rootProject.hasProperty( "release" ) ) releaseVersion else developmentVersion allprojects { version = rootProject.version diff --git a/buildSrc/src/main/kotlin/flatlaf-publish.gradle.kts b/buildSrc/src/main/kotlin/flatlaf-publish.gradle.kts index d9005d39..074110f6 100644 --- a/buildSrc/src/main/kotlin/flatlaf-publish.gradle.kts +++ b/buildSrc/src/main/kotlin/flatlaf-publish.gradle.kts @@ -80,7 +80,7 @@ publishing { val releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" val snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/" - url = uri( if( java.lang.Boolean.getBoolean( "release" ) ) releasesRepoUrl else snapshotsRepoUrl ) + url = uri( if( rootProject.hasProperty( "release" ) ) releasesRepoUrl else snapshotsRepoUrl ) credentials { // get from gradle.properties @@ -108,5 +108,5 @@ signing { // disable signing of snapshots tasks.withType().configureEach { - onlyIf { java.lang.Boolean.getBoolean( "release" ) } + onlyIf { rootProject.hasProperty( "release" ) } } diff --git a/flatlaf-fonts/flatlaf-fonts-inter/build.gradle.kts b/flatlaf-fonts/flatlaf-fonts-inter/build.gradle.kts index c55a7588..9f052d03 100644 --- a/flatlaf-fonts/flatlaf-fonts-inter/build.gradle.kts +++ b/flatlaf-fonts/flatlaf-fonts-inter/build.gradle.kts @@ -20,6 +20,10 @@ // necessary, but the has not changed. version = "3.19" +if( !rootProject.hasProperty( "release" ) ) + version = version.toString() + "-SNAPSHOT" + + plugins { `java-library` `flatlaf-module-info` @@ -38,6 +42,10 @@ java { } tasks { + all { + onlyIf { !rootProject.hasProperty( "skipFonts" ) } + } + named( "sourcesJar" ) { exclude( "**/*.ttf", "**/*.otf" ) } diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/build.gradle.kts b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/build.gradle.kts index e72cabc7..ada0b743 100644 --- a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/build.gradle.kts +++ b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/build.gradle.kts @@ -20,6 +20,10 @@ // necessary, but the has not changed. version = "2.242" +if( !rootProject.hasProperty( "release" ) ) + version = version.toString() + "-SNAPSHOT" + + plugins { `java-library` `flatlaf-module-info` @@ -38,6 +42,10 @@ java { } tasks { + all { + onlyIf { !rootProject.hasProperty( "skipFonts" ) } + } + named( "sourcesJar" ) { exclude( "**/*.ttf", "**/*.otf" ) }