From 4a2c13680806aa5d1b2ea604339864fa93b73781 Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Sat, 12 Mar 2016 01:22:26 +0400
Subject: [PATCH] Fix okio dependencies.

---
 .idea/libraries/kobalt__Compile_.xml             |  6 +++---
 .idea/libraries/kobalt_plugin_api__Compile_.xml  |  4 ++--
 kobalt/src/Build.kt                              | 16 +++++++++++-----
 modules/kobalt-plugin-api/kobalt-plugin-api.iml  |  2 +-
 .../kotlin/com/beust/kobalt/misc/GithubApi2.kt   |  2 ++
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/.idea/libraries/kobalt__Compile_.xml b/.idea/libraries/kobalt__Compile_.xml
index 4d66b436..f6ffbb1c 100644
--- a/.idea/libraries/kobalt__Compile_.xml
+++ b/.idea/libraries/kobalt__Compile_.xml
@@ -5,15 +5,15 @@
       <root url="jar://$USER_HOME$/.kobalt/repository/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" />
       <root url="jar://$USER_HOME$/.kobalt/repository/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0.jar!/" />
       <root url="jar://$USER_HOME$/.kobalt/repository/com/beust/jcommander/1.48/jcommander-1.48.jar!/" />
+      <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/okhttp3/okhttp/3.2.0/okhttp-3.2.0.jar!/" />
       <root url="jar://$USER_HOME$/.kobalt/repository/javax/inject/javax.inject/1/javax.inject-1.jar!/" />
       <root url="jar://$USER_HOME$/.kobalt/repository/org/apache/maven/maven-model/3.3.3/maven-model-3.3.3.jar!/" />
-      <root url="jar://$USER_HOME$/.kobalt/repository/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar!/" />
       <root url="jar://$USER_HOME$/.kobalt/repository/com/github/spullara/mustache/java/compiler/0.9.1/compiler-0.9.1.jar!/" />
+      <root url="jar://$USER_HOME$/.kobalt/repository/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar!/" />
       <root url="jar://$USER_HOME$/.kobalt/repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.0.0/kotlin-compiler-embeddable-1.0.0.jar!/" />
-      <root url="jar://$USER_HOME$/.kobalt/repository/com/google/code/gson/gson/2.6.2/gson-2.6.2.jar!/" />
+      <root url="jar://$USER_HOME$/.kobalt/repository/com/google/code/gson/gson/2.4/gson-2.4.jar!/" />
       <root url="jar://$USER_HOME$/.kobalt/repository/com/google/guava/guava/20.0-SNAPSHOT/guava-20.0-SNAPSHOT.jar!/" />
       <root url="jar://$USER_HOME$/.kobalt/repository/com/google/inject/guice/4.0/guice-4.0.jar!/" />
-      <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/okhttp3/okhttp/3.2.0/okhttp-3.2.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/kobalt_plugin_api__Compile_.xml b/.idea/libraries/kobalt_plugin_api__Compile_.xml
index 8c4fc324..2f871ed5 100644
--- a/.idea/libraries/kobalt_plugin_api__Compile_.xml
+++ b/.idea/libraries/kobalt_plugin_api__Compile_.xml
@@ -3,10 +3,11 @@
     <CLASSES>
       <root url="jar://$USER_HOME$/.kobalt/repository/org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.jar!/" />
       <root url="jar://$USER_HOME$/.kobalt/repository/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" />
-      <root url="jar://$USER_HOME$/.kobalt/repository/org/jetbrains/kotlinx/kotlinx.dom/0.0.9/kotlinx.dom-0.0.9.jar!/" />
       <root url="jar://$USER_HOME$/.kobalt/repository/com/google/inject/extensions/guice-assistedinject/4.0/guice-assistedinject-4.0.jar!/" />
       <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/retrofit2/retrofit/2.0.0-beta4/retrofit-2.0.0-beta4.jar!/" />
+      <root url="jar://$USER_HOME$/.kobalt/repository/org/jetbrains/kotlinx/kotlinx.dom/0.0.9/kotlinx.dom-0.0.9.jar!/" />
       <root url="jar://$USER_HOME$/.kobalt/repository/com/beust/jcommander/1.48/jcommander-1.48.jar!/" />
+      <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/okhttp3/okhttp/3.3.0-SNAPSHOT/okhttp-3.3.0-SNAPSHOT.jar!/" />
       <root url="jar://$USER_HOME$/.kobalt/repository/javax/inject/javax.inject/1/javax.inject-1.jar!/" />
       <root url="jar://$USER_HOME$/.kobalt/repository/org/apache/maven/maven-model/3.3.3/maven-model-3.3.3.jar!/" />
       <root url="jar://$USER_HOME$/.kobalt/repository/io/reactivex/rxjava/1.0.16/rxjava-1.0.16.jar!/" />
