Release Liquid v1.2.0

Signed-off-by: Ricardo Leitão <rleitao@onliquid.com>
lqd-io · Jun 1, 2015 · e1aa04f · e1aa04f
1 parent 99fa4c0
commit e1aa04f
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,6 @@ language: java
 
 branches:
   only:
-    - development
     - master
 
 jdk: oraclejdk7
@@ -64,4 +63,3 @@ before_install:
 #install: ./gradlew clean build
 
 script: ./gradlew clean build
-
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Liquid Android SDK Change Log
 
+## 1.2.0: Attributes bulk insert + bug fixes
+
+  * **[feature]** Add setUserAttributes() to set multiple user attributes
+  * **[bugfix]** Fix NPE in softReset()
+  * **[bugfix]** LiquidPackage loading on initialize
+
+<br>
 
 ## 1.1.0: Better session handling
 

diff --git a/README.md b/README.md
@@ -12,19 +12,13 @@ To integrate Liquid in your app, just follow these simple steps below.
 
 ## Setup
 
-#### Eclipse
-
-1. Clone [Liquid SDK for android](https://github.com/lqd-io/liquid-sdk-android/).
-2. Import the project to Eclipse (or other IDE).
-3. Add Liquid to your Application Project as a library.
-
-#### Android Studio / Gradle
+#### Android Studio / Gradle (recomended)
 
 ```
 // build.gradle file
 dependencies {
   // Your Dependencies
-  compile 'io.lqd:liquid-android:1.1.0@aar'
+  compile 'io.lqd:liquid-android:1.2.0@aar'
 }
 ```
 
@@ -35,10 +29,17 @@ dependencies {
 <dependency>
     <groupId>io.lqd</groupId>
     <artifactId>liquid-android</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
 </dependency>
 ```
 
+#### Eclipse
+
+1. Clone [Liquid SDK for android](https://github.com/lqd-io/liquid-sdk-android/).
+2. Import the project to Eclipse (or other IDE).
+3. Add Liquid to your Application Project as a library.
+
+
 ## Start using Liquid
 
 ### 1. Add Permissions to Application Manifest

diff --git a/liquid/build.gradle b/liquid/build.gradle
@@ -37,7 +37,7 @@ android {
         minSdkVersion 9
         targetSdkVersion 21
         versionCode 1
-        versionName "1.0.1"
+        versionName "1.2.0"
         testInstrumentationRunner "com.google.android.apps.common.testing.testrunner.GoogleInstrumentationTestRunner"
     }
 

diff --git a/liquid/gradle.properties b/liquid/gradle.properties
@@ -1,2 +1,2 @@
 group = io.lqd
-version = 1.1.0
+version = 1.2.0
diff --git a/liquid/src/main/java/io/lqd/sdk/Liquid.java b/liquid/src/main/java/io/lqd/sdk/Liquid.java
@@ -55,7 +55,7 @@ public class Liquid {
 
     static final String TAG_LIQUID = "LIQUID";
 
-    public static final String LIQUID_VERSION = "1.1.0";
+    public static final String LIQUID_VERSION = "1.2.0";
     private static final int LIQUID_DEFAULT_SESSION_TIMEOUT = 30;
 
     private static int mSessionTimeout;

diff --git a/liquid/src/test/java/io/lqd/sdk/LiquidTest.java b/liquid/src/test/java/io/lqd/sdk/LiquidTest.java
@@ -20,7 +20,8 @@
 @RunWith(RobolectricTestRunner.class)
 public class LiquidTest {
 
-        private Liquid lqd;
+    private Liquid lqd;
+
     @Before
     public void setUp() {
         lqd = Liquid.initialize(Robolectric.application, "le_token");