zec
/
zcash-android-wallet-sdk
mirror of https://github.com/zcash/zcash-android-wallet-sdk.git

Fix: Versioning error around annotations. 

The project was including a bad version of NotNull and this resulted in errors that were very hard to troubleshoot because the failure happened during annotation processing so Dagger could not even generate the code that the rest of the app relied upon. It was a mess. Fixed by removing the useless NotNulls and being a little more conservative on dependencies.
This commit is contained in:
Kevin Gorham 2021-04-23 16:06:53 -04:00
parent fb1b618c5f
commit 697721023c
No known key found for this signature in database
GPG Key ID: CCA55602DF49FC38
3 changed files with 109 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
build.gradle
View File

@ -123,11 +123,6 @@ android {
exclude 'META-INF/LICENSE.md'
exclude 'META-INF/LICENSE-notice.md'
}
configurations {
cleanedAnnotations
compile.exclude group: 'com.intellij' , module:'annotations'
compile.exclude group: 'org.jetbrains' , module:'annotations'
}
}
mavenPublish {
androidVariantToPublish = config.publish.target
@ -199,10 +194,7 @@ dependencies {
implementation AndroidX.lifecycle.commonJava8
// Architecture Components: Room
implementation AndroidX.room.runtime
implementation AndroidX.room.common
implementation AndroidX.room.ktx
implementation AndroidX.room.compiler
implementation AndroidX.paging.runtimeKtx
kapt AndroidX.room.compiler
@ -237,10 +229,10 @@ dependencies {
implementation 'com.squareup.okio:okio:1.17.5'
// Tests
testImplementation 'androidx.multidex:multidex:2.0.1'
testImplementation 'androidx.multidex:multidex:_'
testImplementation "org.jetbrains.kotlin:kotlin-reflect:_"
testImplementation 'org.mockito:mockito-junit-jupiter:3.5.10'
testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'
testImplementation 'org.mockito:mockito-junit-jupiter:_'
testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:_'
testImplementation "org.junit.jupiter:junit-jupiter-api:_"
testImplementation "org.junit.jupiter:junit-jupiter-engine:_"
testImplementation "org.junit.jupiter:junit-jupiter-migrationsupport:_"
@ -250,20 +242,20 @@ dependencies {
// Attempting to use JUnit5 via https://github.com/mannodermaus/android-junit5 was painful. The plugin configuration
// was buggy, crashing in several places. It also would require a separate test flavor because it's minimum API 26
// because "JUnit 5 uses Java 8-specific APIs that didn't exist on Android before the Oreo release."
androidTestImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'
androidTestImplementation 'org.mockito:mockito-android:3.5.10'
androidTestImplementation "androidx.test:runner:1.3.0"
androidTestImplementation 'com.android.support:support-annotations:28.0.0'
androidTestImplementation "androidx.test:core:1.3.0"
androidTestImplementation "androidx.arch.core:core-testing:2.1.0"
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'ru.gildor.coroutines:kotlin-coroutines-okhttp:1.0'
androidTestImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:_'
androidTestImplementation 'org.mockito:mockito-android:_'
androidTestImplementation "androidx.test:runner:_"
androidTestImplementation 'com.android.support:support-annotations:_'
androidTestImplementation "androidx.test:core:_"
androidTestImplementation "androidx.arch.core:core-testing:_"
androidTestImplementation 'androidx.test.ext:junit:_'
androidTestImplementation 'ru.gildor.coroutines:kotlin-coroutines-okhttp:_'
// used by 'ru.gildor.coroutines.okhttp.await' (to make simple suspended requests) and breaks on versions higher than 3.8.0
androidTestImplementation "com.squareup.okhttp3:okhttp:3.8.0"
// sample mnemonic plugin
androidTestImplementation 'com.github.zcash:zcash-android-wallet-plugins:1.0.1'
androidTestImplementation 'cash.z.ecc.android:kotlin-bip39:1.0.2'
androidTestImplementation 'com.github.zcash:zcash-android-wallet-plugins:_'
androidTestImplementation 'cash.z.ecc.android:kotlin-bip39:_'
}
//taskTree{

4
src/main/java/cash/z/ecc/android/sdk/db/entity/Block.kt
View File

@ -2,18 +2,14 @@ package cash.z.ecc.android.sdk.db.entity
import androidx.room.ColumnInfo
import androidx.room.Entity
import org.jetbrains.annotations.NotNull
@Entity(primaryKeys = ["height"], tableName = "blocks")
data class Block(
val height: Int?,
@ColumnInfo(typeAffinity = ColumnInfo.BLOB, name = "hash")
@NotNull
val hash: ByteArray,
@NotNull
val time: Int,
@ColumnInfo(typeAffinity = ColumnInfo.BLOB, name = "sapling_tree")
@NotNull
val saplingTree: ByteArray
) {
override fun equals(other: Any?): Boolean {

155
versions.properties
View File

@ -5,63 +5,6 @@
## Generated by $ ./gradlew refreshVersions
## Please, don't put extra comments in that file yet, keeping them is not supported yet.
version.androidx.room=2.3.0
## # available=2.4.0-alpha01
version.androidx.paging=2.1.2
## # available=3.0.0-alpha01
## # available=3.0.0-alpha02
## # available=3.0.0-alpha03
## # available=3.0.0-alpha04
## # available=3.0.0-alpha05
## # available=3.0.0-alpha06
## # available=3.0.0-alpha07
## # available=3.0.0-alpha08
## # available=3.0.0-alpha09
## # available=3.0.0-alpha10
## # available=3.0.0-alpha11
## # available=3.0.0-alpha12
## # available=3.0.0-alpha13
## # available=3.0.0-beta01
## # available=3.0.0-beta02
## # available=3.0.0-beta03
## # available=3.0.0-rc01
version.androidx.appcompat=1.3.0-rc01
version.androidx.lifecycle=2.3.1
## # available=2.4.0-alpha01
version.kotlin=1.4.32
## # available=1.5.0-M1
## # available=1.5.0-M2
## # available=1.5.0-RC
version.kotlinx.coroutines=1.4.2
version.io.grpc..grpc-okhttp=1.37.0
version.io.grpc..grpc-android=1.37.0
version.io.grpc..grpc-protobuf-lite=1.37.0
version.io.grpc..grpc-stub=1.37.0
version.io.grpc..grpc-testing=1.37.0
version.org.junit.jupiter..junit-jupiter-api=5.7.1
## # available=5.8.0-M1
version.org.junit.jupiter..junit-jupiter-engine=5.7.1
## # available=5.8.0-M1
version.org.junit.jupiter..junit-jupiter-migrationsupport=5.7.1
## # available=5.8.0-M1
version.javax.annotation..javax.annotation-api=1.3.2
version.io.grpc..protoc-gen-grpc-java=1.37.0
plugin.android=4.1.3
## # available=4.2.0-alpha01
## # available=4.2.0-alpha02
@ -101,10 +44,104 @@ plugin.android=4.1.3
## # available=7.0.0-alpha13
## # available=7.0.0-alpha14
version.org.jetbrains.dokka..dokka-gradle-plugin=1.4.32
version.androidx.appcompat=1.3.0-rc01
version.androidx.arch.core=2.1.0
version.androidx.lifecycle=2.3.1
## # available=2.4.0-alpha01
version.androidx.multidex=2.0.1
version.androidx.paging=2.1.2
## # available=3.0.0-alpha01
## # available=3.0.0-alpha02
## # available=3.0.0-alpha03
## # available=3.0.0-alpha04
## # available=3.0.0-alpha05
## # available=3.0.0-alpha06
## # available=3.0.0-alpha07
## # available=3.0.0-alpha08
## # available=3.0.0-alpha09
## # available=3.0.0-alpha10
## # available=3.0.0-alpha11
## # available=3.0.0-alpha12
## # available=3.0.0-alpha13
## # available=3.0.0-beta01
## # available=3.0.0-beta02
## # available=3.0.0-beta03
## # available=3.0.0-rc01
version.androidx.room=2.3.0
## # available=2.4.0-alpha01
version.androidx.test=1.3.0
## # available=1.3.1-alpha01
## # available=1.3.1-alpha02
## # available=1.3.1-alpha03
## # available=1.4.0-alpha04
## # available=1.4.0-alpha05
version.androidx.test.core=1.3.0
## # available=1.3.1-alpha01
## # available=1.3.1-alpha02
## # available=1.3.1-alpha03
## # available=1.4.0-alpha04
## # available=1.4.0-alpha05
version.androidx.test.ext.junit=1.1.2
## # available=1.1.3-alpha01
## # available=1.1.3-alpha02
## # available=1.1.3-alpha03
## # available=1.1.3-alpha04
## # available=1.1.3-alpha05
version.cash.z.ecc.android..kotlin-bip39=1.0.2
version.com.android.support..support-annotations=28.0.0
version.com.github.zcash..zcash-android-wallet-plugins=1.0.1
version.com.google.protobuf..protobuf-gradle-plugin=0.8.16
version.org.owasp..dependency-check-gradle=6.1.5
version.com.nhaarman.mockitokotlin2..mockito-kotlin=2.2.0
version.com.vanniktech..gradle-maven-publish-plugin=0.14.2
version.io.grpc..grpc-android=1.37.0
version.io.grpc..grpc-okhttp=1.37.0
version.io.grpc..grpc-protobuf-lite=1.37.0
version.io.grpc..grpc-stub=1.37.0
version.io.grpc..grpc-testing=1.37.0
version.javax.annotation..javax.annotation-api=1.3.2
version.kotlin=1.4.32
## # available=1.5.0-M1
## # available=1.5.0-M2
## # available=1.5.0-RC
version.kotlinx.coroutines=1.4.2
version.org.jetbrains.dokka..dokka-gradle-plugin=1.4.32
version.org.junit.jupiter..junit-jupiter-api=5.7.1
## # available=5.8.0-M1
version.org.junit.jupiter..junit-jupiter-engine=5.7.1
## # available=5.8.0-M1
version.org.junit.jupiter..junit-jupiter-migrationsupport=5.7.1
## # available=5.8.0-M1
version.org.mockito..mockito-android=3.8.0
version.org.mockito..mockito-junit-jupiter=3.8.0
version.org.owasp..dependency-check-gradle=6.1.5
version.ru.gildor.coroutines..kotlin-coroutines-okhttp=1.0