Skip to content

Commit aac348a

Browse files
Godzilla675Godzilla675
authored
Merge branch 'Siddhesh2377:re-write' into re-write
2 parents 5f3ea4c + cb31bbd commit aac348a

8 files changed

Lines changed: 136 additions & 124 deletions

File tree

‎app/build.gradle.kts‎

Lines changed: 44 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ android {
3434
release {
3535
isMinifyEnabled = true
3636
proguardFiles(
37-
getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
37+
getDefaultProguardFile("proguard-android-optimize.txt"),
38+
"proguard-rules.pro"
3839
)
3940
}
4041
}
@@ -59,6 +60,10 @@ android {
5960
packaging {
6061
jniLibs {
6162
useLegacyPackaging = true
63+
pickFirsts += setOf(
64+
"lib/arm64-v8a/libc++_shared.so",
65+
"lib/x86_64/libc++_shared.so"
66+
)
6267
}
6368
resources {
6469
excludes += setOf(
@@ -76,79 +81,68 @@ android {
7681
}
7782
}
7883

79-
8084
dependencies {
81-
implementation("com.google.dagger:hilt-android:2.57.2")
82-
ksp("com.google.dagger:hilt-android-compiler:2.57.2")
83-
84-
// Hilt Navigation Compose
85-
implementation("androidx.hilt:hilt-navigation-compose:1.3.0")
86-
87-
// WorkManager for background tasks
88-
implementation("androidx.work:work-runtime-ktx:2.11.0")
89-
implementation ("org.apache.commons:commons-compress:1.28.0")
90-
implementation ("org.tukaani:xz:1.11")
85+
// Dependency Injection
86+
implementation(libs.hilt.android)
87+
ksp(libs.hilt.android.compiler)
88+
implementation(libs.androidx.hilt.navigation.compose)
89+
90+
// Background Tasks & Networking
91+
implementation(libs.androidx.work.runtime.ktx)
92+
implementation(libs.commons.compress)
93+
implementation(libs.xz)
9194
implementation(libs.okhttp)
95+
implementation(libs.okhttp.logging.interceptor)
9296

93-
// Document Parsing Libraries
94-
// Apache POI for Excel and Word files
95-
implementation("org.apache.poi:poi:5.2.5")
96-
implementation("org.apache.poi:poi-ooxml:5.2.5")
97-
implementation("org.apache.poi:poi-scratchpad:5.2.5") // For legacy .doc files
98-
99-
// PDFBox-Android for PDF parsing (Android-compatible port)
100-
implementation("com.tom-roush:pdfbox-android:2.0.27.0")
101-
102-
// EPUB parsing - using local JAR file
97+
// Document Parsing
98+
implementation(libs.poi)
99+
implementation(libs.poi.ooxml)
100+
implementation(libs.poi.scratchpad)
101+
implementation(libs.pdfbox.android)
103102
implementation(files("../libs/epublib-core-3.1.jar"))
103+
implementation(libs.slf4j.android)
104104

105-
// SLF4J Android binding for EPUB library
106-
implementation("org.slf4j:slf4j-android:1.7.36")
107-
108-
//Data-Ops
109-
implementation(libs.room.ktx)
110-
implementation(libs.room.runtime)
111-
implementation(libs.androidx.compose.runtime)
105+
// Database & Storage
106+
implementation(libs.androidx.room.ktx)
107+
implementation(libs.androidx.room.runtime)
108+
ksp(libs.androidx.room.compiler)
112109
implementation(libs.androidx.datastore.preferences)
113-
ksp(libs.room.compiler)
114-
// Retrofit for API calls
115-
implementation(libs.retrofit)
116-
implementation(libs.converter.gson)
117-
// OkHttp for logging
118-
implementation(libs.logging.interceptor)
110+
111+
// Serialization & API
119112
implementation(libs.kotlinx.serialization.json)
113+
implementation(libs.retrofit)
114+
implementation(libs.retrofit.converter.gson)
120115

121-
//Projects
116+
// Local Projects & AI Libraries
122117
implementation(":ai_gguf-release@aar")
123118
implementation(":ai_sd-release@aar")
119+
//implementation(":runanywhere-core-onnx-release@aar")
120+
//implementation(":runanywhere-kotlin-release@aar")
124121
implementation(project(":memory-vault"))
125122
implementation(project(":neuron-packet"))
126123

127-
// Core Android
124+
// AndroidX Core & Lifecycle
128125
implementation(libs.androidx.core.ktx)
129-
130-
// ViewModel
131126
implementation(libs.androidx.lifecycle.runtime.ktx)
132127
implementation(libs.androidx.lifecycle.viewmodel.compose)
133128

134-
// Compose
129+
// Jetpack Compose
135130
implementation(libs.androidx.activity.compose)
136131
implementation(platform(libs.androidx.compose.bom))
137-
implementation(libs.androidx.ui)
138-
implementation(libs.androidx.ui.graphics)
139-
implementation(libs.androidx.ui.tooling.preview)
140-
implementation("androidx.navigation:navigation-compose:2.7.7")
132+
implementation(libs.androidx.compose.ui)
133+
implementation(libs.androidx.compose.ui.graphics)
134+
implementation(libs.androidx.compose.ui.tooling.preview)
135+
implementation(libs.androidx.compose.runtime)
136+
implementation(libs.androidx.compose.ui.text)
137+
implementation(libs.androidx.navigation.compose)
141138

142-
// Material (for XML themes)
139+
// Material Design
143140
implementation(libs.androidx.material)
144-
145-
// Material 3 (for Compose)
146141
implementation(libs.androidx.material3)
147-
implementation(libs.androidx.material.icons)
148-
implementation(libs.androidx.compose.ui.text)
142+
implementation(libs.androidx.material.icons.extended)
149143

150144
// Debug
151-
debugImplementation(libs.androidx.ui.tooling)
145+
debugImplementation(libs.androidx.compose.ui.tooling)
152146
}
153147

154148
fun getProperty(value: String): String {

‎build.gradle.kts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
// Top-level build file where you can add configuration options common to all sub-projects/modules.
21
plugins {
32
alias(libs.plugins.android.application) apply false
3+
alias(libs.plugins.android.library) apply false
44
alias(libs.plugins.kotlin.android) apply false
55
alias(libs.plugins.kotlin.compose) apply false
6-
alias(libs.plugins.android.library) apply false
76
alias(libs.plugins.kotlin.ksp) apply false
87
alias(libs.plugins.kotlin.serialization) apply false
98
alias(libs.plugins.google.dagger.hilt) apply false

‎gradle/libs.versions.toml‎

Lines changed: 68 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,88 @@
11
[versions]
2-
# Build & Toolchain
32
agp = "8.13.2"
4-
converter-gson = "3.0.0"
53
kotlin = "2.3.0"
64
ksp = "2.2.20-2.0.3"
75

8-
# Database
9-
logging-interceptor = "5.3.2"
10-
room = "2.8.4"
6+
androidx-activity-compose = "1.12.2"
7+
androidx-appcompat = "1.7.1"
8+
androidx-compose-bom = "2026.01.00"
9+
androidx-compose-material3 = "1.5.0-alpha12"
10+
androidx-compose-runtime = "1.10.1"
11+
androidx-compose-ui-text = "1.10.1"
12+
androidx-core-ktx = "1.17.0"
13+
androidx-datastore = "1.2.0"
14+
androidx-lifecycle = "2.10.0"
15+
androidx-material = "1.13.0"
16+
androidx-material-icons-extended = "1.7.8"
17+
androidx-navigation-compose = "2.9.6"
18+
androidx-room = "2.8.4"
19+
androidx-work-runtime-ktx = "2.11.0"
1120

12-
# Data-Model
21+
commons-compress = "1.28.0"
22+
dagger-hilt = "2.58"
23+
hilt-navigation-compose = "1.3.0"
1324
kotlinx-serialization = "1.9.0"
14-
datastore = "1.2.0"
15-
16-
# AndroidX Core
17-
core-ktx = "1.17.0"
18-
dagger-hilt = "2.57.2"
19-
20-
# Compose
21-
compose-bom = "2025.12.01"
22-
compose-material3 = "1.5.0-alpha11"
23-
material = "1.13.0"
24-
activity-compose = "1.12.2"
25-
material-icons-extended = "1.7.8"
25+
lz4-java = "1.8.0"
26+
okhttp = "5.3.2"
27+
pdfbox-android = "2.0.27.0"
28+
poi = "5.5.1"
29+
retrofit = "3.0.0"
30+
slf4j-android = "1.7.36"
31+
xz = "1.11"
2632

27-
# Lifecycle (for ViewModel)
28-
lifecycle = "2.10.0"
33+
androidx-espresso-core = "3.7.0"
34+
androidx-junit = "1.3.0"
2935
junit = "4.13.2"
30-
junit-version = "1.3.0"
31-
espresso-core = "3.7.0"
32-
appcompat = "1.7.1"
33-
ui-text = "1.10.0"
34-
runtime = "1.10.0"
35-
okhttp = "5.3.2"
3636

3737
[libraries]
38-
#Network
39-
okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
40-
41-
# Database
42-
room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
43-
room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" }
44-
room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
38+
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidx-activity-compose" }
39+
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" }
40+
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidx-compose-bom" }
41+
androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "androidx-compose-runtime" }
42+
androidx-compose-ui-text = { group = "androidx.compose.ui", name = "ui-text", version.ref = "androidx-compose-ui-text" }
43+
androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" }
44+
androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
45+
androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
46+
androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
47+
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core-ktx" }
48+
androidx-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "androidx-datastore" }
49+
androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "hilt-navigation-compose" }
50+
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
51+
androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
52+
androidx-material = { group = "com.google.android.material", name = "material", version.ref = "androidx-material" }
53+
androidx-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "androidx-material-icons-extended" }
54+
androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidx-compose-material3" }
55+
androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidx-navigation-compose" }
56+
androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "androidx-room" }
57+
androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "androidx-room" }
58+
androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "androidx-room" }
59+
androidx-work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "androidx-work-runtime-ktx" }
4560

