Skip to content

Commit

Permalink
Merge pull request #37 from ProtonProtocol/develop
Browse files Browse the repository at this point in the history
allowing "newaccount" as ESR action
  • Loading branch information
Joey Harward authored Jul 23, 2021
2 parents e22d590 + 64785af commit db9af7c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
10 changes: 5 additions & 5 deletions buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
const val kotlinVersion = "1.5.0"
const val kotlinVersion = "1.5.21"
const val orchidVersion = "0.21.1"

object ProtonSdk {
const val versionCode = 43
const val versionName = "1.0.5"
const val versionCode = 44
const val versionName = "1.0.6"
}

object BuildPlugins {
object Versions {
const val gradle = "4.2.1"
const val gradle = "4.2.2"
const val dokka = "0.10.1" // TODO: 1.4.0
}

Expand All @@ -46,7 +46,7 @@ object Android {
const val minSdk = 21
const val compileSdk = 30
const val targetSdk = compileSdk
const val buildTools = "31.0.0-rc4"
const val buildTools = "30.0.3"

object Progaurd {
const val consumeFile = "consumer-rules.pro"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -482,8 +482,7 @@ class AccountModule {
"linkauth",
"unlinkauth",
"setabi",
"setcode",
"newaccount"
"setcode"
)

suspend fun decodeESR(chainAccount: ChainAccount, tokenContractMap: Map<String, TokenContract>, originalESRUrl: String, esrSession: ESRSession?=null): ProtonESR {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import org.junit.Test
class ExampleUnitTest {
@Test
fun addition_isCorrect() {
assertEquals(4, 2 + 2)
val expected = 4
val actual = 2+2
assertEquals(expected, actual)
}
}

0 comments on commit db9af7c

Please sign in to comment.