Merge pull request #8 from agilecontent/androidx

migrated to androidx

Author: conciliosilva

.idea/encodings.xml

@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.21'
+    ext.kotlin_version = '1.3.60'
     repositories {
         google()
         jcenter()
         maven { url "https://jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.5.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         // NOTE: Do not place your application dependencies here; they belong

build.gradle

@@ -6,6 +6,8 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

gradle.properties

@@ -1,6 +1,6 @@
-#Wed Feb 20 14:44:56 BRT 2019
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+#Mon Nov 25 19:00:51 BRST 2019
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -13,7 +13,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -27,16 +27,16 @@ android {
 }
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation "com.google.code.gson:gson:2.8.5"
-    implementation "com.squareup.okhttp3:okhttp:3.11.0"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:0.27.0-eap13"
-    implementation  "org.jetbrains.kotlinx:kotlinx-coroutines-android:0.27.0-eap13"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:0.27.0-eap13"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.21"
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation "com.google.code.gson:gson:2.8.6"
+    implementation "com.squareup.okhttp3:okhttp:3.12.5"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2"
+    implementation  "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.2"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.2"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.60"
 }
 repositories {
     mavenCentral()

grapqhqlkotlin/build.gradle

@@ -10,7 +10,6 @@ class CacheInterceptor : Interceptor {
     override fun intercept(chain: Interceptor.Chain): Response {
         val response = chain.proceed(chain.request())
         val cacheControl = CacheControl.Builder().maxAge(1, TimeUnit.HOURS).build()
-
         return response.newBuilder().header("Cache-Control", cacheControl.toString()).build()
     }
 }

grapqhqlkotlin/src/main/java/com/agilecontent/grapqhqlkotlin/CacheInterceptor.kt

@@ -1,14 +1,12 @@
 package com.agilecontent.grapqhqlkotlin
 
 import android.content.Context
-import android.util.Log
 import com.google.gson.Gson
 import com.google.gson.JsonObject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
+import kotlinx.coroutines.withContext
 import okhttp3.*
-
 import java.io.File
 import java.net.URLEncoder
 
@@ -26,8 +24,7 @@ open class GraphQLQueryService(val url: String, val auth: String? = null, val co
                 .post(body)
                 .url(url)
                 .build()
-        val deferred = CoroutineScope(Dispatchers.Default).async { client.newCall(request).execute() }
-        val response = deferred.await()
+        val response = withContext(CoroutineScope(Dispatchers.Default).coroutineContext) { client.newCall(request).execute() }
         return Gson().fromJson(response.body()?.string(), JsonObject::class.java)?.getAsJsonObject("data")
     }
 
@@ -39,8 +36,7 @@ open class GraphQLQueryService(val url: String, val auth: String? = null, val co
                 .get()
                 .url(HttpUrl.parse(url)?.newBuilder()?.addEncodedQueryParameter("query", URLEncoder.encode(query).replace("%5C",""))?.build()!!)
                 .build()
-        val deferred = CoroutineScope(Dispatchers.Default).async { client.newCall(request).execute() }
-        val response = deferred.await()
+        val response = withContext(CoroutineScope(Dispatchers.Default).coroutineContext) { client.newCall(request).execute() }
         return Gson().fromJson(response.body()?.string(), JsonObject::class.java)?.getAsJsonObject("data")
     }