46-
#Data-Model
47-
converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "converter-gson" }
48-
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
49-
androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastore" }
50-
51-
# AndroidX Core
52-
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx" }
53-
54-
# Lifecycle (ViewModel)
55-
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" }
56-
androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle" }
57-
58-
# Compose & UI
59-
androidx-material-icons = { module = "androidx.compose.material:material-icons-extended", version.ref = "material-icons-extended" }
60-
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" }
61-
androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "compose-material3" }
62-
androidx-material = { group = "com.google.android.material", name = "material", version.ref = "material" }
63-
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activity-compose" }
64-
androidx-ui = { group = "androidx.compose.ui", name = "ui" }
65-
androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
66-
androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
61+
commons-compress = { group = "org.apache.commons", name = "commons-compress", version.ref = "commons-compress" }
62+
hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "dagger-hilt" }
63+
hilt-android-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "dagger-hilt" }
64+
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
65+
lz4-java = { group = "org.lz4", name = "lz4-java", version.ref = "lz4-java" }
66+
okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
67+
okhttp-logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp" }
68+
pdfbox-android = { group = "com.tom-roush", name = "pdfbox-android", version.ref = "pdfbox-android" }
69+
poi = { group = "org.apache.poi", name = "poi", version.ref = "poi" }
70+
poi-ooxml = { group = "org.apache.poi", name = "poi-ooxml", version.ref = "poi" }
71+
poi-scratchpad = { group = "org.apache.poi", name = "poi-scratchpad", version.ref = "poi" }
72+
retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
73+
retrofit-converter-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit" }
74+
slf4j-android = { group = "org.slf4j", name = "slf4j-android", version.ref = "slf4j-android" }
75+
xz = { group = "org.tukaani", name = "xz", version.ref = "xz" }
6776

