Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ jobs:
- name: Build
run: ./gradlew build --warning-mode all

- name: Configure credentials for plugins.gradle.org
run: echo "$GRADLE_PLUGINS_CREDENTIALS" >> $HOME/.gradle/gradle.properties
env:
GRADLE_PLUGINS_CREDENTIALS: ${{ secrets.GRADLE_PLUGINS_CREDENTIALS }}

- name: Publish to plugins.gradle.org
if: ${{ !inputs.skip-deploy-gradle-plugin }}
run: ./gradlew publishPlugins --warning-mode all --info
run: ./gradlew publishPlugins --warning-mode all
env:
GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }}
GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}

- name: Create GitHub Release
run: ./.github/workflows/github_release.sh
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [2.0.0] - 2024-06-11
## [2.0.0] - 2024-06-13

- [PR #44](https://github.com/itsallcode/openfasttrace-gradle/pull/35)
- Upgrade to [OpenFastTrace 4.0.0](https://github.com/itsallcode/openfasttrace/releases/tag/4.0.0)
Expand Down
21 changes: 5 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ git clone https://github.com/itsallcode/openfasttrace-gradle-gradle.git
# Test report: build/reports/tests/index.html
```

### Use `openfasttrace` from source
### Use `openfasttrace` from Source

To use `openfasttrace` from source during development:

Expand All @@ -170,15 +170,6 @@ To use `openfasttrace` from source during development:
oftSourceDir = ../openfasttrace
```

### Using eclipse

Import into eclipse using [buildship](https://projects.eclipse.org/projects/tools.buildship) plugin:

1. Select File > Import... > Gradle > Gradle Project
1. Click "Next"
1. Select Project root directory
1. Click "Finish"

### Check if dependencies are up-to-date

```sh
Expand All @@ -202,12 +193,10 @@ Import into eclipse using [buildship](https://projects.eclipse.org/projects/tool
#### Preparations

1. Checkout the `main` branch, create a new branch.
2. Make sure that property `oftSourceDir` in file `gradle.properties` is commented out, i.e. OpenFastTrace is not used from source.
3. Update version number in `build.gradle` and `README.md`.
4. Add changes in new version to `CHANGELOG.md`.
5. Commit and push changes.
6. Create a new pull request, have it reviewed and merged to `main`.

2. Update version number in `build.gradle` and `README.md`.
3. Add changes in new version to `CHANGELOG.md`.
4. Commit and push changes.
5. Create a new pull request, have it reviewed and merged to `main`.

#### Perform the Release

Expand Down
30 changes: 20 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,6 @@ dependencies {
implementation "org.itsallcode.openfasttrace:openfasttrace-exporter-specobject:$oftVersion"
runtimeOnly "org.itsallcode.openfasttrace:openfasttrace:$oftVersion"
}
testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
testImplementation "org.hamcrest:hamcrest-core:2.2"
testImplementation "com.jparams:to-string-verifier:1.4.8"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
}

def getJavaVersion = {
Expand Down Expand Up @@ -119,12 +114,23 @@ gradlePlugin {
}
}

test {
useJUnitPlatform()
testLogging {
showStandardStreams = logger.isEnabled(LogLevel.INFO)
signing {
def signingKey = findProperty("signingKey")
def signingPassword = findProperty("signingPassword")
useInMemoryPgpKeys(signingKey, signingPassword)
}

testing {
suites {
test {
useJUnitJupiter(junitVersion)
dependencies {
implementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
implementation "org.hamcrest:hamcrest-core:2.2"
implementation "com.jparams:to-string-verifier:1.4.8"
}
}
}
finalizedBy jacocoTestReport
}

test.onlyIf { rootProject.name == 'openfasttrace-gradle' }
Expand All @@ -136,6 +142,10 @@ jacocoTestReport {
}
}

test {
finalizedBy jacocoTestReport
}

project.tasks["sonar"].dependsOn jacocoTestReport

sonarqube {
Expand Down