From 1f697fc0a7adac313522f78d72baa1c71b947f47 Mon Sep 17 00:00:00 2001
From: Oguzhan Unlu <oguzhan@snowplowanalytics.com>
Date: Tue, 11 Jun 2019 18:33:20 +0300
Subject: [PATCH] Prepared for release

---
 CHANGELOG                                                  | 7 +++++++
 README.md                                                  | 2 +-
 VERSION                                                    | 2 +-
 build.gradle                                               | 2 +-
 .../snowplowanalytics/snowplow/tracker/TrackerTest.java    | 2 +-
 .../snowplow/tracker/integration/EventSendingTest.java     | 4 ++--
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8a29fb9e8..d0ce8a967 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+Version 1.2.0 (2019-06-11)
+--------------------------
+Add ability to customize timeout for Emitter (#311)
+Set emitter status when event store not instantiated (#306)
+Update Travis setup (#309)
+Add support for global contexts (#307)
+
 Version 1.1.0 (2019-05-06)
 --------------------------
 Add instrumented tests to debug coverage (#302)
diff --git a/README.md b/README.md
index fce626583..409f273a4 100644
--- a/README.md
+++ b/README.md
@@ -95,7 +95,7 @@ limitations under the License.
 [travis]: https://travis-ci.org/snowplow/snowplow-android-tracker
 [travis-image]: https://travis-ci.org/snowplow/snowplow-android-tracker.svg?branch=master
 
-[release-image]: http://img.shields.io/badge/release-1.1.0-blue.svg?style=flat
+[release-image]: http://img.shields.io/badge/release-1.2.0-blue.svg?style=flat
 [releases]: https://github.com/snowplow/snowplow-android-tracker/releases
 
 [license-image]: http://img.shields.io/badge/license-Apache--2-blue.svg?style=flat
diff --git a/VERSION b/VERSION
index 9084fa2f7..26aaba0e8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.0
+1.2.0
diff --git a/build.gradle b/build.gradle
index 35a350c9a..7f2b8d58c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
 
 subprojects {
     group = 'com.snowplowanalytics'
-    version = '1.1.0'
+    version = '1.2.0'
     repositories {
         google()
         maven {
diff --git a/snowplow-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/TrackerTest.java b/snowplow-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/TrackerTest.java
index 27b4362e2..e47c0bc4b 100755
--- a/snowplow-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/TrackerTest.java
+++ b/snowplow-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/TrackerTest.java
@@ -94,7 +94,7 @@ public void testSetValues() {
         assertEquals(false, tracker.getBase64Encoded());
         assertNotNull(tracker.getEmitter());
         assertNotNull(tracker.getSubject());
-        assertEquals("andr-1.1.0", tracker.getTrackerVersion());
+        assertEquals("andr-1.2.0", tracker.getTrackerVersion());
         assertEquals(LogLevel.VERBOSE, tracker.getLogLevel());
         assertEquals(2, tracker.getThreadCount());
         assertEquals(false, tracker.getApplicationCrash());
diff --git a/snowplow-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/integration/EventSendingTest.java b/snowplow-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/integration/EventSendingTest.java
index ced79fa97..c0b108326 100644
--- a/snowplow-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/integration/EventSendingTest.java
+++ b/snowplow-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/integration/EventSendingTest.java
@@ -215,7 +215,7 @@ public void checkGetRequest(LinkedList<RecordedRequest> requests) throws Excepti
             assertEquals("mob", query.get("p"));
             assertEquals("myAppId", query.get("aid"));
             assertEquals("myNamespace", query.get("tna"));
-            assertEquals("andr-1.1.0", query.get("tv"));
+            assertEquals("andr-1.2.0", query.get("tv"));
             assertEquals("English", query.get("lang"));
             assertTrue(query.has("dtm"));
             assertTrue(query.has("stm"));
@@ -256,7 +256,7 @@ public void checkPostRequest(LinkedList<RecordedRequest> requests) throws Except
                 assertEquals("mob", json.getString("p"));
                 assertEquals("myAppId", json.getString("aid"));
                 assertEquals("myNamespace", json.getString("tna"));
-                assertEquals("andr-1.1.0", json.getString("tv"));
+                assertEquals("andr-1.2.0", json.getString("tv"));
                 assertEquals("English", json.getString("lang"));
                 assertTrue(json.has("dtm"));
                 assertTrue(json.has("stm"));