@@ -14,7 +15,6 @@
       <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/retrofit2/converter-gson/2.0.0-beta4/converter-gson-2.0.0-beta4.jar!/" />
       <root url="jar://$USER_HOME$/.kobalt/repository/com/google/guava/guava/20.0-SNAPSHOT/guava-20.0-SNAPSHOT.jar!/" />
       <root url="jar://$USER_HOME$/.kobalt/repository/com/google/inject/guice/4.0/guice-4.0.jar!/" />
-      <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/okhttp3/okhttp/3.2.0/okhttp-3.2.0.jar!/" />
       <root url="jar://$USER_HOME$/.kobalt/repository/com/squareup/okio/okio/1.6.0/okio-1.6.0.jar!/" />
     </CLASSES>
     <JAVADOC />
diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt
index 15e2abe6..9ec0dff6 100644
--- a/kobalt/src/Build.kt
+++ b/kobalt/src/Build.kt
@@ -21,6 +21,12 @@ val r = repos("http://dl.bintray.com/kotlin/kotlinx.dom")
 
 //val pl = plugins("com.beust:kobalt-android:0.20")
 
+object Versions {
+    val okhttp = "3.2.0"
+    val okio = "1.6.0"
+    val retrofit = "2.0.0-beta4"
+}
+
 val wrapper = project {
     name = "kobalt-wrapper"
     group = "com.beust"
@@ -69,10 +75,9 @@ val kobaltPluginApi = project {
                 "org.apache.maven:maven-model:3.3.3",
                 "io.reactivex:rxjava:1.0.16",
                 "com.google.code.gson:gson:2.4",
-                "com.squareup.okio:okio:1.6.0",
-                "com.squareup.okhttp3:okhttp:3.2.0",
-                "com.squareup.retrofit2:retrofit:2.0.0-beta4",
-                "com.squareup.retrofit2:converter-gson:2.0.0-beta4",
+                "com.squareup.okio:okio:${Versions.okio}",
+                "com.squareup.retrofit2:retrofit:${Versions.retrofit}",
+                "com.squareup.retrofit2:converter-gson:${Versions.retrofit}",
                 "com.beust:jcommander:1.48"
                 )
     }
@@ -116,9 +121,10 @@ val kobaltApp = project(kobaltPluginApi, wrapper) {
                 "com.google.inject:guice:4.0",
                 "com.google.inject.extensions:guice-assistedinject:4.0",
                 "com.beust:jcommander:1.48",
-                "com.squareup.retrofit:retrofit:1.9.0",
                 "org.apache.maven:maven-model:3.3.3",
                 "com.google.code.findbugs:jsr305:3.0.1",
+                "com.google.code.gson:gson:2.4",
+                "com.squareup.okhttp3:okhttp:${Versions.okhttp}",
                 "org.codehaus.plexus:plexus-utils:3.0.22")
 
     }
diff --git a/modules/kobalt-plugin-api/kobalt-plugin-api.iml b/modules/kobalt-plugin-api/kobalt-plugin-api.iml
index 806c19e1..64fabb37 100644
--- a/modules/kobalt-plugin-api/kobalt-plugin-api.iml
+++ b/modules/kobalt-plugin-api/kobalt-plugin-api.iml
@@ -7,8 +7,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kobalt (Compile)" level="project" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="library" name="kobalt-plugin-api (Compile)" level="project" />
     <orderEntry type="library" scope="TEST" name="kobalt-plugin-api (Test)" level="project" />
-    <orderEntry type="inheritedJdk" />
   </component>
 </module>
\ No newline at end of file
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/GithubApi2.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/GithubApi2.kt
index 19470351..3c679dd5 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/GithubApi2.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/GithubApi2.kt
@@ -5,6 +5,7 @@ import com.beust.kobalt.internal.DocUrl
 import com.beust.kobalt.maven.Http
 import com.google.gson.annotations.SerializedName
 import com.google.inject.Inject
+import okhttp3.OkHttpClient
 import retrofit2.Call
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
@@ -56,6 +57,7 @@ class GithubApi2 @Inject constructor(
     // Read only Api
     //
     private val service = Retrofit.Builder()
+            .client(OkHttpClient())
             .baseUrl("https://api.github.com")
             .addConverterFactory(GsonConverterFactory.create())
             .build()