From 6bb7e7ac7c538cafbe69f1e44eb30f1e367a1a65 Mon Sep 17 00:00:00 2001 From: Jake Wharton Date: Fri, 11 Jul 2014 15:40:24 -0700 Subject: [PATCH] Due to the rename, the next version will be 1.0.0. --- CHANGELOG.md | 13 +++++++++++++ README.md | 43 ++++++++++++++++++++++++++----------------- gradle.properties | 2 +- 3 files changed, 40 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0ecb9d..3c4b4a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,19 @@ Change Log ========== +Version 1.0.0 *(In Development)* +-------------------------------- + +Convert project from 'fest-android' to 'assertj-android'. + + * New: Add-on modules for the support library, AppCompat, and GridLayout. + + + + +NOTE: The following change log is from the 'fest-android` releases which remain +a part of this repository history. + Version 1.0.8 *(2014-04-05)* ---------------------------- diff --git a/README.md b/README.md index ced6165..606e3e8 100644 --- a/README.md +++ b/README.md @@ -84,6 +84,18 @@ import static org.assertj.android.api.Assertions.assertThat; +Add-On Modules +-------------- + +Modules are also provided for the add-on Android libraries. Add the dependency +(listed below) and use the following imports: + + * support-v4: `import static org.assertj.android.support.v4.api.Assertions.assertThat;` + * appcompat-v7: `import static org.assertj.android.appcompat.v7.api.Assertions.assertThat;` + * gridlayout-v4: `import static org.assertj.android.gridlayout.v7.api.Assertions.assertThat;` + + + Extending --------- @@ -129,26 +141,25 @@ For more information about writing custom assertions see the [official documenta Download -------- -Download [the latest JAR][3] or grab via Maven: - -```xml - - com.squareup.assertj - assertj-android - 1.0.8 - +Android module: +```groovy +androidTestCompile 'com.squareup.assertj:assertj-android:1.0.0' ``` -or via Gradle: - +Support-v4 module: ```groovy -androidTestCompile 'com.squareup.assertj:assertj-android:1.0.8' +androidTestCompile 'com.squareup.assertj:assertj-android-support-v4:1.0.0' ``` -If you are not using Maven or Gradle you will also need to include the latest -[AssertJ][4] jar in your build. +AppCompat-v7 module: +```groovy +androidTestCompile 'com.squareup.assertj:assertj-android-appcompat-v7:1.0.0' +``` -Compilation requires Android 4.1 or newer. +GridLayout-v7 module: +```groovy +androidTestCompile 'com.squareup.assertj:assertj-android-gridlayout-v7:1.0.0' +``` @@ -173,6 +184,4 @@ License [1]: http://joel-costigliola.github.io/assertj/ - [2]: http://joel-costigliola.github.io/assertj/assertj-core-custom-assertions.html - [3]: http://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=com.squareup.assertf&a=assertj-android&v=LATEST - [4]: http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.assertj%22%20a%3A%22assertj-core%22 + [2]: http://joel-costigliola.github.io/assertj/assertj-core-custom-assertions.html \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index ad49e7a..05013ef 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.squareup.assertj -VERSION_NAME=1.0.9-SNAPSHOT +VERSION_NAME=1.0.0-SNAPSHOT POM_DESCRIPTION=A set of AssertJ assertion helpers geared toward testing Android.