Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update MarketKit and libraries #6953

Merged
merged 2 commits into from
Jan 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,9 @@ android {
pickFirsts += ['META-INF/atomicfu.kotlin_module']
excludes += ['META-INF/INDEX.LIST', 'META-INF/DEPENDENCIES', 'META-INF/LICENSE.md', 'META-INF/NOTICE.md']
}
jniLibs {
useLegacyPackaging true
}
}

kotlinOptions {
Expand Down Expand Up @@ -215,7 +218,7 @@ dependencies {
implementation 'androidx.glance:glance-appwidget:1.0.0'

// Room
def room_version = '2.5.2'
def room_version = '2.6.1'
implementation "androidx.room:room-runtime:$room_version"
implementation "androidx.room:room-ktx:$room_version"
implementation "androidx.room:room-rxjava2:$room_version"
Expand All @@ -225,7 +228,7 @@ dependencies {
// optional - ReactiveStreams support for LiveData
implementation "androidx.lifecycle:lifecycle-reactivestreams-ktx:$lifecycle_version"

implementation 'androidx.recyclerview:recyclerview:1.3.1'
implementation 'androidx.recyclerview:recyclerview:1.3.2'

implementation "com.google.android.material:material:$material_version"

Expand All @@ -249,7 +252,7 @@ dependencies {
implementation 'me.relex:circleindicator:2.1.6'

//Custom tabs, chrome
implementation "androidx.browser:browser:1.6.0"
implementation "androidx.browser:browser:1.7.0"

// Navigation component
implementation "androidx.navigation:navigation-fragment-ktx:$navigation_ktx_version"
Expand All @@ -262,7 +265,7 @@ dependencies {
api 'com.journeyapps:zxing-android-embedded:4.3.0'

// WorkManager Kotlin
def work_version = "2.8.1"
def work_version = "2.9.0"
implementation "androidx.work:work-runtime-ktx:$work_version"
// WorkManager RxJava2 support
implementation "androidx.work:work-rxjava2:$work_version"
Expand All @@ -277,7 +280,7 @@ dependencies {
implementation 'com.github.horizontalsystems:ethereum-kit-android:3a02f3a'
implementation 'com.github.horizontalsystems:blockchain-fee-rate-kit-android:1d3bd49'
implementation 'com.github.horizontalsystems:binance-chain-kit-android:c1509a2'
implementation 'com.github.horizontalsystems:market-kit-android:c1a875a'
implementation 'com.github.horizontalsystems:market-kit-android:e351444'
implementation 'com.github.horizontalsystems:solana-kit-android:34ef394'
implementation 'com.github.horizontalsystems:tron-kit-android:5eb6395'
// Zcash SDK
Expand Down Expand Up @@ -309,15 +312,15 @@ dependencies {
implementation project(':components:chartview')

// Integration with activities
implementation 'androidx.activity:activity-compose:1.8.0'
implementation 'androidx.activity:activity-compose:1.8.2'
// Compose Material Design
implementation "androidx.compose.material:material:$compose_version"
// Animations
implementation "androidx.compose.animation:animation:$compose_version"
// Tooling support (Previews, etc.)
implementation "androidx.compose.ui:ui-tooling:$compose_version"
// Integration with ViewModels
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2'
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0'

implementation "androidx.compose.runtime:runtime-livedata:$compose_version"

Expand Down
1 change: 0 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<application
android:name=".core.App"
android:allowBackup="false"
android:extractNativeLibs="true"
android:icon="@mipmap/launcher_main"
android:label="@string/App_Name"
android:networkSecurityConfig="@xml/network_security_config"
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/java/io/horizontalsystems/bankwallet/core/App.kt
Original file line number Diff line number Diff line change
Expand Up @@ -495,8 +495,8 @@ class App : CoreApp(), WorkConfiguration.Provider, ImageLoaderFactory {
}
}

override fun getWorkManagerConfiguration(): WorkConfiguration {
return if (BuildConfig.DEBUG) {
override val workManagerConfiguration: androidx.work.Configuration
get() = if (BuildConfig.DEBUG) {
WorkConfiguration.Builder()
.setMinimumLoggingLevel(Log.DEBUG)
.build()
Expand All @@ -505,7 +505,6 @@ class App : CoreApp(), WorkConfiguration.Provider, ImageLoaderFactory {
.setMinimumLoggingLevel(Log.ERROR)
.build()
}
}

override fun localizedContext(): Context {
return localeAwareContext(this)
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ buildscript {
ext {
compile_sdk_version = 34
min_sdk_version = 27
lifecycle_version = '2.6.2'
lifecycle_version = '2.7.0'

compose_version = '1.5.3'
kotlin_version = '1.8.0'
material_version = "1.10.0"
material_version = "1.11.0"
appcompat_version = "1.6.1"
constraint_version = "2.1.4"
core_ktx_version = "1.10.1"
fragment_ktx_version = "1.6.1"
navigation_ktx_version = "2.7.5"
navigation_ktx_version = "2.7.6"
rxjava_version = "2.2.19"
biometric_version = "1.1.0"
junit_version = "4.13.2"
Expand All @@ -25,7 +25,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.1.3'
classpath 'com.android.tools.build:gradle:8.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Oct 10 12:47:09 KGT 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME