Merge pull request #315 from elimu-ai/appstore-2.5.0

chore(deps): appstore 2.5.0

Author: jo-elimu

README.md

@@ -169,7 +169,6 @@ To perform a release, follow these steps:
 
 > [!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/common-utils/blob/main/gradle/libs.versions.toml
 > * https://github.com/elimu-ai/kukariri/blob/main/gradle/libs.versions.toml
 > * https://github.com/elimu-ai/herufi/blob/main/gradle/libs.versions.toml
 > * https://github.com/elimu-ai/vitabu/blob/main/gradle/libs.versions.toml
@@ -181,7 +180,7 @@ To perform a release, follow these steps:
   <img src="https://github.com/elimu-ai/webapp/blob/main/src/main/webapp/static/img/logo-text-256x78.png" />
 </p>
 <p align="center">
-  elimu.ai - Free open-source learning software for out-of-school children ✨🚀
+  elimu.ai - Free open-source learning software for out-of-school children 🚀✨
 </p>
 <p align="center">
   <a href="https://elimu.ai">Website 🌐</a>

app/build.gradle

@@ -15,8 +15,8 @@ android {
         applicationId "ai.elimu.content_provider"
         minSdkVersion 26
         targetSdkVersion 35
-        versionCode 1002057
-        versionName "1.2.57-SNAPSHOT"
+        versionCode 1003000
+        versionName "1.3.0-SNAPSHOT"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
             annotationProcessorOptions {
@@ -49,9 +49,8 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation project(':utils')
 
-    implementation(libs.elimu.model) // https://jitpack.io/#ai.elimu/model
+    implementation(libs.elimu.appstore) // https://jitpack.io/#ai.elimu/appstore
 
     implementation(libs.commons.io)
     implementation(libs.material)
@@ -70,7 +69,6 @@ dependencies {
 
     // Room components
     implementation(libs.androidx.room.runtime)
-    implementation libs.androidx.core.ktx
     implementation libs.androidx.lifecycle.viewmodel.ktx
     annotationProcessor(libs.androidx.room.compiler)
     androidTestImplementation(libs.androidx.room.testing)

app/src/main/AndroidManifest.xml

@@ -81,17 +81,5 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/video_file_path"/>
         </provider>
-
-        <provider
-            android:name=".provider.SharedDataProvider"
-            android:authorities="${applicationId}.provider.shared_data"
-            android:enabled="true"
-            android:exported="true"
-            android:grantUriPermissions="true">
-
-            <grant-uri-permission android:pathPattern=".*"/>
-
-        </provider>
-
     </application>
 </manifest>

app/src/main/java/ai/elimu/content_provider/MainActivity.kt

@@ -2,7 +2,6 @@ package ai.elimu.content_provider
 
 import ai.elimu.content_provider.language.SelectLanguageActivity
 import ai.elimu.content_provider.util.SharedPreferencesHelper
-import ai.elimu.content_provider.utils.LanguageUtils
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
@@ -30,8 +29,7 @@ class MainActivity : AppCompatActivity() {
         val language = SharedPreferencesHelper.getLanguage(
             applicationContext
         )
-        Log.i("getLanguage", "language: $language. \nFrom utils: " +
-                "${LanguageUtils.getLanguage(this@MainActivity, BuildConfig.APPLICATION_ID)}")
+        Log.i(javaClass.name, "language: ${language}")
         if (language == null) {
             // Redirect to language selection
 

app/src/main/java/ai/elimu/content_provider/provider/SharedDataProvider.kt

@@ -1,8 +1,7 @@
 [versions]
-elimuModel = "model-2.0.102"
-elimuAnalytics = "3.1.37"
+elimuAppstore = "2.5.0"
 commonsIo = "2.19.0"
-agp = "8.5.2"
+agp = "8.6.0"
 material = "1.12.0"
 retrofit = "2.11.0"
 junit = "4.13.2"
@@ -15,13 +14,11 @@ lifecycleExtensions = "2.2.0"
 room = "2.7.1"
 androidXJunit = "1.2.1"
 androidXEspresso = "3.6.1"
-coreKtx = "1.15.0"
 lifecycleViewmodelKtx = "2.8.7"
 kotlin = "2.1.20"
 
 [libraries]
-elimu-model = { group = "ai.elimu", name = "model", version.ref = "elimuModel" }
-elimu-analytics = { group = "ai.elimu", name = "analytics", version.ref = "elimuAnalytics" }
+elimu-appstore = { group = "ai.elimu", name = "appstore", version.ref = "elimuAppstore" }
 commons-io = { group = "commons-io", name = "commons-io", version.ref = "commonsIo" }
 agp = { module = "com.android.tools.build:gradle", version.ref = "agp" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
@@ -40,7 +37,6 @@ androidx-espresso = { group = "androidx.test.espresso", name = "espresso-core",
 retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
 retrofit-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
-androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
 androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycleViewmodelKtx" }
 
 [plugins]

app/src/test/java/ai/elimu/content_provider/utils/LanguageUtilsTest.kt

@@ -14,8 +14,8 @@ android {
     defaultConfig {
         minSdkVersion 26
         targetSdkVersion 35
-        versionCode 1002057
-        versionName "1.2.57-SNAPSHOT"
+        versionCode 1003000
+        versionName "1.3.0-SNAPSHOT"
     }
 
     buildTypes {
@@ -33,18 +33,27 @@ android {
 }
 
 dependencies {
-    implementation(libs.elimu.model) // https://jitpack.io/#ai.elimu/model
-    implementation(libs.elimu.analytics) // https://jitpack.io/#ai.elimu/analytics
+    implementation(libs.elimu.appstore) // https://jitpack.io/#ai.elimu/appstore
 
-    implementation libs.androidx.core.ktx
-
-    testImplementation libs.junit
+    testImplementation(libs.junit)
 }
 
 publishing {
     publications {
         aar(MavenPublication) {
+            groupId = "ai.elimu"
+            artifactId = "content-provider"
+            version = android.defaultConfig.versionName
             artifact("${buildDir}/outputs/aar/utils-release.aar")
+            pom.withXml {
+                def dependenciesNode = asNode().appendNode('dependencies')
+                configurations.implementation.allDependencies.each {
+                    def dependencyNode = dependenciesNode.appendNode('dependency')
+                    dependencyNode.appendNode('groupId', it.group)
+                    dependencyNode.appendNode('artifactId', it.name)
+                    dependencyNode.appendNode('version', it.version)
+                }
+            }
         }
     }
 }