Merge branch 'develop' into feature/account-mvi-model

NovaCrypto · Jun 2, 2018 · 47b2d6b · 47b2d6b
2 parents 5b21569 + 6751ce9
commit 47b2d6b
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 44 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,8 @@
 language: android
 android:
   components:
-    - build-tools-26.0.2
-    - android-26
+    - build-tools-27.0.3
+    - android-27
 script:
   - ./gradlew build
 

diff --git a/account/build.gradle b/account/build.gradle
@@ -44,7 +44,7 @@ targetCompatibility = '1.7'
 /** jacoco code-cov **/
 
 jacoco {
-    toolVersion = '0.8.0'
+    toolVersion = '0.8.1'
 }
 
 jacocoTestReport {

diff --git a/app/build.gradle b/app/build.gradle
@@ -21,21 +21,24 @@
 
 apply plugin: 'com.android.application'
 
+apply plugin: 'com.getkeepsafe.dexcount'
+
 apply plugin: 'kotlin-android'
 
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
     defaultConfig {
-        applicationId "io.github.novacrypto.novawallet"
+        applicationId 'io.github.novacrypto.novawallet'
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
-        versionName "1.0"
+        versionName '1.0'
         vectorDrawables.useSupportLibrary = true
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
+        multiDexEnabled true
     }
     buildTypes {
         release {
@@ -50,20 +53,22 @@ android {
 }
 
 dependencies {
+    implementation 'com.android.support:multidex:1.0.3'
+
     implementation project(':qrscanner')
     implementation project(':bips')
     implementation project(':mnemonicentry')
 
-    implementation 'io.github.novacrypto:Base58:0.1.2@jar'
+    implementation 'io.github.novacrypto:Base58:0.1.3@jar'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support:cardview-v7:26.1.0'
-    implementation 'com.android.support:design:26.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    implementation 'com.jakewharton.timber:timber:4.6.0'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:cardview-v7:27.1.1'
+    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
+    implementation 'com.jakewharton.timber:timber:4.7.0'
     implementation 'com.gordonwong:material-sheet-fab:1.2.1'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
diff --git a/app/src/main/java/io/github/novacrypto/novawallet/WalletApplication.kt b/app/src/main/java/io/github/novacrypto/novawallet/WalletApplication.kt
@@ -21,10 +21,10 @@
 
 package io.github.novacrypto.novawallet
 
-import android.app.Application
+import android.support.multidex.MultiDexApplication
 import timber.log.Timber
 
-class WalletApplication : Application() {
+class WalletApplication : MultiDexApplication() {
 
     override fun onCreate() {
         super.onCreate()

diff --git a/bips/build.gradle b/bips/build.gradle
@@ -30,14 +30,14 @@ buildscript {
 }
 
 dependencies {
-    api 'io.reactivex.rxjava2:rxjava:2.1.9'
+    api 'io.reactivex.rxjava2:rxjava:2.1.14'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation 'io.github.novacrypto:BIP32:0.0.9'
     implementation 'io.github.novacrypto:BIP39:0.1.9'
 
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.amshove.kluent:kluent:1.34'
+    testImplementation 'org.amshove.kluent:kluent:1.38'
 }
 
 sourceCompatibility = '1.7'
@@ -47,7 +47,7 @@ targetCompatibility = '1.7'
 /** jacoco code-cov **/
 
 jacoco {
-    toolVersion = '0.8.0'
+    toolVersion = '0.8.1'
 }
 
 jacocoTestReport {

diff --git a/build.gradle b/build.gradle
@@ -22,14 +22,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.21'
+    ext.kotlin_version = '1.2.30'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -50,6 +51,7 @@ allprojects {
     repositories {
         google()
         jcenter()
+        maven { url 'https://jitpack.io' }
     }
     // Generate a dependency version update report for release
     // ./gradlew dependencyUpdates -Drevision=release

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -19,9 +19,9 @@
 #  You can contact the authors via github issues.
 #
 
-#Sat Jan 20 09:12:57 AST 2018
+#Mon May 28 19:00:05 ADT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/mnemonicentry/build.gradle b/mnemonicentry/build.gradle
@@ -25,11 +25,11 @@ apply plugin: 'kotlin-android-extensions'
 
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
 
@@ -49,16 +49,16 @@ dependencies {
     api project(':security')
     implementation project(':bips')
 
-    implementation 'com.airbnb.android:lottie:2.2.5'
+    implementation 'com.airbnb.android:lottie:2.5.5'
 
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    implementation 'com.android.support:design:26.1.0'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
+    implementation 'com.android.support:design:27.1.1'
 
-    implementation 'com.jakewharton.rxbinding2:rxbinding-kotlin:2.1.0'
+    implementation 'com.jakewharton.rxbinding2:rxbinding-kotlin:2.1.1'
 
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
diff --git a/qrscanner/build.gradle b/qrscanner/build.gradle
@@ -24,21 +24,21 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
     }
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    implementation 'com.android.support:design:26.1.0'
-    implementation 'com.google.android.gms:play-services-vision:11.8.0'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
+    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.google.android.gms:play-services-vision:15.0.2'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
-    implementation 'com.jakewharton.timber:timber:4.6.0'
+    implementation 'com.jakewharton.timber:timber:4.7.0'
 }
diff --git a/security/build.gradle b/security/build.gradle
@@ -35,7 +35,7 @@ dependencies {
     implementation 'io.github.novacrypto:ToRuntime:0.9.0@jar'
 
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.amshove.kluent:kluent:1.34'
+    testImplementation 'org.amshove.kluent:kluent:1.38'
 }
 
 sourceCompatibility = '1.7'
@@ -44,7 +44,7 @@ targetCompatibility = '1.7'
 /** jacoco code-cov **/
 
 jacoco {
-    toolVersion = '0.8.0'
+    toolVersion = '0.8.1'
 }
 
 jacocoTestReport {