Skip to content

Commit

Permalink
Update version and changelog
Browse files Browse the repository at this point in the history
Signed-off-by: Andru Stefanescu <[email protected]>
  • Loading branch information
andru47 committed Aug 18, 2021
1 parent 37f54d6 commit 4f70c7e
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/jgiven_android_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: 29
script: source scripts/helper_functions.sh && runAndroidTestOnGivenProject jgiven-android-test/build.gradle 1.0-t && runAndroidTestOnGivenProject example-projects/android/build.gradle 1.0-t
script: source scripts/helper_functions.sh && runAndroidTestOnGivenProject jgiven-android-test/build.gradle 1.1-t && runAndroidTestOnGivenProject example-projects/android/build.gradle 1.1-t
- name: Upload test results html files
continue-on-error: true
if: ${{failure()}}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/jgiven_examples_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@ jobs:
- name: Load the bash script
run: source scripts/local_release_with_version.sh
- name: Test Kotlin Example Project
run: source scripts/helper_functions.sh && runGradleTestOnGivenProject example-projects/kotlin/build.gradle 1.0-t
run: source scripts/helper_functions.sh && runGradleTestOnGivenProject example-projects/kotlin/build.gradle 1.1-t
- name: Test JUnit5 Example Project
run: source scripts/helper_functions.sh && runGradleTestOnGivenProject example-projects/junit5/build.gradle 1.0-t
run: source scripts/helper_functions.sh && runGradleTestOnGivenProject example-projects/junit5/build.gradle 1.1-t
- uses: olafurpg/setup-scala@v13
- name: Test Scala Example Project
run: source scripts/helper_functions.sh && runScalaTest
- name: Test Selenium Example Project
run: source scripts/helper_functions.sh && runGradleTestOnGivenProject example-projects/selenium/build.gradle 1.0-t
run: source scripts/helper_functions.sh && runGradleTestOnGivenProject example-projects/selenium/build.gradle 1.1-t
- name: Test Spock Example Project
run: source scripts/helper_functions.sh && runGradleTestOnGivenProject example-projects/spock/build.gradle 1.0-t
run: source scripts/helper_functions.sh && runGradleTestOnGivenProject example-projects/spock/build.gradle 1.1-t
- name: Test Spring-Boot Example Project
run: source scripts/helper_functions.sh && runGradleTestOnGivenProject example-projects/spring-boot/build.gradle 1.0-t
run: source scripts/helper_functions.sh && runGradleTestOnGivenProject example-projects/spring-boot/build.gradle 1.1-t
- name: Test TestNG Example Project
run: source scripts/helper_functions.sh && runGradleTestOnGivenProject example-projects/testng/build.gradle 1.0-t
run: source scripts/helper_functions.sh && runGradleTestOnGivenProject example-projects/testng/build.gradle 1.1-t
- name: Test Maven Example Project
run: source scripts/helper_functions.sh && runMavenTestOnGivenProject example-projects/maven/pom.xml 1.0-t
run: source scripts/helper_functions.sh && runMavenTestOnGivenProject example-projects/maven/pom.xml 1.1-t
- name: Upload test results html files
continue-on-error: true
if: ${{failure()}}
Expand All @@ -58,7 +58,7 @@ jobs:
- name: Load the bash script
run: source scripts/local_release_with_version.sh
- name: Test Java 11 Project
run: source scripts/helper_functions.sh && runMavenTestOnGivenProject example-projects/java11/pom.xml 1.0-t
run: source scripts/helper_functions.sh && runMavenTestOnGivenProject example-projects/java11/pom.xml 1.1-t
- name: Upload test results html files
continue-on-error: true
if: ${{failure()}}
Expand Down
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
# v1.1
## New features
* The lifecycle method annotations `@BeforeStage` and `@AfterStage` have an option to make the associated methods be invoked repeatedly if the stage class is invoked multiple times. Note that the duration of a stage is denoted by the change of the stage class, thus multiple invocations (no matter the form) on the same stage class count as one stage.
* The field annotations `@ScenarioState` and `@ProvidedScenarioState` can be set to be `guaranteed`. This ensures that the stage that is declaring such field must operate on it during execution and after the stage finishes the field is ensured to be initialized.
* The field annotations `@ScenarioState` and `@ProvidedScenarioState` can be set to be `guaranteed`. This ensures that the stage that is declaring such field must operate on it during execution and after the stage finishes the field is ensured to be initialized.
* JGiven supports now an optional properties file, `jgiven.properties`, which can be used to set some settings for the report generation, such as: `enabled`, `directory`, `text.color`.
* Added an internal module for injecting automated performance analysis for test methods.

## Fixed Issues
* Refurbished the jgiven-scala example project [#619](https://github.com/TNG/JGiven/pull/619) (thanks to seblm)
* Updated most dependencies in the project
* Enabled printing of nested stage [#366](https://github.com/TNG/JGiven/pull/619) (thanks to laurinvesely)
* Fixed SVG thumbnail creation in HTML5 report [#706](https://github.com/TNG/JGiven/pull/706)

## Backwards Incompatible Changes
* JGiven-TestNG now expects you to provide a version of TestNG on the runtime classpath
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ configure(subprojects.findAll { !it.name.contains("android") }) {
testImplementation project(':jgiven-timing')
}
test {
jvmArgs += "-javaagent:${rootProject.projectDir}/jgiven-timing/build/libs/jgiven-timing-1.0.0.jar"
jvmArgs += "-javaagent:${rootProject.projectDir}/jgiven-timing/build/libs/jgiven-timing-1.1.0.jar"
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=1.0.0
version=1.1.0
org.gradle.jvmargs=-Xmx1536M
org.gradle.parallel=true
android.useAndroidX=true
Expand Down
2 changes: 1 addition & 1 deletion jgiven-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ android {
minSdkVersion 29
targetSdkVersion 29
versionCode 1
versionName "1.0"
versionName "1.1"

testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

Expand Down
8 changes: 4 additions & 4 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:30.1.1-jre")
implementation 'net.bytebuddy:byte-buddy-gradle-plugin:1.11.6'
implementation 'net.bytebuddy:byte-buddy-agent:1.11.6'
testImplementation('com.google.guava:guava-testlib:30.1.1-jre')
implementation("com.google.guava:guava:$guavaVersion")
implementation "net.bytebuddy:byte-buddy-gradle-plugin:$bytebuddyVersion"
implementation "net.bytebuddy:byte-buddy-agent:$bytebuddyVersion"
testImplementation("com.google.guava:guava-testlib:$guavaVersion")
testImplementation 'org.mockito:mockito-inline:3.11.2'
}

Expand Down
2 changes: 1 addition & 1 deletion scripts/local_android_release_with_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if [ ! -e 'gradle.properties' ]; then
fi


VERSION="1.0-t"
VERSION="1.1-t"

updateAllVersionInformation $VERSION

Expand Down
2 changes: 1 addition & 1 deletion scripts/local_release_with_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if [ ! -e 'gradle.properties' ]; then
fi


VERSION="1.0-t"
VERSION="1.1-t"

updateAllVersionInformation $VERSION

Expand Down

0 comments on commit 4f70c7e

Please sign in to comment.