Skip to content

Commit 2525183

Browse files
committed
omh-storage integration
1 parent 8019ad9 commit 2525183

File tree

161 files changed

+5267
-3773
lines changed

Some content is hidden

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

161 files changed

+5267
-3773
lines changed

.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'
@@ -201,7 +205,6 @@ dependencies {
201205
implementation libs.libsu.core
202206
implementation libs.libsu.io
203207

204-
playImplementation libs.cloudrail.si.android
205208
playImplementation libs.junrar
206209
playImplementation libs.google.play.billing
207210

@@ -217,6 +220,7 @@ dependencies {
217220
implementation libs.commons.net
218221
//OkHttp
219222
implementation libs.okhttp
223+
implementation libs.okhttp.loggingInterceptor
220224

221225
implementation libs.bcpkix.jdk18on
222226
implementation libs.bcprov.jdk18on
@@ -251,6 +255,10 @@ dependencies {
251255
implementation project(':file_operations')
252256
implementation project(':portscanner')
253257

258+
implementation libs.kotlin.reflect
259+
implementation platform(libs.kotlin.coroutines.bom)
260+
implementation libs.kotlin.coroutines.android
261+
implementation libs.kotlin.coroutines.rxjava2
254262
implementation libs.kotlin.stdlib.jdk8
255263
implementation libs.acra.core
256264
implementation libs.slf4j.api
@@ -259,6 +267,10 @@ dependencies {
259267

260268
implementation libs.gson
261269
implementation libs.amaze.trashBin
270+
implementation libs.retrofit
271+
implementation libs.retrofit.jacksonConverter
272+
implementation libs.jackson.module.kotlin
273+
implementation fileTree(include: ['*.jar','*.aar'], dir: 'libs')
262274
}
263275

264276
kotlin {
@@ -267,12 +279,16 @@ kotlin {
267279

268280
configurations.configureEach {
269281
resolutionStrategy {
282+
cacheChangingModulesFor(0, TimeUnit.SECONDS)
270283
dependencySubstitution {
271284
substitute module("commons-logging:commons-logging-api:1.1") using module("commons-logging:commons-logging:1.1.1")
272285
substitute module("com.android.support:support-annotations:27.1.1") using module("com.android.support:support-annotations:27.0.2")
273286
// These two lines are added to prevent possible class clashes between awaitility (which uses hamcrest 2.1) and junit (which uses hamcrest 1.3).
274287
substitute module('org.hamcrest:hamcrest-core:1.3') using module("org.hamcrest:hamcrest:2.1")
275288
substitute module('org.hamcrest:hamcrest-library:1.3') using module("org.hamcrest:hamcrest:2.1")
289+
// Force coroutines to a specific version to avoid conflicts
290+
substitute module("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:*") using module("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2")
291+
substitute module("org.jetbrains.kotlinx:kotlinx-coroutines-android:*") using module("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2")
276292
}
277293
}
278294
}
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)