68-
# Debug tools
69-
androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
77+
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidx-espresso-core" }
78+
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-junit" }
7079
junit = { group = "junit", name = "junit", version.ref = "junit" }
71-
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junit-version" }
72-
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" }
73-
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
74-
androidx-compose-ui-text = { group = "androidx.compose.ui", name = "ui-text", version.ref = "ui-text" }
75-
logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "logging-interceptor" }
76-
retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "converter-gson" }
77-
androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "runtime" }
7880

7981
[plugins]
8082
android-application = { id = "com.android.application", version.ref = "agp" }
83+
android-library = { id = "com.android.library", version.ref = "agp" }
84+
google-dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger-hilt" }
8185
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
8286
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
83-
android-library = { id = "com.android.library", version.ref = "agp" }
84-
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
8587
kotlin-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
86-
google-dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger-hilt"}
88+
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

‎libs/runanywhere-core-onnx-release.aar‎

8.74 MB
Binary file not shown.

‎libs/runanywhere-kotlin-release.aar‎

2.41 MB
Binary file not shown.

‎memory-vault/build.gradle.kts‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
22
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
33
import java.io.FileInputStream
44
import java.util.Properties
5+
import kotlin.apply
56

67
plugins {
78
alias(libs.plugins.android.library)
89
alias(libs.plugins.kotlin.android)
910
}
1011

12+
val localPropertiesFile = rootProject.file("local.properties")
13+
1114
android {
1215
namespace = "com.memoryvault"
1316
compileSdk {
@@ -21,6 +24,7 @@ android {
2124
}
2225
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2326
consumerProguardFiles("consumer-rules.pro")
27+
buildConfigField("String", "ALIAS", getProperty("ALIAS"))
2428
}
2529

2630
buildTypes {
@@ -43,6 +47,7 @@ android {
4347
jvmTarget.set(JvmTarget.JVM_17)
4448
}
4549
}
50+
4651
packaging {
4752
jniLibs {
4853
useLegacyPackaging = true
@@ -51,8 +56,19 @@ android {
5156
}
5257

5358
dependencies {
54-
implementation("org.lz4:lz4-java:1.8.0")
59+
implementation(libs.lz4.java)
5560
implementation(libs.androidx.core.ktx)
5661
implementation(libs.androidx.appcompat)
5762
implementation(libs.androidx.material)
63+
}
64+
65+
fun getProperty(value: String): String {
66+
return if (localPropertiesFile.exists()) {
67+
val localProps = Properties().apply {
68+
load(FileInputStream(localPropertiesFile))
69+
}
70+
localProps.getProperty(value) ?: "\"sample_val\""
71+
} else {
72+
System.getenv(value) ?: "\"sample_val\""
73+
}
5874
}

0 commit comments

Comments
 (0)