Merge pull request #131 from stepstone-tech/develop

3.2.3 release from develop

Author: zawadz88

.travis.yml

@@ -1,6 +1,6 @@
 language: android
 jdk: oraclejdk8
-sudo: false
+sudo: true
 
 env:
   global:

README.md

@@ -30,6 +30,7 @@ Moreover, you can find there other examples, e.g. how to persist state on rotati
 - [StepperLayout attributes](#stepperlayout-attributes)
 	- [View attributes](#view-attributes)
 	- [StepperLayout style attributes](#stepperlayout-style-attributes)
+- [Contributing](#contributing)
 - [License](#license)
 
 ## Supported steppers
@@ -56,7 +57,7 @@ Moreover, you can find there other examples, e.g. how to persist state on rotati
 
 ### Download (from JCenter)
 ```groovy
-compile 'com.stepstone.stepper:material-stepper:3.2.2'
+compile 'com.stepstone.stepper:material-stepper:3.2.3'
 ```
 
 ### Create layout in XML
@@ -68,7 +69,6 @@ compile 'com.stepstone.stepper:material-stepper:3.2.2'
     android:id="@+id/stepperLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     app:ms_stepperType="progress_bar" />
 ```
 
@@ -487,6 +487,16 @@ A list of `ms_stepperLayoutTheme` attributes responsible for styling of StepperL
 | *ms_stepTabIconBackgroundStyle*   | Used by ms_stepIconBackground in layout/ms_step_tab           |
 | *ms_stepTabTitleStyle*            | Used by ms_stepTitle in layout/ms_step_tab                    |
 | *ms_stepTabDividerStyle*          | Used by ms_stepDivider in layout/ms_step_tab                  |
+
+
+## Contributing
+All contributions are welcome and encouraged!
+
+Pull requests should be merged to the ```develop``` branch (Rebase & merge preferred).
+Once ```develop``` is stable and we're ready to release the next version
+it should be merged to ```master```. Next, a new version should be
+uploaded to Bintray and a new release should be created on GitHub.
+Library releases should be made from the ```master``` branch.
   
 ## License
 Copyright 2016 StepStone Services

build.gradle

@@ -18,6 +18,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        mavenCentral()
     }
 }
 
@@ -31,7 +32,8 @@ configure(allprojects) {
         androidSupportLibraryVersion        = '25.3.1'
 
         junitVersion                        = '4.12'
-        mockitoVersion                      = '1.10.19'
+        mockitoVersion                      = '2.7.21'
+        mockitoKotlinVersion                = '1.4.0'
         robolectricVersion                  = '3.3.1'
         assertjVersion                      = '1.1.1'
 

gradle.properties

@@ -19,4 +19,4 @@
 
 POM_GROUP_ID=com.stepstone.stepper
 POM_ARTIFACT_ID=material-stepper
-POM_VERSION=3.2.2
+POM_VERSION=3.2.3

material-stepper/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
 apply plugin: 'maven'
 apply from: '../material-stepper/code_coverage.gradle'
 apply from: '../config/quality/quality.gradle'
@@ -29,7 +30,7 @@ ext {
 
 android {
     compileSdkVersion project.androidCompileSdkVersion
-    buildToolsVersion ("$androidBuildToolsVersion")
+    buildToolsVersion("$androidBuildToolsVersion")
 
     defaultConfig {
         minSdkVersion project.androidMinSdkVersion
@@ -59,15 +60,18 @@ android {
 }
 
 dependencies {
-    compile ("com.android.support:appcompat-v7:$androidSupportLibraryVersion")
+    compile "com.android.support:appcompat-v7:$androidSupportLibraryVersion"
 
-    testCompile("junit:junit:$junitVersion")
-    testCompile("org.mockito:mockito-core:$mockitoVersion")
-    testCompile("com.squareup.assertj:assertj-android:$assertjVersion")
+    testCompile "junit:junit:$junitVersion"
+    testCompile "org.mockito:mockito-core:$mockitoVersion"
+    testCompile "com.squareup.assertj:assertj-android:$assertjVersion"
     testCompile("org.robolectric:robolectric:$robolectricVersion") {
         exclude group: 'commons-logging', module: 'commons-logging'
         exclude group: 'org.apache.httpcomponents', module: 'httpclient'
     }
+    testCompile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion"
+    testCompile "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
+    testCompile "com.nhaarman:mockito-kotlin:$mockitoKotlinVersion"
 }
 
 gradle.taskGraph.beforeTask { Task task ->
@@ -81,7 +85,7 @@ gradle.taskGraph.beforeTask { Task task ->
 }
 
 // Log out test results to console
-tasks.matching {it instanceof Test}.all {
+tasks.matching { it instanceof Test }.all {
     testLogging.events = ["failed", "passed", "skipped"]
 }
 

material-stepper/src/main/java/com/stepstone/stepper/StepperLayout.java

@@ -320,6 +320,7 @@ public void setAdapter(@NonNull StepAdapter stepAdapter) {
         mPager.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
             @Override
             public void onGlobalLayout() {
+                //noinspection deprecation
                 mPager.getViewTreeObserver().removeGlobalOnLayoutListener(this);
                 onUpdate(mCurrentStepPosition, false);
             }