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

Update Android version #21

Merged
merged 2 commits into from
Jun 13, 2024
Merged

Update Android version #21

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
a016449
WIP
ruixhuang Jun 12, 2024
9d815bb
Revert some changes
ruixhuang Jun 13, 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
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ buildscript {

// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '8.3.1' apply false
id 'com.android.library' version '8.3.1' apply false
id 'com.android.application' version '8.4.2' apply false
id 'com.android.library' version '8.4.2' apply false
id 'org.jetbrains.kotlin.android' version '1.8.21' apply false
id 'com.google.dagger.hilt.android' version '2.41' apply false
id "com.diffplug.spotless" version "6.22.0" // apply false
Expand Down
10 changes: 5 additions & 5 deletions ...a/src/main/java/exchange/dydx/cartera/walletprovider/providers/WalletConnectV2Provider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ class WalletConnectV2Provider(
override var walletStatusDelegate: WalletStatusDelegate? = null
override var userConsentDelegate: WalletUserConsentProtocol? = null

private var connectCompletions: MutableList<WalletConnectCompletion> = mutableListOf()
private var operationCompletions: MutableMap<String, WalletOperationCompletion> = mutableMapOf()
private val connectCompletions: MutableList<WalletConnectCompletion> = mutableListOf()
private val operationCompletions: MutableMap<String, WalletOperationCompletion> = mutableMapOf()

private var requestingWallet: WalletRequest? = null
private var currentSession: Sign.Model.ApprovedSession? = null
Expand Down Expand Up @@ -423,10 +423,10 @@ class WalletConnectV2Provider(

val pairing: Core.Model.Pairing?
val pairings = CoreClient.Pairing.getPairings()
if (pairings.isNotEmpty()) {
pairing = pairings.first()
pairing = if (pairings.isNotEmpty()) {
pairings.first()
} else {
pairing = CoreClient.Pairing.create() { error ->
CoreClient.Pairing.create() { error ->
Log.e(tag(this@WalletConnectV2Provider), error.throwable.stackTraceToString())
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ android.nonTransitiveRClass=true

LIBRARY_GROUP=dydxprotocol
LIBRARY_ARTIFACT_ID=cartera-android
LIBRARY_VERSION_NAME=0.1.14
LIBRARY_VERSION_NAME=0.1.15

android.enableR8.fullMode = false
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Jun 02 11:57:06 PDT 2023
#Wed Jun 12 15:23:49 PDT 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading