Skip to content
This repository was archived by the owner on Apr 28, 2026. It is now read-only.

Commit db9af7c

Browse files
author
Joey Harward
authored
Merge pull request #37 from ProtonProtocol/develop
allowing "newaccount" as ESR action
2 parents e22d590 + 64785af commit db9af7c

3 files changed

Lines changed: 9 additions & 8 deletions

File tree

buildSrc/src/main/kotlin/Dependencies.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2020
* SOFTWARE.
2121
*/
22-
const val kotlinVersion = "1.5.0"
22+
const val kotlinVersion = "1.5.21"
2323
const val orchidVersion = "0.21.1"
2424

2525
object ProtonSdk {
26-
const val versionCode = 43
27-
const val versionName = "1.0.5"
26+
const val versionCode = 44
27+
const val versionName = "1.0.6"
2828
}
2929

3030
object BuildPlugins {
3131
object Versions {
32-
const val gradle = "4.2.1"
32+
const val gradle = "4.2.2"
3333
const val dokka = "0.10.1" // TODO: 1.4.0
3434
}
3535

@@ -46,7 +46,7 @@ object Android {
4646
const val minSdk = 21
4747
const val compileSdk = 30
4848
const val targetSdk = compileSdk
49-
const val buildTools = "31.0.0-rc4"
49+
const val buildTools = "30.0.3"
5050

5151
object Progaurd {
5252
const val consumeFile = "consumer-rules.pro"

protonsdk/src/main/java/com/metallicus/protonsdk/AccountModule.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,8 +482,7 @@ class AccountModule {
482482
"linkauth",
483483
"unlinkauth",
484484
"setabi",
485-
"setcode",
486-
"newaccount"
485+
"setcode"
487486
)
488487

489488
suspend fun decodeESR(chainAccount: ChainAccount, tokenContractMap: Map<String, TokenContract>, originalESRUrl: String, esrSession: ESRSession?=null): ProtonESR {

protonsdk/src/test/java/com/metallicus/protonsdk/ExampleUnitTest.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import org.junit.Test
1111
class ExampleUnitTest {
1212
@Test
1313
fun addition_isCorrect() {
14-
assertEquals(4, 2 + 2)
14+
val expected = 4
15+
val actual = 2+2
16+
assertEquals(expected, actual)
1517
}
1618
}

0 commit comments

Comments
 (0)