Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/release 1.2.2 #906

Merged
merged 5 commits into from
Jul 8, 2022
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
2 changes: 2 additions & 0 deletions .github/workflows/jgiven_align_gh_pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: get all git data
run: git fetch
- name: Checkout gh-pages
run: git checkout -f gh-pages
- name: Rebase on master
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# v1.2.2
##Fixed issues
* Fixed issue where tags listed all of their ancestors as direct parents [#868](https://github.com/TNG/JGiven/issues/868) (thanks to jadhindieh for reporting)
# v1.2.1
##New features
* JGiven-JUnit5 now reports its test outcomes back to JUnit5 before the `@After` methods, not after them. This should make it easier to run extensions like ReportPortal alongside JUnit5.
Expand Down
3 changes: 0 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,6 @@ subprojects {
slf4jVersion = '1.7.35'
paranamerVersion = '2.8'
jansiVersion = '1.18'
gsonVersion = '2.8.8'
guavaVersion = '30.1.1-jre'
guavaAndroidVersion = '28.1-android'
springVersion = '5.3.19'
jacocoVersion = '0.8.5'
quickcheckVersion = '0.6'
Expand Down
2 changes: 1 addition & 1 deletion jgiven-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ configurations.all {
}

dependencies {
api "com.google.guava:guava:$guavaAndroidVersion"
api 'com.google.guava:guava:28.1-android'
api("net.bytebuddy:byte-buddy-android:$byteBuddyVersion")
api "junit:junit:$junitVersion"
implementation "androidx.appcompat:appcompat:1.4.2"
Expand Down
4 changes: 2 additions & 2 deletions jgiven-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ plugins {
description = "JGiven core module"

dependencies {
api "com.google.guava:guava:$guavaVersion"
api "com.google.code.gson:gson:$gsonVersion"
api 'com.google.guava:guava:31.1-jre'
api 'com.google.code.gson:gson:2.9.0'
implementation "com.thoughtworks.paranamer:paranamer:$paranamerVersion"
implementation "net.bytebuddy:byte-buddy:$byteBuddyVersion"
implementation "org.fusesource.jansi:jansi:$jansiVersion"
Expand Down
4 changes: 2 additions & 2 deletions jgiven-gradle-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ dependencies {
implementation localGroovy()
implementation project(':jgiven-core')
implementation project(':jgiven-html5-report')
implementation "com.google.guava:guava:$guavaVersion"
implementation "com.google.code.gson:gson:$gsonVersion"
implementation 'com.google.guava:guava:31.1-jre'
implementation 'com.google.code.gson:gson:2.9.0'

testImplementation project(':jgiven-junit5')
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
Expand Down
4 changes: 2 additions & 2 deletions jgiven-timing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ description = "Module for injecting automated performance analysis for test meth

dependencies {
implementation project(":jgiven-core")
implementation("com.google.guava:guava:$guavaVersion")
implementation("com.google.guava:guava:31.1-jre")
implementation "net.bytebuddy:byte-buddy-gradle-plugin:$byteBuddyVersion"
implementation "net.bytebuddy:byte-buddy-agent:$byteBuddyVersion"
testImplementation("com.google.guava:guava-testlib:$guavaVersion")
testImplementation("com.google.guava:guava-testlib:31.1-jre")
testImplementation 'org.mockito:mockito-inline:4.6.1'
}

Expand Down
3 changes: 1 addition & 2 deletions scripts/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ updateAllVersionInformation $VERSION

if [ -n "$(git status --porcelain)" ]; then
echo Commiting version change
git add gradle.properties
git commit -m "Update version to $VERSION"
git commit -a -m "Update version to $VERSION"
fi

echo Building, Testing, and Uploading Archives...
Expand Down