dev -> main [release] v2.0.6

psuzn · Sep 24, 2023 · df64226 · df64226
2 parents 11ddbc2 + b659b54
commit df64226
Show file tree

Hide file tree

Showing 39 changed files with 647 additions and 377 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -24,7 +24,7 @@ jobs:
         uses: gradle/gradle-build-action@v2
 
       - name: Lint
-        run: ./gradlew ktlintCheck
+        run: ./gradlew clean ktlintCheck
 
       - name: Tests
         run: ./gradlew :shared:testReleaseUnitTest

diff --git a/.run/iosApp.run.xml b/.run/iosApp.run.xml
@@ -4,4 +4,4 @@
       <option name="com.jetbrains.kmm.ios.BuildIOSAppTask" enabled="true" />
     </method>
   </configuration>
-</component>
+</component>
diff --git a/CHANGELOG/CHANGELOG.md b/CHANGELOG/CHANGELOG.md
@@ -1,2 +1,2 @@
 # Fixes
-- Crash fix because of proguard obfuscation #36  [**Android**]
+- Offline cache using SQLDelight #40
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,4 +1,3 @@
-
 import org.jlleitschuh.gradle.ktlint.KtlintExtension
 import org.jlleitschuh.gradle.ktlint.KtlintPlugin
 
@@ -13,6 +12,7 @@ plugins {
   id("com.adarshr.test-logger") version "3.2.0" apply false
   id("org.jlleitschuh.gradle.ktlint") version "11.5.0" apply true
   id("com.codingfeline.buildkonfig") version "0.14.0" apply false
+  id("app.cash.sqldelight") version Versions.SQLDELIGHT apply false
 }
 
 allprojects {
@@ -27,6 +27,11 @@ allprojects {
 
   configure<KtlintExtension> {
     version.set("0.50.0")
+    filter {
+      exclude {
+        it.file.path.contains("/build")
+      }
+    }
   }
 }
 

diff --git a/buildSrc/src/main/kotlin/Artifacts.kt b/buildSrc/src/main/kotlin/Artifacts.kt
@@ -1,8 +1,8 @@
 object Artifact {
   const val APP_ID = "me.sujanpoudel.playdeals"
   const val APP_NAME = "App Deals"
-  const val VERSION_CODE = 23
-  const val VERSION_NAME = "2.0.5"
+  const val VERSION_CODE = 24
+  const val VERSION_NAME = "2.0.6"
   const val MAJOR_RELEASE = true
 
   const val ANDROID_COMPILE_SDK = 34

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -2,7 +2,8 @@ object Versions {
   const val KOTLIN = "1.9.10"
   const val AGP = "8.1.1"
   const val COMPOSE = "1.5.1"
-  const val KO_TEST = "5.5.5"
+  const val SETTINGS = "1.0.0"
+  const val SQLDELIGHT = "2.0.0"
 
   const val KTOR = "2.3.4"
   const val KODE_IN = "7.20.2"
@@ -11,5 +12,5 @@ object Versions {
 
   const val JUNIT_JUPITER = "5.9.3"
   const val MOCKK = "1.13.5"
-  const val SETTINGS = "1.0.0"
+  const val KO_TEST = "5.5.5"
 }
diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -329,6 +329,7 @@
 					"$(inherited)",
 					"-framework",
 					shared,
+					"-lsqlite3",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = me.sujanpoudel.playdeals;
 				PRODUCT_NAME = "App Deals";
@@ -360,6 +361,7 @@
 					"$(inherited)",
 					"-framework",
 					shared,
+					"-lsqlite3",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = me.sujanpoudel.playdeals;
 				PRODUCT_NAME = "App Deals";

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -1,4 +1,3 @@
-
 import com.android.build.gradle.tasks.factory.AndroidUnitTest
 import com.codingfeline.buildkonfig.compiler.FieldSpec.Type.BOOLEAN
 import com.codingfeline.buildkonfig.compiler.FieldSpec.Type.INT
@@ -12,6 +11,7 @@ plugins {
   id("org.jetbrains.compose")
   id("com.adarshr.test-logger")
   id("com.codingfeline.buildkonfig")
+  id("app.cash.sqldelight")
 }
 
 version = "1.0-SNAPSHOT"
@@ -59,13 +59,17 @@ kotlin {
         implementation("com.russhwolf:multiplatform-settings-no-arg:${Versions.SETTINGS}")
 
         implementation("com.mikepenz:multiplatform-markdown-renderer:0.7.2")
+        implementation("app.cash.sqldelight:coroutines-extensions:2.0.0-alpha05")
+        implementation("app.cash.sqldelight:primitive-adapters:2.0.0-alpha05")
       }
     }
 
     val androidMain by getting {
       dependencies {
         implementation("io.ktor:ktor-client-android:${Versions.KTOR}")
-        api("androidx.appcompat:appcompat:1.6.1")
+        implementation("androidx.appcompat:appcompat:1.6.1")
+        implementation("app.cash.sqldelight:android-driver:${Versions.SQLDELIGHT}")
+        implementation("androidx.startup:startup-runtime:1.1.1")
       }
     }
 
@@ -84,6 +88,7 @@ kotlin {
     val iosMain by getting {
       dependencies {
         implementation("io.ktor:ktor-client-darwin:${Versions.KTOR}")
+        implementation("app.cash.sqldelight:native-driver:${Versions.SQLDELIGHT}")
       }
     }
 
@@ -95,6 +100,7 @@ kotlin {
       dependencies {
         implementation(compose.desktop.common)
         implementation("io.ktor:ktor-client-okhttp:${Versions.KTOR}")
+        implementation("app.cash.sqldelight:sqlite-driver:${Versions.SQLDELIGHT}")
       }
     }
   }
@@ -134,15 +140,27 @@ android {
   }
 }
 
-tasks.withType<AndroidUnitTest> {
-  useJUnitPlatform()
-}
-
 buildkonfig {
   packageName = pkgName
   defaultConfigs {
     buildConfigField(STRING, "VERSION_NAME", Artifact.VERSION_NAME)
+    buildConfigField(STRING, "PACKAGE_NAME", Artifact.APP_ID)
     buildConfigField(INT, "VERSION_CODE", Artifact.VERSION_CODE.toString())
     buildConfigField(BOOLEAN, "MAJOR_RELEASE", Artifact.MAJOR_RELEASE.toString())
   }
 }
+
+sqldelight {
+  databases {
+    create("SqliteDatabase") {
+      generateAsync.set(true)
+      verifyMigrations.set(true)
+      deriveSchemaFromMigrations.set(true)
+      packageName.set(pkgName)
+    }
+  }
+}
+
+tasks.withType<AndroidUnitTest> {
+  useJUnitPlatform()
+}
diff --git a/shared/src/androidMain/AndroidManifest.xml b/shared/src/androidMain/AndroidManifest.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.INTERNET" />
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools">
+
+  <uses-permission android:name="android.permission.INTERNET" />
+  <application>
+    <provider
+      android:name="androidx.startup.InitializationProvider"
+      android:authorities="${applicationId}.androidx-startup"
+      android:exported="false"
+      tools:node="merge">
+
+      <meta-data
+        android:name="me.sujanpoudel.playdeals.common.ApplicationContextInitializer"
+        android:value="androidx.startup" />
+    </provider>
+
+  </application>
+</manifest>
diff --git a/shared/src/androidMain/kotlin/me/sujanpoudel/playdeals/common/context.kt b/shared/src/androidMain/kotlin/me/sujanpoudel/playdeals/common/context.kt
@@ -0,0 +1,14 @@
+package me.sujanpoudel.playdeals.common
+
+import android.content.Context
+import androidx.startup.Initializer
+
+internal lateinit var applicationContext: Context
+
+internal class ApplicationContextInitializer : Initializer<Context> {
+  override fun create(context: Context): Context = context.also {
+    applicationContext = it
+  }
+
+  override fun dependencies(): List<Class<out Initializer<*>>> = emptyList()
+}
diff --git a/...roidMain/kotlin/me/sujanpoudel/playdeals/common/domain/persistent/db/sqlDriver.android.kt b/...roidMain/kotlin/me/sujanpoudel/playdeals/common/domain/persistent/db/sqlDriver.android.kt
@@ -0,0 +1,14 @@
+package me.sujanpoudel.playdeals.common.domain.persistent.db
+
+import app.cash.sqldelight.async.coroutines.synchronous
+import app.cash.sqldelight.db.SqlDriver
+import app.cash.sqldelight.driver.android.AndroidSqliteDriver
+import me.sujanpoudel.playdeals.common.Constants
+import me.sujanpoudel.playdeals.common.SqliteDatabase
+import me.sujanpoudel.playdeals.common.applicationContext
+
+actual fun createSqlDriver(): SqlDriver = AndroidSqliteDriver(
+  schema = SqliteDatabase.Schema.synchronous(),
+  context = applicationContext,
+  name = Constants.DATABASE_NAME,
+)