Merge pull request #64 from contentful/update-deps

Update dependencies

Author: tomxor

pom.xml

@@ -48,16 +48,16 @@
 
     <!-- Dependencies -->
     <retrofit.version>1.9.0</retrofit.version>
-    <rxjava.version>1.0.5</rxjava.version>
+    <rxjava.version>1.0.9</rxjava.version>
 
     <!-- Test Dependencies -->
     <commonsio.version>2.4</commonsio.version>
     <junit.version>4.11</junit.version>
-    <kotlin-stdlib.version>0.10.195</kotlin-stdlib.version>
-    <mockwebserver.version>2.0.0</mockwebserver.version>
-    <okhttp.version>2.0.0</okhttp.version>
-    <okhttp-urlconnection.version>2.0.0</okhttp-urlconnection.version>
-    <mockito.version>1.10.8</mockito.version>
+    <kotlin.version>0.11.91.4</kotlin.version>
+    <mockwebserver.version>2.3.0</mockwebserver.version>
+    <okhttp.version>2.3.0</okhttp.version>
+    <okhttp-urlconnection.version>2.3.0</okhttp-urlconnection.version>
+    <mockito.version>1.10.19</mockito.version>
     <android.version>4.1.1.4</android.version>
     <android.platform>16</android.platform>
     <robolectric.version>2.4</robolectric.version>
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib</artifactId>
-      <version>${kotlin-stdlib.version}</version>
+      <version>${kotlin.version}</version>
       <scope>test</scope>
     </dependency>
 
@@ -152,7 +152,7 @@
       <plugin>
         <artifactId>kotlin-maven-plugin</artifactId>
         <groupId>org.jetbrains.kotlin</groupId>
-        <version>0.10.195</version>
+        <version>${kotlin.version}</version>
 
         <executions>
           <execution>
@@ -272,10 +272,6 @@
   </build>
 
   <repositories>
-    <repository>
-      <id>jetbrains-all</id>
-      <url>http://repository.jetbrains.com/all</url>
-    </repository>
     <repository>
       <id>sonatype.oss.snapshots</id>
       <name>Sonatype OSS Snapshot Repository</name>
@@ -288,18 +284,4 @@
       </snapshots>
     </repository>
   </repositories>
-
-  <pluginRepositories>
-    <pluginRepository>
-      <id>sonatype.oss.snapshots</id>
-      <name>Sonatype OSS Snapshot Repository</name>
-      <url>http://oss.sonatype.org/content/repositories/snapshots</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
 </project>

src/test/kotlin/com/contentful/java/cda/AssetTests.kt

@@ -16,10 +16,10 @@
 
 package com.contentful.java.cda
 
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
 import com.contentful.java.cda.model.CDAAsset
 import com.contentful.java.cda.lib.TestCallback
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
 import org.junit.Test as test
 
 /**

src/test/kotlin/com/contentful/java/cda/EntryTests.kt

@@ -17,15 +17,15 @@
 package com.contentful.java.cda
 
 import com.contentful.java.cda.lib.TestCallback
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
 import org.junit.Test as test
 import com.contentful.java.cda.model.CDAEntry
 import com.contentful.java.cda.model.CDAAsset
 import com.contentful.java.cda.model.CDAArray
 import kotlin.test.assertNotNull
 import retrofit.RestAdapter
+import kotlin.test.assertEquals
 import kotlin.test.assertNull
+import kotlin.test.assertTrue
 
 /**
  * Entry Tests.
@@ -141,7 +141,7 @@ class EntryTests : BaseTest() {
         assertEquals("/spaces/spaceid/entries/jake", recordedRequest.getPath())
     }
 
-    class object {
+    companion object {
         fun verifyFetchAll(result: CDAArray, client: CDAClient) {
             assertEquals(2, result.getTotal())
             assertEquals(0, result.getSkip())

src/test/kotlin/com/contentful/java/cda/SerializationTests.kt

@@ -82,7 +82,7 @@ class SerializationTests : BaseTest() {
 
     class BadClass1(val whatever: String) : CDAResource()
     class BadClass2() : CDAEntry() {
-        {
+        init {
             throw IllegalAccessException()
         }
     }

src/test/kotlin/com/contentful/java/cda/lib/TestCallback.kt

@@ -28,7 +28,7 @@ class TestCallback<T>(val allowEmpty: Boolean = false) : CDACallback<T>() {
     var value: T = null
     var error: RetrofitError? = null
 
-    {
+    init {
         cdl = CountDownLatch(1)
     }
 

src/test/kotlin/com/contentful/java/cda/lib/TestUtils.kt

@@ -9,10 +9,8 @@ import org.apache.commons.io.IOUtils
  * Utils.
  */
 class TestUtils {
-    class object {
+    companion object {
         fun fileToString(fileName: String): String =
                 FileUtils.readFileToString(File("src/test/resources/${fileName}"), "UTF-8")
     }
 }
-
-fun RecordedRequest.getBodyAsString() = IOUtils.toString(getBody(), "UTF-8")