Squashed commit of the following:

commit 103fbe6 Author: ajay43 <[email protected]> Date: Fri Sep 16 10:45:48 2022 +0530 Version bump to 1.0.4 Took 5 minutes commit 47b4bdb Merge: 3edae91 b2c0db4 Author: puliajay43 <[email protected]> Date: Thu Sep 15 16:42:16 2022 +0530 Merge pull request #32 from dashxhq/hotfix/video-url-handle Fixed Video URL issue from MUX commit b2c0db4 Merge: 9cb35a7 3edae91 Author: ajay43 <[email protected]> Date: Thu Sep 15 16:41:27 2022 +0530 Merge branch 'develop' into hotfix/video-url-handle commit 3edae91 Merge: 5e0f821 86540d1 Author: puliajay43 <[email protected]> Date: Thu Sep 15 16:38:38 2022 +0530 Merge pull request #30 from dashxhq/switch-to-kotlin-graphql Apollo graphql to kotlin-graphql commit 86540d1 Author: ajay43 <[email protected]> Date: Thu Sep 15 16:37:55 2022 +0530 Update publish.yml Took 5 minutes commit f2b5a88 Author: ajay43 <[email protected]> Date: Thu Sep 15 16:23:39 2022 +0530 CI/CD push test Took 6 seconds commit 9cd6040 Author: ajay43 <[email protected]> Date: Thu Sep 15 16:16:19 2022 +0530 Refactored code Took 24 minutes commit 9cb35a7 Author: sravan9 <[email protected]> Date: Wed Sep 14 12:34:07 2022 +0530 Fixed Mux Video url issue commit 5bac54e Author: ajay43 <[email protected]> Date: Wed Sep 14 09:58:01 2022 +0530 Update MyGraphQLKtorClient.kt Took 5 minutes commit 4a45dbb Author: ajay43 <[email protected]> Date: Tue Sep 13 00:18:25 2022 +0530 Removed apollo client Took 14 minutes commit 6304b45 Merge: 828bae9 c8be6a7 Author: ajay43 <[email protected]> Date: Tue Sep 13 00:10:56 2022 +0530 Merge branch 'switch-to-kotlin-graphql' of https://github.com/dashxhq/dashx-android into switch-to-kotlin-graphql commit 828bae9 Author: ajay43 <[email protected]> Date: Tue Aug 23 14:45:27 2022 +0530 WIP: Switching to Kotlin graphql Took 1 hour 17 minutes WIP: Switching to kotlin-graphql Took 2 hours 50 minutes Code migration WIP Took 53 minutes WIP: Switching to kotlin-graphql Took 1 minute Update DashXClient.kt Implemented Kotlin-graphql Took 35 minutes Update build.gradle Took 4 minutes commit c8be6a7 Author: ajay43 <[email protected]> Date: Tue Sep 13 00:03:20 2022 +0530 Update build.gradle Took 4 minutes commit 29d990a Author: ajay43 <[email protected]> Date: Mon Sep 12 23:58:01 2022 +0530 Implemented Kotlin-graphql Took 35 minutes commit 09bc2c6 Author: sravan9 <[email protected]> Date: Mon Sep 12 17:58:19 2022 +0530 Update DashXClient.kt commit 3c64a16 Author: ajay43 <[email protected]> Date: Sun Sep 11 23:37:28 2022 +0530 WIP: Switching to kotlin-graphql Took 1 minute commit 2a6ca88 Author: ajay43 <[email protected]> Date: Thu Sep 8 12:40:14 2022 +0530 WIP Took 53 minutes commit 614574e Author: sravan9 <[email protected]> Date: Wed Sep 7 15:16:35 2022 +0530 Code migration commit 98893df Author: ajay43 <[email protected]> Date: Wed Sep 7 00:58:01 2022 +0530 WIP: Switching to kotlin-graphql Took 2 hours 50 minutes commit a416824 Author: ajay43 <[email protected]> Date: Tue Aug 23 14:45:27 2022 +0530 WIP: Switching to Kotlin graphql Took 1 hour 17 minutes commit 5e0f821 Author: puliajay43 <[email protected]> Date: Thu Aug 18 10:33:22 2022 +0530 Feature: Introduce configure method (#29) * Introduced configure method * Update DashXClient.kt
dashxhq · Sep 16, 2022 · 8a763c3 · 8a763c3
1 parent 2310e58
commit 8a763c3
Show file tree

Hide file tree

Showing 24 changed files with 410 additions and 38,689 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,9 @@ plugins {
     id 'com.android.library' version '7.1.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
     id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
-    id 'com.apollographql.apollo' version "$apolloVersion" apply false
+    id 'com.expediagroup.graphql' version "$latestGraphQLKotlinVersion" apply false
+    id 'org.jetbrains.kotlin.plugin.serialization' version '1.4.0' apply false
+
 }
 apply from: "${rootDir}/scripts/publish-root.gradle"
 

diff --git a/dashx/build.gradle b/dashx/build.gradle
@@ -1,10 +1,13 @@
+import com.expediagroup.graphql.plugin.gradle.config.GraphQLSerializer
+
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'com.apollographql.apollo'
 apply plugin: 'maven-publish'
+apply plugin: 'com.expediagroup.graphql'
+apply plugin: 'org.jetbrains.kotlin.plugin.serialization'
 
 group = 'com.dashx'
-version = '1.0.3'
+version = '1.0.4'
 
 android {
     compileSdk 31
@@ -24,6 +27,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
     kotlinOptions {
         jvmTarget = '1.8'
     }
@@ -37,9 +41,15 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
     implementation 'com.google.code.gson:gson:2.9.0'
 
-    implementation "com.apollographql.apollo:apollo-runtime:$apolloVersion"
-    implementation "com.apollographql.apollo:apollo-coroutines-support:$apolloVersion"
-    implementation "com.apollographql.apollo:apollo-http-cache:$apolloVersion"
+    // Kotlin Graphql
+    implementation "com.expediagroup:graphql-kotlin-ktor-client:$latestGraphQLKotlinVersion"
+    implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
+    implementation("io.ktor:ktor-client-logging-jvm:$ktorVersion")
+    implementation 'androidx.work:work-runtime-ktx:2.5.0'
+
+    // Coroutines
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
+
 
     compileOnly 'com.google.firebase:firebase-core:17.2.1'
     compileOnly 'com.google.firebase:firebase-messaging:20.0.1'
@@ -49,12 +59,17 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
 
-apollo {
-    // instruct the compiler to generate Kotlin models
-    generateKotlinModels.set(true)
-    customTypeMapping = [
-        'Json': 'com.google.gson.JsonElement'
-    ]
+graphql {
+    client {
+        endpoint = 'https://api.dashx-staging.com/graphql'
+        packageName = 'com.dashx.graphql.generated'
+
+        serializer = GraphQLSerializer.KOTLINX
+    }
+}
+
+android.sourceSets {
+    main.kotlin.srcDirs 'build/generated/source/graphql/main'
 }
 
 apply from: "${rootProject.projectDir}/scripts/publish-module.gradle"