diff --git a/cartera/build.gradle b/cartera/build.gradle index dc9b875..e89df5d 100644 --- a/cartera/build.gradle +++ b/cartera/build.gradle @@ -52,7 +52,7 @@ dependencies { testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' - implementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava' + // implementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava' implementation 'com.google.code.gson:gson:2.9.0' @@ -60,7 +60,7 @@ dependencies { // https://github.com/WalletConnect/WalletConnectKotlinV2 // - implementation platform('com.walletconnect:android-bom:1.10.0') + implementation platform('com.walletconnect:android-bom:1.13.1') implementation('com.walletconnect:android-core') implementation 'com.walletconnect:sign' implementation 'com.walletconnect:push' @@ -87,7 +87,7 @@ publishing { maven(MavenPublication) { groupId "dydxprotocol" artifactId "cartera-android" - version "0.0.4" + version "0.0.5" artifact sourceJar artifact "$buildDir/outputs/aar/cartera-release.aar" diff --git a/cartera/src/main/java/exchange/dydx/cartera/typeddata/EIP712DomainTypedDataProvider.kt b/cartera/src/main/java/exchange/dydx/cartera/typeddata/EIP712DomainTypedDataProvider.kt index 4992b65..36551fb 100644 --- a/cartera/src/main/java/exchange/dydx/cartera/typeddata/EIP712DomainTypedDataProvider.kt +++ b/cartera/src/main/java/exchange/dydx/cartera/typeddata/EIP712DomainTypedDataProvider.kt @@ -3,13 +3,13 @@ package exchange.dydx.cartera.typeddata class EIP712DomainTypedDataProvider( private val name: String, private val chainId: Int, - private val version: String = "1.0.0" + private val version: String? = null ) : WalletTypedDataProviderProtocol { var eip712: EIP712TypedData? = null var message: WalletTypedData? = null init { - eip712 = EIP712TypedData(name, chainId, null) + eip712 = EIP712TypedData(name, chainId, version) } override fun typedData(): Map? { diff --git a/cartera/src/main/java/exchange/dydx/cartera/walletprovider/providers/WalletConnectV2Provider.kt b/cartera/src/main/java/exchange/dydx/cartera/walletprovider/providers/WalletConnectV2Provider.kt index 66ef162..66119fe 100644 --- a/cartera/src/main/java/exchange/dydx/cartera/walletprovider/providers/WalletConnectV2Provider.kt +++ b/cartera/src/main/java/exchange/dydx/cartera/walletprovider/providers/WalletConnectV2Provider.kt @@ -215,7 +215,7 @@ class WalletConnectV2Provider( description = walletConnectV2Config.clientDescription, url = walletConnectV2Config.clientUrl, icons = walletConnectV2Config.iconUrls, - redirect = "kotlin-dapp-wc:/request" + redirect = "exchange.dydx.carteraexample" ) CoreClient.initialize( diff --git a/publish.sh b/publish.sh index 4842d7a..0b077eb 100755 --- a/publish.sh +++ b/publish.sh @@ -1,18 +1,4 @@ #!/bin/sh -# search for the first line that starts with "version" in cartera/ build.gradle -# get the value in the quotes -VERSION=$(grep "^ version" cartera/build.gradle | sed -n 's/ version "\(.*\)"/\1/p') - - -echo "Current version is $VERSION. Enter new version (or press enter to skip):" -read NEW_VERSION - -#if NEW_VERSION is not empty, replace the version in build.gradle -if [ ! -z "$NEW_VERSION" ]; then - echo "Updating version to $NEW_VERSION" - sed -i '' "s/version \"$VERSION\"/version \"$NEW_VERSION\"/" cartera/build.gradle -fi - ./gradlew clean assembleRelease ./gradlew publish diff --git a/update_version.sh b/update_version.sh new file mode 100755 index 0000000..959a262 --- /dev/null +++ b/update_version.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +# search for the first line that starts with "version" in cartera/ build.gradle +# get the value in the quotes +VERSION=$(grep "^ version" cartera/build.gradle | sed -n 's/ version "\(.*\)"/\1/p') + + +echo "Current version is $VERSION. Enter new version (or press enter to skip):" +read NEW_VERSION + +#if NEW_VERSION is not empty, replace the version in build.gradle +if [ ! -z "$NEW_VERSION" ]; then + echo "Updating version to $NEW_VERSION" + sed -i '' "s/version \"$VERSION\"/version \"$NEW_VERSION\"/" cartera/build.gradle +fi +