add multidex because the bitrise build is failing without it.

Local builds work fine without multidex so hopefully we can get away without adding it, later.
This commit is contained in:
Kevin Gorham 2019-01-31 18:17:29 -05:00 committed by Kevin Gorham
parent 8ba19ef4ce
commit 77931bf143
3 changed files with 15 additions and 5 deletions

View File

@ -14,9 +14,10 @@ android {
minSdkVersion buildConfig.minSdkVersion
targetSdkVersion buildConfig.targetSdkVersion
versionCode 17 // todo: change this to 1_00_04 format, once we graduate beyond zero for the major version number because leading zeros indicate on octal number.
versionName "0.3.0-alpha"
versionName "0.3.3-alpha"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
multiDexEnabled true
}
buildTypes {
release {
@ -45,6 +46,7 @@ dependencies {
implementation deps.androidx.navigation.ui
implementation deps.androidx.navigation.uiKtx
implementation deps.material
implementation 'androidx.multidex:multidex:2.0.1'
// Kotlin
implementation deps.kotlin.stdlib

View File

@ -1,10 +1,13 @@
package cash.z.android.wallet
import android.content.Context
import androidx.multidex.MultiDex
import cash.z.android.wallet.di.component.DaggerApplicationComponent
import com.facebook.stetho.Stetho
import dagger.android.AndroidInjector
import dagger.android.DaggerApplication
class ZcashWalletApplication : DaggerApplication() {
override fun onCreate() {
@ -20,6 +23,11 @@ class ZcashWalletApplication : DaggerApplication() {
return DaggerApplicationComponent.builder().create(this)
}
override fun attachBaseContext(base: Context) {
super.attachBaseContext(base)
MultiDex.install(this)
}
companion object {
lateinit var instance: ZcashWalletApplication
}

View File

@ -1,6 +1,6 @@
<lint>
<!--<issue id="InvalidPackage">-->
<!--&lt;!&ndash; more info on this here: https://github.com/grpc/grpc-java/blob/master/core/src/main/java/io/grpc/internal/JndiResourceResolverFactory.java#L59 &ndash;&gt;-->
<!--<ignore path="**/grpc*.jar"/>-->
<!--</issue>-->
<issue id="InvalidPackage">
<!-- more info on this here: https://github.com/grpc/grpc-java/blob/master/core/src/main/java/io/grpc/internal/JndiResourceResolverFactory.java#L59 -->
<ignore path="**/grpc*.jar"/>
</issue>
</lint>