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.

Sign up for GitHub

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

Jump to bottom

Update libraries #7415

Merged
merged 2 commits into from
May 7, 2024
Merged

Update libraries #7415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc3fdc2
Update libraries
rafaelekol May 7, 2024
2a5e2eb
Replace Kapt with KSP
rafaelekol May 7, 2024
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
35 changes: 17 additions & 18 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ import com.android.tools.profgen.ArtProfileKt
import com.android.tools.profgen.ArtProfileSerializer
import com.android.tools.profgen.DexFile

apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-parcelize'
apply plugin: 'kotlin-kapt'
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'kotlin-parcelize'
id 'com.google.devtools.ksp'
}

android {

Expand All @@ -21,11 +23,8 @@ android {
versionName "0.39.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

kapt {
arguments {
arg("room.schemaLocation", "$projectDir/schemas".toString())
arg("room.incremental", true)
}
ksp {
arg("room.schemaLocation", "$projectDir/schemas".toString())
}
vectorDrawables.useSupportLibrary = true
lintOptions {
Expand Down Expand Up @@ -161,7 +160,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion '1.4.0'
kotlinCompilerExtensionVersion '1.5.12'
}
namespace 'io.horizontalsystems.bankwallet'
lint {
Expand Down Expand Up @@ -214,7 +213,7 @@ dependencies {
implementation "androidx.room:room-runtime:$room_version"
implementation "androidx.room:room-ktx:$room_version"
implementation "androidx.room:room-rxjava2:$room_version"
kapt "androidx.room:room-compiler:$room_version"
ksp "androidx.room:room-compiler:$room_version"
// alternately - if using Java8, use the following instead of compiler
implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
// optional - ReactiveStreams support for LiveData
Expand All @@ -229,10 +228,10 @@ dependencies {
// explicitly depend on RxJava's latest version for bug fixes and new features.
// (see https://github.com/ReactiveX/RxJava/releases for latest 2.x.x version)
implementation "io.reactivex.rxjava2:rxjava:$rxjava_version"
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.9.0'
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
implementation 'com.squareup.retrofit2:converter-scalars:2.9.0'
implementation 'com.squareup.retrofit2:retrofit:2.11.0'
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.11.0'
implementation 'com.squareup.retrofit2:converter-gson:2.11.0'
implementation 'com.squareup.retrofit2:converter-scalars:2.11.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.11.0'
implementation 'com.google.code.gson:gson:2.10.1'
implementation "androidx.biometric:biometric:$biometric_version"
Expand All @@ -244,7 +243,7 @@ dependencies {
implementation 'me.relex:circleindicator:2.1.6'

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

// Navigation component
implementation "androidx.navigation:navigation-fragment-ktx:$navigation_ktx_version"
Expand Down Expand Up @@ -294,7 +293,7 @@ dependencies {

implementation 'com.twitter.twittertext:twitter-text:3.1.0'

implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-rx2:1.7.3'

// UI modules
Expand All @@ -304,7 +303,7 @@ dependencies {
implementation project(':components:chartview')

// Integration with activities
implementation 'androidx.activity:activity-compose:1.8.2'
implementation 'androidx.activity:activity-compose:1.9.0'
// Compose Material Design
implementation "androidx.compose.material:material:$compose_version"
// Animations
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/io/horizontalsystems/bankwallet/core/storage/DatabaseConverters.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,12 @@ class DatabaseConverters {
}

@TypeConverter
fun fromMap(v: Map<String, String>): String {
fun fromMap(v: Map<String, String?>): String {
return gson.toJson(v)
}

@TypeConverter
fun toMap(v: String): Map<String, String> {
return gson.fromJson(v, object : TypeToken<Map<String, String>>() {}.type)
fun toMap(v: String): Map<String, String?> {
return gson.fromJson(v, object : TypeToken<Map<String, String?>>() {}.type)
}
}
18 changes: 11 additions & 7 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ buildscript {
min_sdk_version = 27
lifecycle_version = '2.7.0'

compose_version = '1.6.0'
kotlin_version = '1.8.0'
material_version = "1.11.0"
compose_version = '1.6.7'
kotlin_version = '1.9.23'
material_version = "1.12.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.6"
core_ktx_version = "1.13.1"
fragment_ktx_version = "1.7.0"
navigation_ktx_version = "2.7.7"
rxjava_version = "2.2.19"
biometric_version = "1.1.0"
junit_version = "4.13.2"
Expand All @@ -25,14 +25,18 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.3.1'
classpath 'com.android.tools.build:gradle:8.4.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}

plugins {
id 'com.google.devtools.ksp' version '1.9.23-1.0.20' apply false
}

allprojects {
repositories {
google()
Expand Down
2 changes: 1 addition & 1 deletion components/chartview/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

android {
compileSdkVersion compile_sdk_version
compileSdk compile_sdk_version

defaultConfig {
minSdkVersion min_sdk_version
Expand Down
2 changes: 1 addition & 1 deletion components/icons/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

android {
compileSdkVersion compile_sdk_version
compileSdk compile_sdk_version

defaultConfig {
minSdkVersion min_sdk_version
Expand Down
2 changes: 1 addition & 1 deletion core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-parcelize'

android {
compileSdkVersion compile_sdk_version
compileSdk compile_sdk_version

defaultConfig {
minSdkVersion min_sdk_version
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Loading