From 4f7b3fc972799f1243f33b5182f1b0b5bff6a097 Mon Sep 17 00:00:00 2001 From: "Jo G." <1451036+jo-elimu@users.noreply.github.com> Date: Thu, 1 May 2025 00:49:15 +0700 Subject: [PATCH 1/3] refactor: remove content-provider lib #64 --- gradle/libs.versions.toml | 2 -- utils/build.gradle | 1 - 2 files changed, 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a4a53a9..ab65e91 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,6 @@ hilt = "2.56.2" kotlinAndroidPlugin = "2.1.20" grgit = "5.3.0" elimuModel = "model-2.0.103" -elimuContentProvider = "1.2.53" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } @@ -29,6 +28,5 @@ android-gradle-plugin = { group = "com.android.tools.build", name = "gradle", ve material = { group = "com.google.android.material", name = "material", version.ref = "material" } grgit = { group = "org.ajoberstar.grgit", name = "grgit-gradle", version.ref = "grgit" } elimu-model = { group = "ai.elimu", name = "model", version.ref = "elimuModel" } -elimu-content-provider = { group = "ai.elimu", name = "content-provider", version.ref = "elimuContentProvider" } [plugins] diff --git a/utils/build.gradle b/utils/build.gradle index c426251..27c5cf6 100644 --- a/utils/build.gradle +++ b/utils/build.gradle @@ -47,7 +47,6 @@ android { dependencies { implementation libs.elimu.model // https://jitpack.io/#ai.elimu/model - implementation libs.elimu.content.provider // https://jitpack.io/#ai.elimu/content-provider implementation libs.androidx.core.ktx implementation libs.androidx.appcompat From 35f6ab289ff5d53340b3c0a1a6e82295d3b18bd0 Mon Sep 17 00:00:00 2001 From: "Jo G." <1451036+jo-elimu@users.noreply.github.com> Date: Thu, 1 May 2025 00:56:58 +0700 Subject: [PATCH 2/3] refactor: remove references to content-provider lib #64 --- app/build.gradle | 4 --- app/src/main/AndroidManifest.xml | 2 -- .../viewmodel/TextToSpeechViewModelImpl.kt | 27 ------------------- 3 files changed, 33 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 89c5263..b52ab70 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,14 +20,10 @@ android { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - manifestPlaceholders = [contentProviderApplicationId: "ai.elimu.content_provider"] - buildConfigField("String", "CONTENT_PROVIDER_APPLICATION_ID", '"ai.elimu.content_provider"') signingConfig signingConfigs.debug } debug { - manifestPlaceholders = [contentProviderApplicationId: "ai.elimu.content_provider.debug"] - buildConfigField("String", "CONTENT_PROVIDER_APPLICATION_ID", '"ai.elimu.content_provider.debug"') } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1b8bb98..bfcea1e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,8 +2,6 @@ - - Date: Thu, 1 May 2025 01:05:49 +0700 Subject: [PATCH 3/3] refactor: remove model lib #64 --- README.md | 5 +---- gradle/libs.versions.toml | 2 -- utils/build.gradle | 2 -- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/README.md b/README.md index 163dd5c..d95477a 100644 --- a/README.md +++ b/README.md @@ -55,10 +55,7 @@ So, make sure you have Hilt & kapt imported in your projects via below check-lis > [!IMPORTANT] > After you publish a new release, remember to also bump the version in all Android app repos that depend on the `utils` library: -> * https://github.com/elimu-ai/launcher/blob/main/gradle/libs.versions.toml -> * https://github.com/elimu-ai/kukariri/blob/main/gradle/libs.versions.toml -> * https://github.com/elimu-ai/vitabu/blob/main/gradle/libs.versions.toml -> * https://github.com/elimu-ai/filamu/blob/main/gradle/libs.versions.toml +> * https://github.com/elimu-ai/appstore/blob/main/gradle/libs.versions.toml --- diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ab65e91..b42a607 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,6 @@ material = "1.12.0" hilt = "2.56.2" kotlinAndroidPlugin = "2.1.20" grgit = "5.3.0" -elimuModel = "model-2.0.103" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } @@ -27,6 +26,5 @@ kotlin-gradle-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-p android-gradle-plugin = { group = "com.android.tools.build", name = "gradle", version.ref = "agp" } material = { group = "com.google.android.material", name = "material", version.ref = "material" } grgit = { group = "org.ajoberstar.grgit", name = "grgit-gradle", version.ref = "grgit" } -elimu-model = { group = "ai.elimu", name = "model", version.ref = "elimuModel" } [plugins] diff --git a/utils/build.gradle b/utils/build.gradle index 27c5cf6..86a1fc1 100644 --- a/utils/build.gradle +++ b/utils/build.gradle @@ -46,8 +46,6 @@ android { } dependencies { - implementation libs.elimu.model // https://jitpack.io/#ai.elimu/model - implementation libs.androidx.core.ktx implementation libs.androidx.appcompat implementation libs.material