Skip to content

Commit

Permalink
build: use plugins from 'hedera-gradle-conventions'
Browse files Browse the repository at this point in the history
Signed-off-by: Jendrik Johannes <[email protected]>
  • Loading branch information
jjohannes committed Oct 11, 2024
1 parent 845c93d commit 287af73
Show file tree
Hide file tree
Showing 48 changed files with 525 additions and 1,231 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/flow-deploy-release-artifact.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -147,16 +147,22 @@ jobs:
env:
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
run: |
./gradlew releaseMavenCentral -PpublishSigningEnabled=true --no-configuration-cache --scan
- name: Gradle Plugin Portal Release
if: ${{ needs.prepare-release.outputs.mode == 'specified' && !cancelled() && !failure() }}
working-directory: ${{ env.PBJ_CORE }}
env:
GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }}
GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}
run: |
./gradlew release --no-parallel --scan -PpublishSigningEnabled=true \
-Pgradle.publish.key=${GRADLE_PUBLISH_KEY} -Pgradle.publish.secret=${GRADLE_PUBLISH_SECRET}
./gradlew publishPlugins -PpublishSigningEnabled=true --no-configuration-cache --scan
- name: Gradle Maven Central Snapshot
if: ${{ needs.prepare-release.outputs.mode == 'snapshot' && !cancelled() && !failure() }}
working-directory: ${{ env.PBJ_CORE }}
env:
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
run: ./gradlew releaseSnapshot --no-parallel --scan -PpublishSigningEnabled=true
run: ./gradlew releaseSnapshot --scan -PpublishSigningEnabled=true
9 changes: 0 additions & 9 deletions .github/workflows/zxc-compile-pbj-code.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,15 +121,6 @@ jobs:
# project-token: ${{ secrets.codacy-project-token }}
# coverage-reports: ${{ env.PBJ_CORE }}/pbj-compiler/build/reports/jacoco/test/jacocoTestReport.xml, ${{ env.PBJ_CORE }}/pbj-runtime/build/reports/jacoco/test/jacocoTestReport.xml

- name: Gradle Maven Local (PBJ Core)
id: gradle-publish-local
uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa # v2.12.0
if: ${{ (inputs.enable-integration-tests || inputs.enable-jmh-tests) && steps.gradle-build.conclusion == 'success' && !cancelled() }}
with:
gradle-version: ${{ inputs.gradle-version }}
build-root-directory: ${{ env.PBJ_CORE }}
arguments: publishToMavenLocal --scan

- name: Gradle Assemble (PBJ Integration)
id: gradle-integration-build
uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa # v2.12.0
Expand Down
1 change: 1 addition & 0 deletions pbj-core/developers.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
jasper.potts@swirldslabs.com=Jasper Potts
13 changes: 3 additions & 10 deletions pbj-core/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
# Version number
version=0.9.5-SNAPSHOT
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8

# Need increased heap for running Gradle itself, or SonarQube will run the JVM out of metaspace
org.gradle.jvmargs=-Xmx2048m

# Enable Gradle Caching
# Enable Gradle Caching and Parallelism
org.gradle.caching=true

org.gradle.configuration-cache=true
org.gradle.parallel=true

# Disable publish signing by default
publishSigningEnabled=false
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2022-2023 Hedera Hashgraph, LLC
* Copyright (C) 2024 Hedera Hashgraph, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,5 +15,10 @@
*/

plugins {
id("com.hedera.pbj.root")
id("com.hedera.gradle.base.lifecycle")
id("com.hedera.gradle.report.code-coverage")
}

dependencies {
implementation(project(":pbj-grpc-helidon"))
}
1 change: 1 addition & 0 deletions pbj-core/gradle/jdk-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
21.0.4
8 changes: 0 additions & 8 deletions pbj-core/gradle/modules.properties

This file was deleted.

32 changes: 0 additions & 32 deletions pbj-core/gradle/plugins/build.gradle.kts

This file was deleted.

83 changes: 0 additions & 83 deletions pbj-core/gradle/plugins/src/main/kotlin/Utils.kt

This file was deleted.

This file was deleted.

Loading

0 comments on commit 287af73

Please sign in to comment.