From e0eb748318a23e38d99ab9ee0f01654385f1497b Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 3 Aug 2023 00:12:22 +0530 Subject: [PATCH] fix(android): remove native library fix attempts There is no measurable evidence that these helped at all --- android/build.gradle.kts | 2 -- .../main/kotlin/dev/msfjarvis/claw/android/ClawApplication.kt | 3 --- gradle/libs.versions.toml | 1 - 3 files changed, 6 deletions(-) diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 8a16d649..24e02060 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -29,7 +29,6 @@ android { useLiveLiterals = false kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() } - packaging { jniLibs { useLegacyPackaging = true } } } baselineProfile { @@ -75,7 +74,6 @@ dependencies { implementation(libs.kotlinx.collections.immutable) implementation(libs.kotlinx.coroutines.core) implementation(libs.napier) - implementation(libs.soloader) implementation(libs.sqldelight.extensions.coroutines) implementation(libs.swipe) implementation(libs.unfurl) diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ClawApplication.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ClawApplication.kt index d6ee1ce7..99222b62 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ClawApplication.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ClawApplication.kt @@ -15,7 +15,6 @@ import androidx.work.WorkManager import com.deliveryhero.whetstone.Whetstone import com.deliveryhero.whetstone.app.ApplicationComponentOwner import com.deliveryhero.whetstone.app.ContributesAppInjector -import com.facebook.soloader.SoLoader import dev.msfjarvis.claw.android.work.SavedPostUpdaterWorker import dev.msfjarvis.claw.core.injection.AppPlugin import java.util.concurrent.TimeUnit @@ -32,8 +31,6 @@ class ClawApplication : Application(), ApplicationComponentOwner { override fun onCreate() { Whetstone.inject(this) super.onCreate() - SoLoader.init(this, false) - SoLoader.loadLibrary("sqlite3x") plugins.forEach { plugin -> plugin.apply(this) } val postUpdateWorkRequest = PeriodicWorkRequestBuilder(POST_REFRESH_PERIOD, TimeUnit.HOURS) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9fde1a0f..73ffd16e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -85,7 +85,6 @@ retrofit-kotlinxSerializationConverter = "com.jakewharton.retrofit:retrofit2-kot sentry-bom = { module = "io.sentry:sentry-bom", version.ref = "sentry-sdk" } sentry-okhttp = { module = "io.sentry:sentry-android-okhttp", version.ref = "sentry-sdk" } slack-compose-lints = "com.slack.lint.compose:compose-lint-checks:1.2.0" -soloader = "com.facebook.soloader:soloader:0.10.5" sqldelight-androidDriver = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" } sqldelight-extensions-coroutines = { module = "app.cash.sqldelight:coroutines-extensions-jvm", version.ref = "sqldelight" } sqldelight-jvmDriver = { module = "app.cash.sqldelight:sqlite-driver", version.ref = "sqldelight" }