Skip to content

Commit 9bab2b9

Browse files
authored
Merge branch 'main' into feat/support_scoped_storage_images_sharing
2 parents d19c17b + 0d6edfd commit 9bab2b9

File tree

4 files changed

+61
-19
lines changed

4 files changed

+61
-19
lines changed

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ The Content Provider comes with a [`utils`](utils) library (`.aar`) which makes
4141

4242
See https://jitpack.io/#elimu-ai/content-provider/ for the latest version available.
4343

44+
> [!TIP]
45+
> To find all Android app repos that depend on this library, go to https://github.com/search?q=org%3Aelimu-ai+com.github.elimu-ai%3Acontent-provider%3A&type=code
46+
4447
### Usage Example
4548

4649
For an example of another Android app using the `utils` library, see the Vitabu app's Gradle configuration:

app/build.gradle

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,32 +42,32 @@ android {
4242
dependencies {
4343
implementation fileTree(dir: 'libs', include: ['*.jar'])
4444

45-
implementation 'com.github.elimu-ai:model:model-2.0.80' // See https://jitpack.io/#elimu-ai/model
45+
implementation(libs.elimu.model) // See https://jitpack.io/#elimu-ai/model
4646

47-
implementation 'commons-io:commons-io:2.17.0'
48-
implementation 'com.google.android.material:material:1.5.0'
47+
implementation(libs.commons.io)
48+
implementation(libs.material)
4949

5050
// AndroidX
51-
implementation 'androidx.appcompat:appcompat:1.4.1'
52-
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
53-
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
54-
implementation 'androidx.navigation:navigation-fragment:2.4.2'
55-
implementation 'androidx.navigation:navigation-ui:2.4.2'
56-
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
51+
implementation(libs.androidx.appcompat)
52+
implementation(libs.androidx.legacy.supportv4)
53+
implementation(libs.androidx.constraint.layout)
54+
implementation(libs.androidx.navigation.fragment)
55+
implementation(libs.androidx.navigation.ui)
56+
implementation(libs.androidx.lifecycle.extensions)
5757

5858
// Retrofit
59-
implementation 'com.squareup.retrofit2:retrofit:2.11.0'
60-
implementation 'com.squareup.retrofit2:converter-gson:2.11.0'
59+
implementation(libs.retrofit)
60+
implementation(libs.retrofit.gson)
6161

6262
// Room components
63-
implementation "androidx.room:room-runtime:2.4.2"
64-
annotationProcessor "androidx.room:room-compiler:2.4.2"
65-
androidTestImplementation "androidx.room:room-testing:2.4.2"
63+
implementation(libs.androidx.room.runtime)
64+
annotationProcessor(libs.androidx.room.compiler)
65+
androidTestImplementation(libs.androidx.room.testing)
6666

67-
testImplementation 'junit:junit:4.13.2'
67+
testImplementation(libs.junit)
6868

69-
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
70-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
69+
androidTestImplementation(libs.androidx.junit)
70+
androidTestImplementation(libs.androidx.espresso)
7171
}
7272

7373
task ensureCleanRepo {

gradle/libs.versions.toml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
[versions]
2+
elimuModel = "model-2.0.83"
3+
elimuAnalytics = "3.1.27"
4+
commonsIo = "2.17.0"
5+
material = "1.5.0"
6+
retrofit = "2.11.0"
7+
junit = "4.13.2"
8+
9+
legacySupportV4 = "1.0.0"
10+
constraintLayout = "2.1.3"
11+
appCompat = "1.4.1"
12+
navigation = "2.4.2"
13+
lifecycleExtensions = "2.2.0"
14+
room = "2.4.2"
15+
androidXJunit = "1.1.3"
16+
androidXEspresso = "3.4.0"
17+
18+
[libraries]
19+
elimu-model = { group = "com.github.elimu-ai", name = "model", version.ref = "elimuModel" }
20+
elimu-analytics = { group = "com.github.elimu-ai", name = "analytics", version.ref = "elimuAnalytics" }
21+
commons-io = { group = "commons-io", name = "commons-io", version.ref = "commonsIo" }
22+
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
23+
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appCompat" }
24+
androidx-legacy-supportv4 = { group = "androidx.legacy", name = "legacy-support-v4", version.ref = "legacySupportV4" }
25+
androidx-constraint-layout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintLayout" }
26+
androidx-navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment", version.ref = "navigation" }
27+
androidx-navigation-ui = { group = "androidx.navigation", name = "navigation-ui", version.ref = "navigation" }
28+
androidx-lifecycle-extensions = { group = "androidx.lifecycle", name = "lifecycle-extensions", version.ref = "lifecycleExtensions" }
29+
androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
30+
androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
31+
androidx-room-testing = { group = "androidx.room", name = "room-testing", version.ref = "room" }
32+
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidXJunit" }
33+
androidx-espresso = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidXEspresso" }
34+
35+
retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
36+
retrofit-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit" }
37+
junit = { group = "junit", name = "junit", version.ref = "junit" }
38+
39+
[plugins]

utils/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ android {
2727
}
2828

2929
dependencies {
30-
implementation 'com.github.elimu-ai:model:model-2.0.80' // See https://jitpack.io/#elimu-ai/model
31-
implementation 'com.github.elimu-ai:analytics:3.1.27@aar' // See https://jitpack.io/#elimu-ai/analytics
30+
implementation(libs.elimu.model) // See https://jitpack.io/#elimu-ai/model
31+
implementation(libs.elimu.analytics) // See https://jitpack.io/#elimu-ai/analytics
3232
}
3333

3434
// See https://docs.gradle.org/current/dsl/org.gradle.api.publish.maven.MavenPublication.html

0 commit comments

Comments
 (0)