Skip to content

Commit 306db1e

Browse files
committed
omh-storage integration
1 parent c2eee8e commit 306db1e

161 files changed

Lines changed: 5253 additions & 3866 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
# Built application files
77
*.apk
88
*.aar
9+
!app/libs/*.aar
910
*.ap_
1011
*.aab
1112

app/build.gradle

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import java.util.concurrent.TimeUnit
2+
13
apply plugin: 'com.android.application'
24
apply plugin: 'kotlin-android'
35
apply plugin: 'kotlin-kapt'
@@ -54,8 +56,8 @@ android {
5456

5557
release {
5658
signingConfig signingConfigs.release
57-
58-
minifyEnabled true
59+
debuggable true
60+
minifyEnabled false
5961
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg'
6062
buildConfigField "String", "CRYPTO_IV", "\"LxbHiJhhUXcj\""
6163
buildConfigField "String", "FTP_SERVER_KEYSTORE_PASSWORD", "\"vishal007\""
@@ -145,6 +147,8 @@ dependencies {
145147
implementation libs.androidX.constraintLayout
146148
implementation libs.androidX.multidex //Multiple dex files
147149
implementation libs.androidX.biometric
150+
implementation libs.androidX.security
151+
implementation libs.androidX.browser.customtabs
148152
implementation libs.room.runtime
149153
implementation libs.room.rxjava2
150154

@@ -168,7 +172,7 @@ dependencies {
168172
testImplementation libs.jsoup
169173
testImplementation libs.room.migration
170174
testImplementation libs.mockk
171-
testImplementation libs.kotlin.coroutine.test
175+
testImplementation libs.kotlin.coroutines.test
172176
testImplementation libs.androidX.core.testing
173177
kspTest libs.auto.service
174178
testImplementation 'ch.qos.logback:logback-classic:1.4.14'
@@ -199,7 +203,6 @@ dependencies {
199203
implementation libs.libsu.core
200204
implementation libs.libsu.io
201205

202-
playImplementation libs.cloudrail.si.android
203206
playImplementation libs.junrar
204207
playImplementation libs.google.play.billing
205208

@@ -215,6 +218,7 @@ dependencies {
215218
implementation libs.commons.net
216219
//OkHttp
217220
implementation libs.okhttp
221+
implementation libs.okhttp.loggingInterceptor
218222

219223
implementation libs.bcpkix.jdk18on
220224
implementation libs.bcprov.jdk18on
@@ -249,6 +253,10 @@ dependencies {
249253
implementation project(':file_operations')
250254
implementation project(':portscanner')
251255

256+
implementation libs.kotlin.reflect
257+
implementation platform(libs.kotlin.coroutines.bom)
258+
implementation libs.kotlin.coroutines.android
259+
implementation libs.kotlin.coroutines.rxjava2
252260
implementation libs.kotlin.stdlib.jdk8
253261
implementation libs.acra.core
254262
implementation libs.slf4j.api
@@ -257,6 +265,10 @@ dependencies {
257265

258266
implementation libs.gson
259267
implementation libs.amaze.trashBin
268+
implementation libs.retrofit
269+
implementation libs.retrofit.jacksonConverter
270+
implementation libs.jackson.module.kotlin
271+
implementation fileTree(include: ['*.jar','*.aar'], dir: 'libs')
260272
}
261273

262274
kotlin {
@@ -265,12 +277,16 @@ kotlin {
265277

266278
configurations.configureEach {
267279
resolutionStrategy {
280+
cacheChangingModulesFor(0, TimeUnit.SECONDS)
268281
dependencySubstitution {
269282
substitute module("commons-logging:commons-logging-api:1.1") using module("commons-logging:commons-logging:1.1.1")
270283
substitute module("com.android.support:support-annotations:27.1.1") using module("com.android.support:support-annotations:27.0.2")
271284
// These two lines are added to prevent possible class clashes between awaitility (which uses hamcrest 2.1) and junit (which uses hamcrest 1.3).
272285
substitute module('org.hamcrest:hamcrest-core:1.3') using module("org.hamcrest:hamcrest:2.1")
273286
substitute module('org.hamcrest:hamcrest-library:1.3') using module("org.hamcrest:hamcrest:2.1")
287+
// Force coroutines to a specific version to avoid conflicts
288+
substitute module("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:*") using module("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2")
289+
substitute module("org.jetbrains.kotlinx:kotlinx-coroutines-android:*") using module("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2")
274290
}
275291
}
276292
}
32.5 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)